Skip to content

Commit c8d9b93

Browse files
Merge branch 'master' into SAN-3546-loggly-tags
2 parents 6bd403f + f313145 commit c8d9b93

10 files changed

Lines changed: 86 additions & 1 deletion

File tree

ansible/delta-hosts/hosts

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -107,6 +107,9 @@ delta-app-services
107107
[drake]
108108
delta-app-services
109109

110+
[pheidi]
111+
delta-app-services
112+
110113
[delta:children]
111114
api
112115
bastion
@@ -125,6 +128,7 @@ mongodb
125128
navi
126129
neo4j
127130
optimus
131+
pheidi
128132
rabbitmq
129133
redis
130134
redis-slave

ansible/delta-hosts/variables

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -58,6 +58,11 @@ optimus_github_deploy_keys_bucket=runnable.deploykeys.production
5858
[palantiri:vars]
5959
palantiri_rollbar_key=f675e9090d6f483ca4e742af2c7f2f83
6060

61+
[pheidi:vars]
62+
pheidi_mongo_auth=pheidi:septa-mauve-enquiry-clipper-history
63+
pheidi_mongo_database=delta
64+
pheidi_mongo_replset_name=delta
65+
6166
[sauron:vars]
6267
sauron_rollbar_key=83157ae2d50d4b6398e404c0b9978d26
6368

ansible/epsilon-hosts/hosts

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -102,6 +102,9 @@ epsilon-app-services
102102
[drake]
103103
epsilon-app-services
104104

105+
[pheidi]
106+
epsilon-app-services
107+
105108
[epsilon:children]
106109
api
107110
bastion
@@ -122,6 +125,7 @@ neo4j
122125
optimus
123126
rabbitmq
124127
redis
128+
pheidi
125129
registry
126130
sauron
127131
shiva

ansible/epsilon-hosts/variables

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -48,6 +48,11 @@ optimus_github_deploy_keys_bucket=runnable.deploykeys.production-beta
4848
[palantiri:vars]
4949
palantiri_rollbar_key=f675e9090d6f483ca4e742af2c7f2f83
5050

51+
[pheidi:vars]
52+
pheidi_mongo_auth=api:3f5210b8-8fe3-11e5-8e62-07b6eff19ecb
53+
pheidi_mongo_database=epsilon
54+
pheidi_mongo_replset_name=epsilon
55+
5156
[sauron:vars]
5257
sauron_rollbar_key=83157ae2d50d4b6398e404c0b9978d26
5358

ansible/gamma-hosts/hosts

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -103,6 +103,9 @@ gamma-app-services
103103
[drake]
104104
gamma-app-services
105105

106+
[pheidi]
107+
gamma-app-services
108+
106109
[docks]
107110

108111
[dock]
@@ -126,6 +129,7 @@ mongodb
126129
navi
127130
neo4j
128131
optimus
132+
pheidi
129133
rabbitmq
130134
redis
131135
redis-slave
@@ -139,8 +143,11 @@ web
139143
web
140144
worker
141145

142-
[ec2]
146+
[local]
143147
127.0.0.1
144148

149+
[ec2]
150+
local
151+
145152
[targets]
146153
localhost ansible_connection=local bastion_name=gamma-bastion

ansible/gamma-hosts/variables

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -48,6 +48,11 @@ optimus_github_deploy_keys_bucket=runnable.deploykeys.production-beta
4848
[palantiri:vars]
4949
palantiri_rollbar_key=f675e9090d6f483ca4e742af2c7f2f83
5050

51+
[pheidi:vars]
52+
pheidi_mongo_auth=api:3f5210b8-8fe3-11e5-8e62-07b6eff19ecb
53+
pheidi_mongo_database=gamma
54+
pheidi_mongo_replset_name=gamma
55+
5156
[sauron:vars]
5257
sauron_rollbar_key=83157ae2d50d4b6398e404c0b9978d26
5358

ansible/group_vars/all.yml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -137,6 +137,9 @@ optimus_rollbar_token: a49f9cce09ee46f09df3f603178fba75
137137
# palantiri
138138
palantiri_rollbar_token: f675e9090d6f483ca4e742af2c7f2f83
139139

140+
# pheidi
141+
pheidi_rollbar_token: 6fc422ac645441bea7f6f14853eb01ab
142+
140143
# rabbit
141144
rabbit_host_address: "{{ hostvars[groups['rabbitmq'][0]]['ansible_default_ipv4']['address'] }}"
142145
rabbit_port: 54321
Lines changed: 33 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,33 @@
1+
name: pheidi
2+
3+
container_image: "registry.runnable.com/runnable/{{ name }}"
4+
container_tag: "{{ git_branch }}"
5+
repo: "git@github.com:CodeNow/{{ name }}.git"
6+
node_version: "4.2.2"
7+
npm_version: "2.14.7"
8+
9+
container_envs: >
10+
-e DATADOG_HOST={{ datadog_host_address }}
11+
-e DATADOG_PORT={{ datadog_port }}
12+
-e DOMAIN={{ domain }}
13+
-e LOGGLY_TOKEN="{{ loggly_token }}"
14+
-e NODE_ENV="{{ node_env }}"
15+
-e FULL_API_DOMAIN=https://api.{{ domain }}
16+
-e RABBITMQ_HOSTNAME="{{ rabbit_host_address }}"
17+
-e RABBITMQ_PASSWORD="{{ rabbit_password }}"
18+
-e RABBITMQ_PORT="{{ rabbit_port }}"
19+
-e RABBITMQ_USERNAME="{{ rabbit_username }}"
20+
-e ROLLBAR_KEY={{ pheidi_rollbar_token }}
21+
{% if node_env != "production-epsilon" %} -e MONGO_CACERT=/opt/ssl/mongo-client/ca.pem {% endif %}
22+
{% if node_env != "production-epsilon" %} -e MONGO_CERT=/opt/ssl/mongo-client/cert.pem {% endif %}
23+
{% if node_env != "production-epsilon" %} -e MONGO_KEY=/opt/ssl/mongo-client/key.pem {% endif %}
24+
-e MONGO_REPLSET_NAME={{ pheidi_mongo_replset_name }}
25+
-e MONGO=mongodb://{{ pheidi_mongo_auth }}@{{ mongo_hosts }}/{{ pheidi_mongo_database }}
26+
-e USER_CONTENT_DOMAIN={{ user_content_domain }}
27+
-e WEB_URL=https://app.{{ domain }}
28+
29+
container_run_opts: >
30+
-h {{ name }}
31+
-d
32+
-v /opt/ssl/mongodb-client:/opt/ssl/mongo-client:ro
33+
{{ container_envs }}

ansible/pheidi.yml

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,15 @@
1+
---
2+
- hosts: consul
3+
- hosts: mongodb
4+
- hosts: rabbitmq
5+
6+
- hosts: pheidi
7+
vars_files:
8+
- group_vars/alpha-pheidi.yml
9+
roles:
10+
- role: notify
11+
rollbar_token: "{{ pheidi_rollbar_token }}"
12+
tags: [ notify ]
13+
- { role: builder, tags: [build] }
14+
- { role: tls-client, tls_service: mongodb, tags: [ tls ] }
15+
- { role: container_kill_start }

ansible/roles/ec2/sg_configure/tasks/main.yml

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -197,6 +197,10 @@
197197
from_port: 27000
198198
to_port: 27020
199199
group_id: "{{ sg_dock_services }}"
200+
- proto: tcp
201+
from_port: 27000
202+
to_port: 27020
203+
group_id: "{{ sg_app_services }}"
200204

201205
- name: Navi SG
202206
tags:

0 commit comments

Comments
 (0)