Skip to content

Commit 6dde743

Browse files
rename url to hostname and some host to host_addresses
1 parent 3690d77 commit 6dde743

23 files changed

Lines changed: 74 additions & 74 deletions

File tree

ansible/beta-hosts/variables

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ shiva_rollbar_key=0526a90faec845d796e1ef5361a00526
4747

4848
[beta:vars]
4949
ansible_ssh_private_key_file=~/.ssh/oregon.pem
50-
datadog_host=10.20.1.59
50+
datadog_host_address=10.20.1.59
5151
datadog_tags=env:beta
5252
domain=runnable-beta.com
5353
new_relic_license_key=338516e0826451c297d44dc60aeaf0a0ca4bfead

ansible/gamma-hosts/variables

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ shiva_rollbar_key=0526a90faec845d796e1ef5361a00526
4747

4848
[gamma:vars]
4949
ansible_ssh_private_key_file=~/.ssh/gamma.pem
50-
datadog_host=10.4.6.251
50+
datadog_host_address=10.4.6.251
5151
datadog_tags=env:gamma
5252
domain=runnable-gamma.com
5353
new_relic_license_key=338516e0826451c297d44dc60aeaf0a0ca4bfead

ansible/group_vars/all.yml

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ loggly_username: ops
3535
api_github_hook_secret: 3V3RYTHINGisAW3S0ME!
3636
api_neo4j_port: 7474
3737
api_neo4j_protocol: http://
38-
api_url: api.{{ domain }}
38+
api_hostname: api.{{ domain }}
3939
api_port: 80
4040

4141
# astral
@@ -46,13 +46,13 @@ charon_port: 53
4646

4747
# datadog
4848
datadog_api_key: 6488896fe0c811965ef233b96809d70d
49-
datadog_host: "{{ ansible_default_ipv4.address }}"
49+
datadog_host_address: "{{ ansible_default_ipv4.address }}"
5050
datadog_port: 8125
5151

5252
# detention
53-
detention_host: "{{ hostvars[groups['detention'][0]]['ansible_default_ipv4']['address'] }}"
53+
detention_host_address: "{{ hostvars[groups['detention'][0]]['ansible_default_ipv4']['address'] }}"
5454
detention_port: 9123
55-
detention_url: "detention.{{ domain }}"
55+
detention_hostname: "detention.{{ domain }}"
5656

5757
# docker
5858
docker_ca_path: /etc/ssl/docker/ca.pem
@@ -62,10 +62,10 @@ docker_port: 4242
6262

6363
# eru
6464
eru_port: 57831
65-
eru_url: "admin.{{ domain }}"
65+
eru_hostname: "admin.{{ domain }}"
6666

6767
# mavis
68-
mavis_url: "mavis.{{ domain }}"
68+
mavis_hostname: "mavis.{{ domain }}"
6969
mavis_port: 3000
7070

7171
# metis
@@ -75,18 +75,18 @@ metis_port: 3000
7575
mongo_hosts: "{% for host in groups['mongodb'] %}{{ hostvars[host]['ansible_default_ipv4']['address'] }}:27000{% if not loop.last %},{% endif %}{% endfor %}"
7676

7777
# navi
78-
navi_host: "{{ hostvars[groups['navi'][0]]['ansible_default_ipv4']['address'] }}"
78+
navi_host_address: "{{ hostvars[groups['navi'][0]]['ansible_default_ipv4']['address'] }}"
7979
navi_port: 3567
8080

8181
# neo4j
82-
neo4j_host: "{{ hostvars[groups['neo4j'][0]]['ansible_default_ipv4']['address'] }}"
82+
neo4j_host_address: "{{ hostvars[groups['neo4j'][0]]['ansible_default_ipv4']['address'] }}"
8383

8484
# optimus
8585
optimus_port: 80
86-
optimus_url: optimus.{{ domain }}
86+
optimus_hostname: optimus.{{ domain }}
8787

8888
# rabbit
89-
rabbit_host: "{{ hostvars[groups['rabbitmq'][0]]['ansible_default_ipv4']['address'] }}"
89+
rabbit_host_address: "{{ hostvars[groups['rabbitmq'][0]]['ansible_default_ipv4']['address'] }}"
9090
rabbit_port: 54321
9191

9292
# redis

ansible/group_vars/alpha-api.yml

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -11,40 +11,40 @@ node_version: "0.10.38"
1111
npm_version: "2.8.3"
1212

1313
# for redis
14-
redis_key: "frontend:{{ api_url }}"
14+
redis_key: "frontend:{{ api_hostname }}"
1515
is_redis_update_required: 'yes'
1616

1717
# for container settings
1818
container_envs: >
1919
-e AWS_ACCESS_KEY_ID={{ api_aws_access_key_id }}
2020
-e AWS_SECRET_ACCESS_KEY={{ api_aws_secret_access_key }}
21-
-e DATADOG_HOST={{ datadog_host }}
21+
-e DATADOG_HOST={{ datadog_host_address }}
2222
-e DATADOG_PORT={{ datadog_port }}
2323
-e DOMAIN={{ domain }}
24-
-e GITHUB_CALLBACK_URL=https://{{ api_url }}/auth/github/callback
24+
-e GITHUB_CALLBACK_URL=https://{{ api_hostname }}/auth/github/callback
2525
-e GITHUB_CLIENT_ID={{ api_github_client_id }}
2626
-e GITHUB_CLIENT_SECRET={{ api_github_client_secret }}
2727
-e GITHUB_DEPLOY_KEYS_BUCKET={{ api_github_deploy_keys_bucket }}
28-
-e GITHUB_HOOK_URL=https://{{ api_url }}/actions/github
28+
-e GITHUB_HOOK_URL=https://{{ api_hostname }}/actions/github
2929
-e HELLO_RUNNABLE_GITHUB_TOKEN={{ api_hello_runnable_github_token }}
30-
-e MAVIS_HOST=http://{{ mavis_url }}:80
30+
-e MAVIS_HOST=http://{{ mavis_hostname }}:80
3131
-e MIXPANEL_APP_ID={{ api_mixpanel_app_id }}
3232
-e MONGO=mongodb://{{ api_mongo_auth }}@{{ mongo_hosts }}/{{ api_mongo_database }}
3333
-e MONGO_REPLSET_NAME={{ api_mongo_replset_name }}
34-
-e NAVI_HOST=http://{{ navi_host }}:{{ navi_port }}
35-
-e NEO4J={{ api_neo4j_protocol }}{{ api_neo4j_auth }}@{{ neo4j_host }}:{{ api_neo4j_port }}
34+
-e NAVI_HOST=http://{{ navi_host_addressname }}:{{ navi_port }}
35+
-e NEO4J={{ api_neo4j_protocol }}{{ api_neo4j_auth }}@{{ neo4j_host_address }}:{{ api_neo4j_port }}
3636
-e NEW_RELIC_APP_NAME={{ api_new_relic_app_name }}
3737
-e NEW_RELIC_LICENSE_KEY={{ new_relic_license_key }}
3838
-e NEW_RELIC_LOG_LEVEL=fatal
3939
-e NEW_RELIC_NO_CONFIG_FILE=true
4040
-e NODE_ENV={{ node_env }}
4141
-e NUM_WORKERS=1
42-
-e OPTIMUS_HOST=http://{{ optimus_url }}
43-
-e RABBITMQ_HOSTNAME={{ rabbit_host }}
42+
-e OPTIMUS_HOST=http://{{ optimus_hostname }}
43+
-e RABBITMQ_HOSTNAME={{ rabbit_host_address }}
4444
-e RABBITMQ_PASSWORD={{ rabbit_password }}
4545
-e RABBITMQ_PORT={{ rabbit_port }}
4646
-e RABBITMQ_USERNAME={{ rabbit_username }}
47-
-e REDIS_IPADDRESS={{ redis_host }}
47+
-e REDIS_IPADDRESS={{ redis_host_address }}
4848
-e REDIS_PORT={{ redis_port }}
4949
-e ROLLBAR_KEY={{ api_rollbar_key }}
5050
-e S3_CONTEXT_RESOURCE_BUCKET={{ api_s3_context_bucket }}

ansible/group_vars/alpha-charon.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,11 +4,11 @@ app_repo: "git@github.com:CodeNow/{{ name }}.git"
44
hosted_ports: ["{{ charon_port }}"]
55

66
enviroment_vars:
7-
API_HOST: "{{ api_url }}"
7+
API_HOST: "{{ api_hostname }}"
88
API_TOKEN: "51c61b779f3de616a9639cfc44a22c79fbd8e328"
9-
DATADOG_HOST: "{{ datadog_host }}"
9+
DATADOG_HOST: "{{ datadog_host_address }}"
1010
DATADOG_PORT: "{{ datadog_port }}"
1111
DOMAIN_FILTER: "{{ user_content_domain }}"
1212
PORT: "{{ hosted_ports[0] }}"
13-
REDIS_HOST: "{{ redis_host }}"
13+
REDIS_HOST: "{{ redis_host_address }}"
1414
REDIS_PORT: "{{ redis_port }}"

ansible/group_vars/alpha-detention.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ node_version: "0.12.0"
88
npm_version: "2.1.18"
99

1010
# for redis
11-
redis_key: "frontend:{{ detention_url }}"
11+
redis_key: "frontend:{{ detention_hostname }}"
1212
is_redis_update_required: 'yes'
1313

1414
dockerfile_post_install_commands: [
@@ -17,7 +17,7 @@ dockerfile_post_install_commands: [
1717

1818
container_envs: >
1919
-e NODE_ENV={{ node_env }}
20-
-e ABSOLUTE_URL={{ detention_url }}
20+
-e ABSOLUTE_URL={{ detention_hostname }}
2121
-e PORT={{ hosted_ports[0] }}
2222
2323
container_run_opts: >

ansible/group_vars/alpha-docker-listener.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,9 +6,9 @@ app_repo: "git@github.com:CodeNow/docker-listener.git"
66

77
enviroment_vars:
88
LOGGLY_TOKEN: "{{ loggly_token }}"
9-
RABBITMQ_HOSTNAME: "{{ rabbit_host }}"
9+
RABBITMQ_HOSTNAME: "{{ rabbit_host_address }}"
1010
RABBITMQ_PASSWORD: "{{ rabbit_password }}"
1111
RABBITMQ_PORT: "{{ rabbit_port }}"
1212
RABBITMQ_USERNAME: "{{ rabbit_username }}"
13-
REDIS_IPADDRESS: "{{ redis_host }}"
13+
REDIS_IPADDRESS: "{{ redis_host_address }}"
1414
REDIS_PORT: "{{ redis_port }}"

ansible/group_vars/alpha-eru.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,14 +8,14 @@ node_version: "0.12.0"
88
npm_version: "2.1.18"
99

1010
# for redis
11-
redis_key: frontend:{{ eru_url }}
11+
redis_key: frontend:{{ eru_hostname }}
1212
is_redis_update_required: yes
1313

1414
container_envs: >
15-
-e ADMIN_DOMAIN={{ eru_url }}
15+
-e ADMIN_DOMAIN={{ eru_hostname }}
1616
-e ADMIN_GITHUB_ID={{ eru_github_id }}
1717
-e ADMIN_GITHUB_SECRET={{ eru_github_secret }}
18-
-e API_HOST={{ api_url }}
18+
-e API_HOST={{ api_hostname }}
1919
-e RUNNABLE_HOST={{ domain }}
2020
-e PORT={{ hosted_ports[0] }}
2121

ansible/group_vars/alpha-khronos.yml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -10,20 +10,20 @@ npm_version: "2.1.18"
1010
# this is the list of queues we want to enqueue a job into
1111
cron_queues: khronos:containers:image-builder:prune khronos:containers:orphan:prune khronos:context-versions:prune-expired khronos:images:prune khronos:weave:prune
1212
# a nice version of the rabbitmq host
13-
cron_rabbit_host: "{{ rabbit_host }}:{{ rabbit_port }}"
13+
cron_rabbit_host_address: "{{ rabbit_host_address }}:{{ rabbit_port }}"
1414
# a quick version of authentication for rabbit for cron
1515
cron_rabbit_auth: --username {{ rabbit_username }} --password {{ rabbit_password }}
1616
# this is the command we want to run in the container.
17-
cron_command: "bash -c \"for QUEUE in {{ cron_queues }}; do /khronos/bin/cli.js --queue \\$QUEUE --job '{}' --host {{ cron_rabbit_host }} {{ cron_rabbit_auth }}; done\""
17+
cron_command: "bash -c \"for QUEUE in {{ cron_queues }}; do /khronos/bin/cli.js --queue \\$QUEUE --job '{}' --host {{ cron_rabbit_host_address }} {{ cron_rabbit_auth }}; done\""
1818

1919
# for container settings
2020
container_envs: >
21-
-e DATADOG_HOST={{ datadog_host }}
21+
-e DATADOG_HOST={{ datadog_host_address }}
2222
-e DATADOG_PORT={{ datadog_port }}
2323
-e KHRONOS_MONGO=mongodb://{{ khronos_mongo_auth }}@{{ mongo_hosts }}/{{ khronos_mongo_database }}
2424
-e LOG_LEVEL=info
2525
-e NODE_ENV={{ node_env }}
26-
-e RABBITMQ_HOSTNAME={{ rabbit_host }}
26+
-e RABBITMQ_HOSTNAME={{ rabbit_host_address }}
2727
-e RABBITMQ_PASSWORD={{ rabbit_password }}
2828
-e RABBITMQ_PORT={{ rabbit_port }}
2929
-e RABBITMQ_USERNAME={{ rabbit_username }}

ansible/group_vars/alpha-mavis.yml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -8,19 +8,19 @@ node_version: "0.10.38"
88
npm_version: "2.1.18"
99

1010
# for redis
11-
redis_key: "frontend:{{ mavis_url }}"
11+
redis_key: "frontend:{{ mavis_hostname }}"
1212
is_redis_update_required: 'yes'
1313

1414
# container settings
1515
container_envs: >
1616
-e PORT={{ hosted_ports[0] }}
1717
-e REDIS_PORT={{ redis_port }}
18-
-e REDIS_IPADDRESS={{ redis_host }}
19-
-e DATADOG_HOST={{ datadog_host }}
18+
-e REDIS_IPADDRESS={{ redis_host_address }}
19+
-e DATADOG_HOST={{ datadog_host_address }}
2020
-e DATADOG_PORT={{ datadog_port }}
2121
-e CONTAINER_WEIGHT=0
2222
-e NEWRELIC_KEY={{ new_relic_license_key }}
23-
-e RABBITMQ_HOSTNAME={{ rabbit_host }}
23+
-e RABBITMQ_HOSTNAME={{ rabbit_host_address }}
2424
-e RABBITMQ_PASSWORD={{ rabbit_password }}
2525
-e RABBITMQ_PORT={{ rabbit_port }}
2626
-e RABBITMQ_USERNAME={{ rabbit_username }}

0 commit comments

Comments
 (0)