瀏覽代碼

Merge pull request #2520 from rbo/openshift_cockpit_deployer_prefix

Don't set IMAGE_PREFIX if openshift_cockpit_deployer_prefix is empty
Andrew Butcher 8 年之前
父節點
當前提交
ba824ca430
共有 1 個文件被更改,包括 1 次插入4 次删除
  1. 1 4
      roles/cockpit-ui/tasks/main.yml

+ 1 - 4
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 }}"