Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
2 changes: 1 addition & 1 deletion ansible/api-core.yml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
---
- hosts: mongodb
- hosts: clio
- hosts: navi
- hosts: charon
- hosts: rabbitmq
- hosts: redis
- hosts: big-poppa
Expand Down
36 changes: 14 additions & 22 deletions ansible/delta-hosts/hosts
Original file line number Diff line number Diff line change
Expand Up @@ -53,17 +53,17 @@ delta-api-socket
delta-api-socket-proxy

[deployer]
delta-app-services
delta-app-services-1

[docks]

[dock]

[agreeable-egret]
delta-app-services
delta-app-services-1

[eru]
delta-app-services
delta-app-services-1

[navi]
delta-navi
Expand All @@ -72,22 +72,19 @@ delta-navi
delta-navi

[clio]
delta-app-services
delta-app-services-1

[link]
delta-navi

[charon]
delta-app-services

[khronos]
delta-dock-services

[optimus]
delta-dock-services

[detention]
delta-app-services
delta-app-services-1

[palantiri]
delta-dock-services
Expand All @@ -96,10 +93,10 @@ delta-dock-services
delta-rabbit

[web]
delta-app-services
delta-app-services-1

[marketing]
delta-app-services
delta-app-services-1

[metabase]
delta-metabase
Expand All @@ -111,7 +108,7 @@ delta-redis
delta-redis-slave

[shiva]
delta-app-services
delta-app-services-2

[registry]
delta-registry
Expand All @@ -122,26 +119,23 @@ delta-dock-services
[swarm-manager]
delta-swarm-manager

[metis]
delta-app-services

[drake]
delta-app-services
delta-app-services-2

[pheidi]
delta-app-services
delta-app-services-1

[github-varnish]
delta-app-services
delta-app-services-1

[big-poppa]
delta-app-services
delta-app-services-2

[cream]
delta-app-services
delta-app-services-2

[arithmancy]
delta-app-services
delta-app-services-1

[prometheus]
delta-prometheus
Expand All @@ -152,7 +146,6 @@ api
arithmancy
bastion
big-poppa
charon
consul
cream
dock
Expand All @@ -165,7 +158,6 @@ hipache
ingress
khronos
metabase
metis
mongodb
navi
optimus
Expand Down
3 changes: 0 additions & 3 deletions ansible/delta-hosts/variables
Original file line number Diff line number Diff line change
Expand Up @@ -101,9 +101,6 @@ metabase_pg_pass=nifty-prowl-sought-muscles
metabase_pg_port=5432
metabase_pg_user=metabase

[metis:vars]
metis_rollbar_key=fdc8565a7ce64c6d9432c34be425937c

[navi:vars]
navi_new_relic_app_name=delta-navi
navi_cookie_secret=e80173940e7bdd84734e868b6ea054a0
Expand Down
2 changes: 1 addition & 1 deletion ansible/pheidi.yml
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
---
- hosts: consul
- hosts: mongodb
- hosts: big-poppa
- hosts: rabbitmq

- hosts: pheidi
Expand All @@ -11,5 +12,4 @@
rollbar_token: "{{ pheidi_rollbar_token }}"
tags: [ notify ]
- { role: builder, tags: [build] }
- { role: tls-client, tls_service: mongodb, tags: [ tls ] }
- { role: container_kill_start }
1 change: 0 additions & 1 deletion ansible/socket-server.yml
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
---
- hosts: mongodb
- hosts: navi
- hosts: charon
- hosts: rabbitmq
- hosts: redis
- hosts: swarm-manager
Expand Down
1 change: 0 additions & 1 deletion ansible/workers.yml
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
---
- hosts: mongodb
- hosts: navi
- hosts: charon
- hosts: rabbitmq
- hosts: redis
- hosts: swarm-manager
Expand Down
6 changes: 6 additions & 0 deletions ssh/config
Original file line number Diff line number Diff line change
Expand Up @@ -148,6 +148,12 @@ Host delta-api-socket-proxy
Host delta-app-services
ProxyCommand ssh -q ubuntu@delta-bastion nc 10.8.13.102 22

Host delta-app-services-1
ProxyCommand ssh -q ubuntu@delta-bastion nc 10.8.14.255 22

Host delta-app-services-2
ProxyCommand ssh -q ubuntu@delta-bastion nc 10.8.12.61 22

Host delta-dock-services
ProxyCommand ssh -q ubuntu@delta-bastion nc 10.8.5.63 22

Expand Down