Skip to content

Commit 2fe6039

Browse files
author
Christopher M. Neill
committed
Merge branch 'master' into add-ec2-inventory
2 parents 1ca4881 + 2ce1fa4 commit 2fe6039

60 files changed

Lines changed: 568 additions & 193 deletions

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎README.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,7 @@ ansible-playbook -i ./[stage-hosts, prod-hosts] [appname].yml -t deploy -e git_b
6060
This will redeploy the current deploy without rebuilding
6161

6262
```
63-
ansible-playbook -i./[stage-hosts, prod-hosts] [appname].yml -e git_branch=some-branch-name -e build_args=--no-cache
63+
ansible-playbook -i ./[stage-hosts, prod-hosts] [appname].yml -e git_branch=some-branch-name -e build_args=--no-cache
6464
```
6565

6666
deploy latest version of the branch

‎ansible/api-core.yml‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@
55
- hosts: charon
66
- hosts: rabbitmq
77
- hosts: redis
8+
- hosts: swarm-manager
89

910
- hosts: api
1011
vars_files:

‎ansible/beta-hosts/hosts‎

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -34,6 +34,9 @@ beta-api
3434
[eru]
3535
beta-services
3636

37+
[fluffy]
38+
beta-services
39+
3740
[navi]
3841
beta-navi
3942

@@ -73,6 +76,9 @@ beta-redis
7376
[redis-slave]
7477
beta-redis-slave
7578

79+
[sauron]
80+
beta-services
81+
7682
[shiva]
7783
beta-services
7884

@@ -93,6 +99,7 @@ bastion
9399
charon
94100
docks
95101
eru
102+
fluffy
96103
hipache
97104
khronos
98105
link
@@ -106,6 +113,7 @@ rabbitmq
106113
redis
107114
redis-slave
108115
registry
116+
sauron
109117
shiva
110118
swarm-manager
111119
web

‎ansible/beta-hosts/variables‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,6 @@ api_aws_secret_access_key=A6XOpeEElvvIulfAzVLohqKtpKij5ZE8h0FFx0Jn
44
api_github_client_id=baa5c868b6d17d7ae002
55
api_github_client_secret=ad4f8527ae98d7eea15a32ee5abbead5c9a25abc
66
api_github_deploy_keys_bucket=runnable.deploykeys.production-beta
7-
api_hello_runnable_github_token=88ddc423c2312d02a8bbcaad76dd4c374a30e4af
87
api_mixpanel_app_id=c41affa4b08818443365c526cbb51606
98
api_mongo_auth=api:oW4c7x9Wiv28oiNBy2Bc
109
api_mongo_database=beta
@@ -60,6 +59,7 @@ rabbit_username=o2mdLh9N9Ke2GzhoK8xsruYPhIQFN7iEL44dQJoq7OM
6059
registry_host=10.20.1.55
6160
swarm_token=d363b783f03a845a2c82b081bfe8443e
6261
user_content_domain=runnablecloud.com
62+
api_hello_runnable_github_token=88ddc423c2312d02a8bbcaad76dd4c374a30e4af
6363

6464
[ec2:vars]
6565
env=beta
@@ -94,4 +94,3 @@ sg_redis=sg-81d01ee5
9494
sg_services=sg-950172f1
9595
sg_userland=sg-5a28663e
9696
sg_web=sg-58da143c
97-

‎ansible/charon.yml‎

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,11 @@
11
---
22
- hosts: redis
3+
- hosts: consul
34

45
- hosts: docks
56
vars_files:
6-
- "group_vars/alpha-charon.yml"
7+
- group_vars/alpha-charon.yml
78
roles:
8-
- { role: notify, tags: "notify" }
9-
- { role: git_node_service, tags: "deploy" }
9+
- { role: notify, tags: [notify] }
10+
- { role: git_node_service, tags: [deploy] }
11+
- { role: consul_value, tags: [deploy, consul_value] }

‎ansible/consul-values.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,5 +28,5 @@
2828
- name: print values to screen
2929
run_once: true
3030
when: read_values is defined
31-
debug: msg='{{ item.item.key }}: {{ item.json[0].Value | b64decode }}'
31+
debug: msg="{{ item.item.key }}" -> "{{ item.json[0].Value | b64decode }}"
3232
with_items: "{{ values.results }}"

‎ansible/dock-init.yml‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
---
2+
- hosts: consul
3+
vars_files:
4+
- group_vars/alpha-dock-init.yml
5+
roles:
6+
- { role: notify, tags: [notify] }
7+
- { role: consul_value, tags: [deploy, consul_value] }

‎ansible/docker-listener.yml‎

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,14 @@
11
---
22
- hosts: rabbitmq
33
- hosts: redis
4+
- hosts: consul
45

56
- hosts: docks
67
vars_files:
7-
- "group_vars/alpha-docker-listener.yml"
8+
- group_vars/alpha-docker-listener.yml
89
roles:
9-
- { role: notify, tags: "notify" }
10+
- { role: notify, tags: [notify] }
1011
- { role: build_essential }
1112
- { role: docker_client }
12-
- { role: git_node_service, tags: "deploy" }
13+
- { role: git_node_service, tags: [deploy] }
14+
- { role: consul_value, tags: [deploy, consul_value] }

‎ansible/filibuster.yml‎

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,10 @@
11
---
2+
- hosts: consul
3+
24
- hosts: docks
35
vars_files:
4-
- "group_vars/alpha-filibuster.yml"
6+
- group_vars/alpha-filibuster.yml
57
roles:
6-
- { role: notify, tags: "notify" }
7-
- { role: git_node_service, tags: "deploy" }
8-
8+
- { role: notify, tags: [notify] }
9+
- { role: git_node_service, tags: [deploy] }
10+
- { role: consul_value, tags: [deploy, consul_value] }

‎ansible/fluffy.yml‎

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
1+
---
2+
- hosts: redis
3+
4+
- hosts: fluffy
5+
vars_files:
6+
- "group_vars/alpha-fluffy.yml"
7+
roles:
8+
- { role: notify, tags: "notify" }
9+
- { role: redis_key, tags: ["setup", "redis_key"] }
10+
- { role: builder, tags: "build" }
11+
- { role: container_start, tags: "deploy" }
12+

0 commit comments

Comments
 (0)