diff --git a/ansible/api-core.yml b/ansible/api-core.yml index f9d8444b..38e338b8 100644 --- a/ansible/api-core.yml +++ b/ansible/api-core.yml @@ -23,10 +23,6 @@ - role: docker_client - - role: tls-client - tags: [ tls ] - tls_service: mongodb - - role: datadog tags: [ datadog ] diff --git a/ansible/group_vars/alpha-khronos.yml b/ansible/group_vars/alpha-khronos.yml index 6bace92d..057d4526 100644 --- a/ansible/group_vars/alpha-khronos.yml +++ b/ansible/group_vars/alpha-khronos.yml @@ -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 }} diff --git a/ansible/roles/khronos/meta/main.yml b/ansible/roles/khronos/meta/main.yml deleted file mode 100644 index 37a34a20..00000000 --- a/ansible/roles/khronos/meta/main.yml +++ /dev/null @@ -1,3 +0,0 @@ ---- -dependencies: -- { role: tls-client-cert, tls_service: mongodb} diff --git a/ansible/roles/khronos/tasks/main.yml b/ansible/roles/khronos/tasks/main.yml index 5aa53dea..3d20bb61 100644 --- a/ansible/roles/khronos/tasks/main.yml +++ b/ansible/roles/khronos/tasks/main.yml @@ -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 diff --git a/ansible/socket-server.yml b/ansible/socket-server.yml index 37cd675b..939ffe2d 100644 --- a/ansible/socket-server.yml +++ b/ansible/socket-server.yml @@ -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 diff --git a/ansible/workers.yml b/ansible/workers.yml index 2980fbea..49e61c34 100644 --- a/ansible/workers.yml +++ b/ansible/workers.yml @@ -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 }