some ansible variables are coming from salt but they need to be env-specific

Issue: IS-22

2 files changed, 11 insertions, 8 deletions

diff --git a/salt/openbook/ansible/files/env.yaml.openbook.example b/salt/openbook/ansible/files/env.yaml.openbook.example
index ef791ad..d8f971a 100644
--- a/salt/openbook/ansible/files/env.yaml.openbook.example
+++ b/salt/openbook/ansible/files/env.yaml.openbook.example
@@ -3,6 +3,9 @@ globals:
   ansible_ssh_user: root
   ansible_private_key_file: /var/lib/jenkins/.ssh/id_rsa
   ansible_python_interpreter: /usr/bin/python2
+  openbook_docker_registry_url: ~
+  openbook_docker_registry_username: ~
+  openbook_docker_registry_password: ~
 
 environments:
   - unstable:
diff --git a/salt/openbook/ansible/files/openbook.yaml b/salt/openbook/ansible/files/openbook.yaml
index 09ae87d..81addbd 100644
--- a/salt/openbook/ansible/files/openbook.yaml
+++ b/salt/openbook/ansible/files/openbook.yaml
@@ -180,27 +180,27 @@
 
     - name: "Pull docker images"
       shell: |
-        docker login --username {{ pillar["registry"]["username"] }} --password {{ pillar["registry"]["password"] }} {{ pillar["registry"]["url"] }}
+        docker login --username "{% raw %}{{ openbook_docker_registry_username }}{% endraw %}" --password "{% raw %}{{ openbook_docker_registry_password }}{% endraw %}" "{% raw %}{{ openbook_docker_registry_url }}{% endraw %}"
         if [ "{% raw %}{{ openbook_install_database|string() }}{% endraw %}" == "True" ]; then
-            docker pull {{ pillar["registry"]["url"] }}/{{ pillar["database"]["image_name"] }}
+            docker pull "{% raw %}{{ openbook_docker_registry_url }}{% endraw %}/{{ pillar["database"]["image_name"] }}"
         fi
         if [ "{% raw %}{{ openbook_install_job_scheduler_server|string() }}{% endraw %}" == "True" ]; then
-            docker pull {{ pillar["registry"]["url"] }}/{{ pillar["job_scheduler_server"]["image_name"] }}
+            docker pull "{% raw %}{{ openbook_docker_registry_url }}{% endraw %}/{{ pillar["job_scheduler_server"]["image_name"] }}"
         fi
         if [ "{% raw %}{{ openbook_install_workflow_server|string() }}{% endraw %}" == "True" ]; then
-            docker pull {{ pillar["registry"]["url"] }}/{{ pillar["workflow_server"]["image_name"] }}
+            docker pull "{% raw %}{{ openbook_docker_registry_url }}{% endraw %}/{{ pillar["workflow_server"]["image_name"] }}"
         fi
         if [ "{% raw %}{{ openbook_install_admin_api_server|string() }}{% endraw %}" == "True" ]; then
-            docker pull {{ pillar["registry"]["url"] }}/{{ pillar["admin_api_server"]["image_name"] }}
+            docker pull "{% raw %}{{ openbook_docker_registry_url }}{% endraw %}/{{ pillar["admin_api_server"]["image_name"] }}"
         fi
         if [ "{% raw %}{{ openbook_install_customer_api_server|string() }}{% endraw %}" == "True" ]; then
-            docker pull {{ pillar["registry"]["url"] }}/{{ pillar["customer_api_server"]["image_name"] }}
+            docker pull "{% raw %}{{ openbook_docker_registry_url }}{% endraw %}/{{ pillar["customer_api_server"]["image_name"] }}"
         fi
         if [ "{% raw %}{{ openbook_install_admin_web_ui|string() }}{% endraw %}" == "True" ]; then
-            docker pull {{ pillar["registry"]["url"] }}/{{ pillar["admin_web_ui"]["image_name"] }}
+            docker pull "{% raw %}{{ openbook_docker_registry_url }}{% endraw %}/{{ pillar["admin_web_ui"]["image_name"] }}"
         fi
         if [ "{% raw %}{{ openbook_install_customer_web_ui|string() }}{% endraw %}" == "True" ]; then
-            docker pull {{ pillar["registry"]["url"] }}/{{ pillar["customer_web_ui"]["image_name"] }}
+            docker pull "{% raw %}{{ openbook_docker_registry_url }}{% endraw %}/{{ pillar["customer_web_ui"]["image_name"] }}"
         fi
 
 - name: "Start Openbook"