Merge branch '5-2-update-dock-init-and-charon' of https://github.com/CodeNow/devops-scripts into 5-2-update-dock-init-and-charon

Author: Henry Mollman

ansible/group_vars/alpha-api-base.yml

@@ -119,4 +119,4 @@ api_base_container_envs:
   - name: INTERCOM_API_KEY
     value: "{{ api_intercom_api_key | default('ansible_undefined') }}"
   - name: USER_VAULT_ENDPOINT
-    value: "http://{{ user_vault_host_address }}:{{ user_vault_port }}"
+    value: "http://{{ user_vault_load_balancer }}:{{ user_vault_port }}"

ansible/roles/dock_launch_config/templates/init.tmpl

@@ -39,7 +39,7 @@ service charon start
 CONSUL_HOSTNAME={{ consul_host_address }} \
 CONSUL_PORT={{ consul_api_port }} \
 VAULT_PORT={{ vault_port }} \
-USER_VAULT_HOSTNAME={{ user_vault_host_address }} \
+USER_VAULT_HOSTNAME={{ user_vault_load_balancer }} \
 USER_VAULT_PORT={{ user_vault_port }} \
 {% if has_token %}
 S3_ACCESS_KEY={{ dock_registry_s3_access_key }} \

ansible/roles/git_repo/tasks/main.yml

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