Skip to content

remove redis tls #620

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
anandkumarpatel merged 1 commit into from
Mar 23, 2017
Merged

remove redis tls #620

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
1 change: 0 additions & 1 deletion ansible/group_vars/all.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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'] }}"

Expand Down
39 changes: 0 additions & 39 deletions ansible/group_vars/alpha-metis.yml
View file
Open in desktop

This file was deleted.

3 changes: 1 addition & 2 deletions ansible/group_vars/alpha-navi.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 %}
Expand Down
3 changes: 0 additions & 3 deletions ansible/group_vars/alpha-shiva.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 }}
Expand Down
1 change: 0 additions & 1 deletion ansible/group_vars/ec2_sg.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
12 changes: 0 additions & 12 deletions ansible/metis.yml
View file
Open in desktop

This file was deleted.

3 changes: 0 additions & 3 deletions ansible/navi.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 }}"
24 changes: 0 additions & 24 deletions ansible/roles/ec2/sg_configure/tasks/main.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -301,30 +301,6 @@
from_port: "{{ sshd_port }}"
Copy link
Member

@thejsj thejsj Mar 23, 2017

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Do we even use this file for anything?

Copy link
Author

@anandkumarpatel anandkumarpatel Mar 23, 2017

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

something chris made, not sure how it works, not worth investigating right now

Copy link
Member

@thejsj thejsj Mar 23, 2017

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Definitely outside the scope of this PR, but we only use the ec2 role here, which I don't think gets used anywhere.

$ Ag 'role: ec2'
sg_configure.yml
8:  - { role: ec2/sg_configure }

Death to sg_configure.yml.
Death to local vault.
Death to Docker Swarm.

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:
Expand Down