Skip to content

Remove khronos mongo certs #621

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 7 commits into from
Mar 23, 2017
Merged

Remove khronos mongo certs #621

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
25afd5e
remove redis tls
Mar 23, 2017
cef599b
remove mongo certs from khronos
Mar 23, 2017
88d1601
remove adding certs from khronos tasks
Mar 23, 2017
91e7890
remove mongo tls fromall
Mar 23, 2017
ac744f8
remove mongo tls
Mar 23, 2017
8353862
remove adding k8
Mar 23, 2017
7b5ecbc
Merge branch 'master' into remove-khronos-mongo-certs
Mar 23, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 0 additions & 4 deletions ansible/api-core.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,10 +23,6 @@

- role: docker_client

- role: tls-client
tags: [ tls ]
tls_service: mongodb

- role: datadog
tags: [ datadog ]

Expand Down
3 changes: 0 additions & 3 deletions ansible/group_vars/alpha-khronos.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -58,9 +58,6 @@ container_envs: >
-e INTERCOM_API_KEY={{ khronos_intercom_api_key | default('undefined') }}
-e INTERCOM_APP_ID={{ khronos_intercom_app_id | default('undefined') }}
-e KHRONOS_MONGO=mongodb://{{ khronos_mongo_auth }}@{{ mongo_hosts }}/{{ khronos_mongo_database }}
-e MONGO_CACERT=/opt/ssl/mongo-client/ca.pem
-e MONGO_CERT=/opt/ssl/mongo-client/cert.pem
-e MONGO_KEY=/opt/ssl/mongo-client/key.pem
-e NODE_ENV={{ node_env }}
-e RABBITMQ_HOSTNAME={{ rabbit_host_address }}
-e RABBITMQ_PASSWORD={{ rabbit_password }}
Expand Down
3 changes: 0 additions & 3 deletions ansible/roles/khronos/meta/main.yml
View file
Open in desktop

This file was deleted.

27 changes: 0 additions & 27 deletions ansible/roles/khronos/tasks/main.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -62,30 +62,3 @@
- name: Khronos CLI - Every 5 minutes Time Event
minute: "*/5"
script: 5_minutes_passed_cron_event.sh

- name: make directory for mongo certificates
become: yes
file:
dest: /opt/ssl/mongo-client
state: directory

- name: put client CA in place for mongo
become: yes
copy:
dest: /opt/ssl/mongo-client/ca.pem
content: "{{ new_client_certs.data.issuing_ca }}"
mode: 0400

- name: put client certificate in place for mongo
become: yes
copy:
dest: /opt/ssl/mongo-client/cert.pem
content: "{{ new_client_certs.data.certificate }}"
mode: 0400

- name: put client private key in place for mongo
become: yes
copy:
dest: /opt/ssl/mongo-client/key.pem
content: "{{ new_client_certs.data.private_key }}"
mode: 0400
1 change: 0 additions & 1 deletion ansible/socket-server.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,6 @@
- { role: redis_key, tags: [ setup, redis_key ] }
- { role: builder, tags: [ build ] }
- { role: docker_client }
- { role: tls-client, tls_service: mongodb, tags: [ tls ] }
- { role: datadog, tags: [ datadog ] }
- { role: container_start, number_of_containers: 8 }
- role: nginx-proxied-service
Expand Down
1 change: 0 additions & 1 deletion ansible/workers.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,5 @@
tags: [ notify ]
- { role: builder, tags: [ build ] }
- { role: docker_client }
- { role: tls-client, tls_service: mongodb, tags: [ tls ] }
- { role: datadog, tags: [ datadog ] }
- { role: container_start, number_of_containers: 4 }