Skip to content

Commit d860b02

Browse files
anandkumarpatelanandkumarpatel
committed
Merge branch 'master' into bump-weave
2 parents 9af62f8 + 4f356fe commit d860b02

10 files changed

Lines changed: 69 additions & 2 deletions

File tree

‎ansible/beta-hosts/hosts‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -62,6 +62,9 @@ beta-redis-slave
6262
[shiva]
6363
beta-services
6464

65+
[metis]
66+
beta-services
67+
6568
[registry]
6669
beta-registry
6770

‎ansible/group_vars/alpha-hipache.yml‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,6 @@
11
# container_kill_start settings
2+
name: hipache
3+
24
container_image: registry.runnable.com/runnable/hipache
35
container_tag: latest
46
container_run_opts: >

‎ansible/group_vars/alpha-krain.yml‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,6 @@
11
# krain options
2+
name: krain
3+
24
krain_env: default
35

46
# upstart template variables

‎ansible/group_vars/alpha-metis.yml‎

Lines changed: 39 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,39 @@
1+
name: "metis"
2+
container_image: "registry.runnable.com/runnable/{{ name }}"
3+
container_tag: "{{ git_branch }}"
4+
repo: "git@github.com:CodeNow/astral.git"
5+
node_version: "4.2.1"
6+
npm_version: "2.8.3"
7+
8+
# Overrides the start command in the builder role
9+
npm_start_command: "run metis-start"
10+
11+
# Not actually needed, just allows container-kill-start to work
12+
hosted_ports: ["3000"]
13+
14+
# Needed for the UserData script in shiva
15+
redis_host: "{{ hostvars[groups['redis'][0]]['ansible_default_ipv4']['address'] }}"
16+
redis_port: 6379
17+
18+
# container settings
19+
container_envs: >
20+
-e DATADOG_HOST={{ datadog_host }}
21+
-e DATADOG_PORT={{ datadog_port }}
22+
-e RABBITMQ_HOSTNAME={{ rabbit_host | default(hostvars[groups['rabbitmq'][0]]['ansible_default_ipv4']['address']) }}
23+
-e RABBITMQ_PASSWORD={{ rabbit_password }}
24+
-e RABBITMQ_PORT={{ rabbit_port }}
25+
-e RABBITMQ_USERNAME={{ rabbit_username }}
26+
-e POSTGRES_CONNECT_STRING=postgres://{{ pg_user }}:{{ pg_pass }}@{{ pg_host }}/{{ pg_database }}
27+
-e AWS_ACCESS_KEY_ID={{ aws_access_key_id }}
28+
-e AWS_SECRET_ACCESS_KEY={{ aws_secret_access_key }}
29+
-e NODE_ENV={{ node_env }}
30+
-e REDIS_HOST={{ redis_host }}
31+
-e REDIS_PORT={{ redis_port }}
32+
-e REDIS_IPADDRESS={{ redis_host }}
33+
-e REGISTRY_HOST={{ registry_host }}
34+
-e ROLLBAR_KEY={{ shiva_rollbar_key }}
35+
-e DOCKER_PORT={{ docker_port }}
36+
-e SWARM_TOKEN={{ swarm_token }}
37+
--hostname={{ name }}
38+
39+
container_run_opts: "-d -P {{container_envs}}"

‎ansible/group_vars/alpha-mongo.yml‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,6 @@
11
# database vars
2+
name: mongo
3+
24
db_path: "/opt/mongodb/db"
35

46
# container_kill_start settings

‎ansible/group_vars/alpha-rabbitmq.yml‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,6 @@
11
# database vars
2+
name: rabbitmq
3+
24
db_path: "/opt/rabbitmq/db"
35
config_path: "/opt/rabbitmq/config"
46

‎ansible/group_vars/alpha-redis.yml‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
# database vars
2+
name: redis
23
db_path: "/opt/redis/db"
34

45
# container_kill_start settings

‎ansible/group_vars/alpha-sauron.yml‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,8 @@
11
# upstart template variables
2-
app_name: "sauron"
3-
app_repo: "git@github.com:CodeNow/sauron.git"
2+
name: sauron
3+
4+
app_name: {{ name }}
5+
app_repo: "git@github.com:CodeNow/{{ name }}.git"
46

57
redis_host: "{{ hostvars[groups['redis'][0]]['ansible_default_ipv4']['address'] }}"
68
redis_port: 6379

‎ansible/metis.yml‎

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

‎ansible/prod-hosts/hosts‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -71,6 +71,9 @@ alpha-registry
7171
[shiva]
7272
alpha-api-old
7373

74+
[metis]
75+
alpha-api-old
76+
7477
[swarm-manager]
7578
alpha-api-old
7679

0 commit comments

Comments
 (0)