Merge remote-tracking branch 'origin/master' into add-big-poppa

Author: Nathan219

README.md

@@ -9,7 +9,7 @@ Scripts for managing our deployments.
 Before you can deploy you'll need to install the appropriate tools, scripts, and keys on your local machine.
 To do so, execute the following steps:
 
-1. Install Ansible (the deploy automation tool we use to deploy projects to production)
+1. Install Ansible v2.1.0.0 (the deploy automation tool we use to deploy projects to production)
 http://docs.ansible.com/intro_installation.html
 
 2. Get the latest devops-scripts (the recipes that we use to deploy various projects)
@@ -18,7 +18,7 @@ https://github.com/CodeNow/devops-scripts
 3. Change to the devops scripts repo directory and run the following command:
 `ln -s /<local-path-to-devops-scripts>/ssh/config ~/.ssh/config`
 
-4. Obtain the “Keys of Power” from someone who can already deploy (ask Anand if you don’t know). Depending on what you want to deploy you'll receive either `Test-runnable.pem`, `oregon.pem`, or both.
+4. Obtain the “Keys of Power” from someone who can already deploy (ask Anand if you don’t know). Depending on what you want to deploy you'll receive either `Test-runnable.pem`, `oregon.pem`, `delta.pem`, `delta-prime.pem` or some combination of them.
 
 5. Move the “Keys of Power” .pem  files to your `~/.ssh` directory
 

ansible/group_vars/alpha-api-base.yml

@@ -1,7 +1,7 @@
 container_tag: "{{ git_branch }}"
 
-node_version: 0.10.38
-npm_version: 2.8.3
+node_version: 4.2.2
+npm_version: 2.14.7
 
 repo: git@github.com:CodeNow/api.git
 restart_policy: always
@@ -41,9 +41,6 @@ api_base_container_envs: >-
   -e HELLO_RUNNABLE_GITHUB_TOKEN={{ api_hello_runnable_github_token }}
   -e KRAIN_PORT={{ krain_port }}
   -e MIXPANEL_APP_ID={{ api_mixpanel_app_id }}
-  -e MONGO_CACERT=/opt/ssl/mongodb-client/ca.pem
-  -e MONGO_CERT=/opt/ssl/mongodb-client/cert.pem
-  -e MONGO_KEY=/opt/ssl/mongodb-client/key.pem
   -e MONGO_REPLSET_NAME={{ api_mongo_replset_name }}
   -e MONGO=mongodb://{{ api_mongo_auth }}@{{ mongo_hosts }}/{{ api_mongo_database }}
   -e NAVI_HOST=http://{{ navi_host_address }}:{{ navi_http_port }}

ansible/roles/build_with_dockerfile/tasks/main.yml

@@ -1,5 +1,10 @@
 ---
 # commands to build an image from a repo that contains a Dockerfile
+- name: Ensure Tag Deploy For Prod
+  tags: deploy
+  when: not git_branch | match("^v([0-9]+)\.([0-9]+)\.([0-9]+)$") and node_env=="production-delta"
+  fail: msg="only tag can be deployed on prod not {{ git_branch }}"
+
 - name: create build folder
   become: true
   file:

ansible/roles/builder/tasks/main.yml

@@ -1,5 +1,11 @@
 ---
 # commands to build an image
+#
+- name: Ensure Tag Deploy For Prod
+  tags: deploy
+  when: not git_branch | match("^v([0-9]+)\.([0-9]+)\.([0-9]+)$") and node_env=="production-delta"
+  fail: msg="only tag can be deployed on prod not {{ git_branch }}"
+
 - name: create build folder
   become: true
   file:

ansible/roles/git_repo/tasks/main.yml

@@ -1,4 +1,9 @@
 ---
+- name: Ensure Tag Deploy For Prod
+  tags: deploy
+  when: not git_branch | match("^v([0-9]+)\.([0-9]+)\.([0-9]+)$") and node_env=="production-delta"
+  fail: msg="only tag can be deployed on prod not {{ git_branch }}"
+
 - name: Display Git Repo Name
   debug:
     msg: "application Installed: {{ app_name }}, branch : {{ git_branch }} "