diff options
| author | Carlos Konstanski <ckonstanski@pippiandcarlos.com> | 2018-03-10 12:53:30 -0700 |
|---|---|---|
| committer | Carlos Konstanski <ckonstanski@pippiandcarlos.com> | 2018-03-10 12:53:30 -0700 |
| commit | 82a4e72b03b61fcde7244ba199d834cea9849138 (patch) | |
| tree | e9037732080694ccfb871784c5c8f4e4f6f80e8c /salt/openbook/ansible/files/openbook.yaml | |
| parent | 732ac669a3c7b579cf5e3598d1c767499e39cb92 (diff) | |
Choose the correct docker containers to pull at runtime
Issue: IS-80
Diffstat (limited to 'salt/openbook/ansible/files/openbook.yaml')
| -rw-r--r-- | salt/openbook/ansible/files/openbook.yaml | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/salt/openbook/ansible/files/openbook.yaml b/salt/openbook/ansible/files/openbook.yaml index 2990dd8..ce56561 100644 --- a/salt/openbook/ansible/files/openbook.yaml +++ b/salt/openbook/ansible/files/openbook.yaml @@ -203,22 +203,22 @@ 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 "{% raw %}{{ openbook_docker_registry_url }}{% endraw %}/{{ pillar["job_scheduler_server"]["image_name"] }}" + docker pull "{% raw %}{{ openbook_docker_registry_url }}{% endraw %}/{{ pillar["job_scheduler_server"]["image_name"] }}_{% raw %}{{ openbook_branch }}{% endraw %}" fi if [ "{% raw %}{{ openbook_install_workflow_server|string() }}{% endraw %}" == "True" ]; then - docker pull "{% raw %}{{ openbook_docker_registry_url }}{% endraw %}/{{ pillar["workflow_server"]["image_name"] }}" + docker pull "{% raw %}{{ openbook_docker_registry_url }}{% endraw %}/{{ pillar["workflow_server"]["image_name"] }}_{% raw %}{{ openbook_branch }}{% endraw %}" fi if [ "{% raw %}{{ openbook_install_admin_api_server|string() }}{% endraw %}" == "True" ]; then - docker pull "{% raw %}{{ openbook_docker_registry_url }}{% endraw %}/{{ pillar["admin_api_server"]["image_name"] }}" + docker pull "{% raw %}{{ openbook_docker_registry_url }}{% endraw %}/{{ pillar["admin_api_server"]["image_name"] }}_{% raw %}{{ openbook_branch }}{% endraw %}" fi if [ "{% raw %}{{ openbook_install_customer_api_server|string() }}{% endraw %}" == "True" ]; then - docker pull "{% raw %}{{ openbook_docker_registry_url }}{% endraw %}/{{ pillar["customer_api_server"]["image_name"] }}" + docker pull "{% raw %}{{ openbook_docker_registry_url }}{% endraw %}/{{ pillar["customer_api_server"]["image_name"] }}_{% raw %}{{ openbook_branch }}{% endraw %}" fi if [ "{% raw %}{{ openbook_install_admin_web_ui|string() }}{% endraw %}" == "True" ]; then - docker pull "{% raw %}{{ openbook_docker_registry_url }}{% endraw %}/{{ pillar["admin_web_ui"]["image_name"] }}" + docker pull "{% raw %}{{ openbook_docker_registry_url }}{% endraw %}/{{ pillar["admin_web_ui"]["image_name"] }}_{% raw %}{{ openbook_branch }}{% endraw %}" fi if [ "{% raw %}{{ openbook_install_customer_web_ui|string() }}{% endraw %}" == "True" ]; then - docker pull "{% raw %}{{ openbook_docker_registry_url }}{% endraw %}/{{ pillar["customer_web_ui"]["image_name"] }}" + docker pull "{% raw %}{{ openbook_docker_registry_url }}{% endraw %}/{{ pillar["customer_web_ui"]["image_name"] }}_{% raw %}{{ openbook_branch }}{% endraw %}" fi args: executable: /bin/bash |