From 91b80afe291483ff2dafd9f8a92849fac3f56b89 Mon Sep 17 00:00:00 2001 From: Ryan Sandor Richards Date: Tue, 13 Oct 2015 15:24:44 -0700 Subject: [PATCH 1/4] Changes so we can deploy shiva from within the astral project. --- ansible/group_vars/alpha-shiva.yml | 6 ++++-- ansible/roles/builder/defaults/main.yml | 1 + ansible/roles/builder/templates/basic_node/Dockerfile | 2 +- 3 files changed, 6 insertions(+), 3 deletions(-) diff --git a/ansible/group_vars/alpha-shiva.yml b/ansible/group_vars/alpha-shiva.yml index bfb0d18e..691cdc0c 100644 --- a/ansible/group_vars/alpha-shiva.yml +++ b/ansible/group_vars/alpha-shiva.yml @@ -1,11 +1,13 @@ name: "shiva" - -container_image: "registry.runnable.com/runnable/{{ name }}" +container_image: "registry.runnable.com/runnable/shiva" container_tag: "{{ git_branch }}" repo: "git@github.com:CodeNow/{{ name }}.git" node_version: "0.10.38" npm_version: "2.1.18" +# Overrides the start command in the builder role +npm_start_command: "run shiva-start" + # Not actually needed, just allows container-kill-start to work hosted_ports: ["3000"] diff --git a/ansible/roles/builder/defaults/main.yml b/ansible/roles/builder/defaults/main.yml index 9caab169..cef01800 100644 --- a/ansible/roles/builder/defaults/main.yml +++ b/ansible/roles/builder/defaults/main.yml @@ -1,2 +1,3 @@ --- build_dir: /opts/builds/docker_build/ +npm_start_command: start diff --git a/ansible/roles/builder/templates/basic_node/Dockerfile b/ansible/roles/builder/templates/basic_node/Dockerfile index 786a6776..98f3a6bc 100644 --- a/ansible/roles/builder/templates/basic_node/Dockerfile +++ b/ansible/roles/builder/templates/basic_node/Dockerfile @@ -34,4 +34,4 @@ RUN {{ command }} {% endif %} # Define default command. -CMD ulimit -c unlimited && /usr/local/bin/npm start > /var/log/{{ name }}.log 2>&1 +CMD ulimit -c unlimited && /usr/local/bin/npm {{ npm_start_command }} > /var/log/{{ name }}.log 2>&1 From e0f48d14425772c313b274567ffaa55bfbbfb0de Mon Sep 17 00:00:00 2001 From: Ryan Sandor Richards Date: Tue, 13 Oct 2015 16:14:53 -0700 Subject: [PATCH 2/4] Changed DB and Repo name for shiva (now astral) --- ansible/beta-hosts/variables | 2 +- ansible/group_vars/alpha-shiva.yml | 2 +- ansible/prod-hosts/variables | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/ansible/beta-hosts/variables b/ansible/beta-hosts/variables index 398ead09..0828a660 100644 --- a/ansible/beta-hosts/variables +++ b/ansible/beta-hosts/variables @@ -55,7 +55,7 @@ datadog_tags=env:beta domain=runnable-beta.com new_relic_license_key=338516e0826451c297d44dc60aeaf0a0ca4bfead node_env=production-beta -pg_database=shiva +pg_database=astral pg_host=beta-infrastructure-db.cnksgdqarobf.us-west-2.rds.amazonaws.com pg_pass=QBjSpAXVYwmGHu4Y pg_user=shiva diff --git a/ansible/group_vars/alpha-shiva.yml b/ansible/group_vars/alpha-shiva.yml index 691cdc0c..4c6aa74a 100644 --- a/ansible/group_vars/alpha-shiva.yml +++ b/ansible/group_vars/alpha-shiva.yml @@ -1,7 +1,7 @@ name: "shiva" container_image: "registry.runnable.com/runnable/shiva" container_tag: "{{ git_branch }}" -repo: "git@github.com:CodeNow/{{ name }}.git" +repo: "git@github.com:CodeNow/astral.git" node_version: "0.10.38" npm_version: "2.1.18" diff --git a/ansible/prod-hosts/variables b/ansible/prod-hosts/variables index 75ec3570..41054a66 100644 --- a/ansible/prod-hosts/variables +++ b/ansible/prod-hosts/variables @@ -55,7 +55,7 @@ datadog_tags=env:alpha domain=runnable.io new_relic_license_key=338516e0826451c297d44dc60aeaf0a0ca4bfead node_env=production -pg_database=shiva +pg_database=astral pg_host=alpha-production-db.czw5moz6rmpp.us-west-1.rds.amazonaws.com:30573 pg_pass=wCJGCfCWE9CKmQwa2XUKj6d8WYcEZAb9 pg_user=shiva From fb897e6acf229f3f78497a9f05748d660f8e2514 Mon Sep 17 00:00:00 2001 From: Ryan Sandor Richards Date: Tue, 13 Oct 2015 17:05:31 -0700 Subject: [PATCH 3/4] Node versions and container image name for shiva. --- ansible/group_vars/alpha-shiva.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/ansible/group_vars/alpha-shiva.yml b/ansible/group_vars/alpha-shiva.yml index 4c6aa74a..7a08eda0 100644 --- a/ansible/group_vars/alpha-shiva.yml +++ b/ansible/group_vars/alpha-shiva.yml @@ -1,9 +1,9 @@ name: "shiva" -container_image: "registry.runnable.com/runnable/shiva" +container_image: "registry.runnable.com/runnable/{{name}}" container_tag: "{{ git_branch }}" repo: "git@github.com:CodeNow/astral.git" -node_version: "0.10.38" -npm_version: "2.1.18" +node_version: "4.2.1" +npm_version: "2.8.3" # Overrides the start command in the builder role npm_start_command: "run shiva-start" From da8870e986d75b7f4ef2babdcc863209fc313213 Mon Sep 17 00:00:00 2001 From: anandkumarpatel Date: Tue, 13 Oct 2015 17:09:01 -0700 Subject: [PATCH 4/4] Update alpha-shiva.yml --- ansible/group_vars/alpha-shiva.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ansible/group_vars/alpha-shiva.yml b/ansible/group_vars/alpha-shiva.yml index 7a08eda0..2adadedb 100644 --- a/ansible/group_vars/alpha-shiva.yml +++ b/ansible/group_vars/alpha-shiva.yml @@ -1,5 +1,5 @@ name: "shiva" -container_image: "registry.runnable.com/runnable/{{name}}" +container_image: "registry.runnable.com/runnable/{{ name }}" container_tag: "{{ git_branch }}" repo: "git@github.com:CodeNow/astral.git" node_version: "4.2.1"