diff options
| author | Carlos Konstanski <ckonstanski@pippiandcarlos.com> | 2017-10-25 11:11:32 -0600 |
|---|---|---|
| committer | Carlos Konstanski <ckonstanski@pippiandcarlos.com> | 2017-10-25 11:11:32 -0600 |
| commit | 7680bdf1bc2fa72c13a0a8bb3a04cc1c5f08026e (patch) | |
| tree | 9b19a84c521195b4fde656aa97083a24138c6b60 /salt/openbook/ansible/files/openbook.yaml | |
| parent | 4c1f3938526b7b653012832d066e081eb134c167 (diff) | |
some ansible variables are coming from salt but they need to be env-specific
Issue: IS-22
Diffstat (limited to 'salt/openbook/ansible/files/openbook.yaml')
| -rw-r--r-- | salt/openbook/ansible/files/openbook.yaml | 16 |
1 files changed, 8 insertions, 8 deletions
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" |