diff options
| author | Andrew Butcher <abutcher@afrolegs.com> | 2016-09-28 16:10:28 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-09-28 16:10:28 -0400 |
| commit | ba824ca4300f5e0c9b81980f9031fffa3618a3b5 (patch) | |
| tree | ac6272e53927bf66b1881198bbf63c2f3ab9b407 | |
| parent | 3391904447eef4cc380b33c40ad53b04012e23f9 (diff) | |
| parent | 2d7c49c57696c9beec320e8663eaa539df696ac5 (diff) | |
| download | openshift-ba824ca4300f5e0c9b81980f9031fffa3618a3b5.tar.gz openshift-ba824ca4300f5e0c9b81980f9031fffa3618a3b5.tar.bz2 openshift-ba824ca4300f5e0c9b81980f9031fffa3618a3b5.tar.xz openshift-ba824ca4300f5e0c9b81980f9031fffa3618a3b5.zip | |
Merge pull request #2520 from rbo/openshift_cockpit_deployer_prefix
Don't set IMAGE_PREFIX if openshift_cockpit_deployer_prefix is empty
| -rw-r--r-- | roles/cockpit-ui/tasks/main.yml | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/roles/cockpit-ui/tasks/main.yml b/roles/cockpit-ui/tasks/main.yml index 9fc15ee8b..953357392 100644 --- a/roles/cockpit-ui/tasks/main.yml +++ b/roles/cockpit-ui/tasks/main.yml @@ -50,13 +50,10 @@ register: registry_console_cockpit_kube_url changed_when: false -- set_fact: - cockpit_image_prefix: "{{ '-p IMAGE_PREFIX=' ~ openshift_cockpit_deployer_prefix | default('') }}" - - name: Deploy registry-console command: > {{ openshift.common.client_binary }} new-app --template=registry-console - {{ cockpit_image_prefix }} + {% if openshift_cockpit_deployer_prefix is defined %}-p IMAGE_PREFIX="{{ openshift_cockpit_deployer_prefix }}"{% endif %} -p OPENSHIFT_OAUTH_PROVIDER_URL="{{ openshift.master.public_api_url }}" -p REGISTRY_HOST="{{ docker_registry_route.stdout }}" -p COCKPIT_KUBE_URL="{{ registry_console_cockpit_kube_url.stdout }}" |