diff --git a/ansible/group_vars/all.yml b/ansible/group_vars/all.yml index b4d234c9..dc6b33f4 100644 --- a/ansible/group_vars/all.yml +++ b/ansible/group_vars/all.yml @@ -181,7 +181,6 @@ rabbit_port: 54321 # redis redis_host_address: "{{ hostvars[groups['redis'][0]]['ansible_default_ipv4']['address'] }}" redis_port: 6379 -redis_tls_port: 6380 registry_address: "{{ hostvars[groups['registry'][0]]['ansible_default_ipv4']['address'] }}" diff --git a/ansible/group_vars/alpha-metis.yml b/ansible/group_vars/alpha-metis.yml deleted file mode 100644 index fe371c36..00000000 --- a/ansible/group_vars/alpha-metis.yml +++ /dev/null @@ -1,39 +0,0 @@ -name: metis -container_image: registry.runnable.com/runnable/{{ name }} -container_tag: "{{ git_branch }}" -repo: git@github.com:CodeNow/astral.git -node_version: "4.2.1" -npm_version: "2.8.3" - -# Overrides the start command in the builder role -npm_start_command: run metis-start - -# Not actually needed, just allows container-kill-start to work -hosted_ports: [ "{{ metis_port }}" ] - -# container settings -redis_ca_cert_path: /opt/ssl/metis/redis/ca.pem -container_envs: > - -e DATADOG_HOST={{ datadog_host_address }} - -e DATADOG_PORT={{ datadog_port }} - -e RABBITMQ_HOSTNAME={{ rabbit_host_address }} - -e RABBITMQ_PASSWORD={{ rabbit_password }} - -e RABBITMQ_PORT={{ rabbit_port }} - -e RABBITMQ_USERNAME={{ rabbit_username }} - -e POSTGRES_CONNECT_STRING=postgres://{{ pg_user }}:{{ pg_pass }}@{{ pg_host }}/{{ pg_database }} - -e AWS_ACCESS_KEY_ID={{ aws_access_key_id }} - -e AWS_SECRET_ACCESS_KEY={{ aws_secret_access_key }} - -e NODE_ENV={{ node_env }} - -e REDIS_CACERT={{ redis_ca_cert_path }} - -e REDIS_HOST={{ redis_host_address }} - -e REDIS_PORT={{ redis_tls_port }} - -e REGISTRY_HOST={{ registry_host }} - -e ROLLBAR_KEY={{ metis_rollbar_key }} - -e DOCKER_PORT={{ docker_port }} - -container_run_opts: > - -h {{ name }} - -d - -P - -v {{ redis_ca_cert_path }}:{{ redis_ca_cert_path }} - {{ container_envs }} diff --git a/ansible/group_vars/alpha-navi.yml b/ansible/group_vars/alpha-navi.yml index b79d2c8a..c8d3ba2f 100644 --- a/ansible/group_vars/alpha-navi.yml +++ b/ansible/group_vars/alpha-navi.yml @@ -29,9 +29,8 @@ container_envs: > -e RABBITMQ_PASSWORD={{ rabbit_password }} -e RABBITMQ_PORT={{ rabbit_port }} -e RABBITMQ_USERNAME={{ rabbit_username }} - -e REDIS_CACERT={{ redis_ca_cert_path }} -e REDIS_IPADDRESS={{ redis_host_address }} - -e REDIS_PORT={{ redis_tls_port }} + -e REDIS_PORT={{ redis_port }} {% if navi_intercom_api_key is defined %} -e INTERCOM_API_KEY={{ navi_intercom_api_key }} {% endif %} {% if navi_intercom_app_id is defined %} -e INTERCOM_APP_ID={{ navi_intercom_app_id }} {% endif %} {% if navi_new_relic_app_name is defined %} -e NEW_RELIC_APP_NAME={{ navi_new_relic_app_name }} {% endif %} diff --git a/ansible/group_vars/alpha-shiva.yml b/ansible/group_vars/alpha-shiva.yml index 9aaa672f..7d158279 100644 --- a/ansible/group_vars/alpha-shiva.yml +++ b/ansible/group_vars/alpha-shiva.yml @@ -21,9 +21,6 @@ container_envs: > -e AWS_ACCESS_KEY_ID={{ aws_access_key_id }} -e AWS_SECRET_ACCESS_KEY={{ aws_secret_access_key }} -e NODE_ENV={{ node_env }} - -e REDIS_CACERT={{ redis_ca_cert_path }} - -e REDIS_PORT={{ redis_tls_port }} - -e REDIS_IPADDRESS={{ redis_host_address }} -e REGISTRY_HOST={{ registry_host }} -e ROLLBAR_KEY={{ shiva_rollbar_token }} -e DOCKER_PORT={{ docker_port }} diff --git a/ansible/group_vars/ec2_sg.yml b/ansible/group_vars/ec2_sg.yml index c1323c34..05668152 100644 --- a/ansible/group_vars/ec2_sg.yml +++ b/ansible/group_vars/ec2_sg.yml @@ -17,7 +17,6 @@ krain_port: 3100 named_port: 53 navi_http_port: 3567 redis_port: 6379 -redis_tls_port: 6380 region: us-west-2 sshd_port: 22 swarm_port: 2375 diff --git a/ansible/metis.yml b/ansible/metis.yml deleted file mode 100644 index 4b09fef4..00000000 --- a/ansible/metis.yml +++ /dev/null @@ -1,12 +0,0 @@ ---- -- hosts: redis -- hosts: rabbitmq - -- hosts: metis - vars_files: - - group_vars/alpha-metis.yml - roles: - - { role: notify, tags: [ notify ] } - - { role: builder, tags: [ build ] } - - { role: tls-server-ca, ca_dest: "{{ redis_ca_cert_path }}" } - - { role: container_kill_start } diff --git a/ansible/navi.yml b/ansible/navi.yml index 4525e90f..0d69fc58 100644 --- a/ansible/navi.yml +++ b/ansible/navi.yml @@ -16,8 +16,5 @@ - role: builder tags: [ build ] - - role: tls-server-ca - ca_dest: "{{ redis_ca_cert_path }}" - - role: container_start number_of_containers: "{{ ansible_processor_cores }}" diff --git a/ansible/roles/ec2/sg_configure/tasks/main.yml b/ansible/roles/ec2/sg_configure/tasks/main.yml index b71708ec..96621700 100644 --- a/ansible/roles/ec2/sg_configure/tasks/main.yml +++ b/ansible/roles/ec2/sg_configure/tasks/main.yml @@ -301,30 +301,6 @@ from_port: "{{ sshd_port }}" to_port: "{{ sshd_port }}" group_id: "{{ sg_bastion }}" - - proto: tcp - from_port: "{{ redis_port }}" - to_port: "{{ redis_tls_port }}" - group_id: "{{ sg_api }}" - - proto: tcp - from_port: "{{ redis_port }}" - to_port: "{{ redis_tls_port }}" - group_id: "{{ sg_dock }}" - - proto: tcp - from_port: "{{ redis_port }}" - to_port: "{{ redis_tls_port }}" - group_id: "{{ sg_hipache }}" - - proto: tcp - from_port: "{{ redis_port }}" - to_port: "{{ redis_tls_port }}" - group_id: "{{ sg_navi }}" - - proto: tcp - from_port: "{{ redis_port }}" - to_port: "{{ redis_tls_port }}" - group_id: "{{ sg_app_services }}" - - proto: tcp - from_port: "{{ redis_port }}" - to_port: "{{ redis_tls_port }}" - group_id: "{{ sg_dock_services }}" - name: Registry SG tags: