Install Registry by Default

Instead of restricting cockpit-ui to Atomic Registry installations, install it by default everywhere. Fixes Bug 1371459
openshift · Sep 21, 2016 · 45085e5 · 45085e5
1 parent 4313ad4
commit 45085e5
Showing 1 changed file with 10 additions and 10 deletions.
diff --git a/playbooks/common/openshift-cluster/openshift_hosted.yml b/playbooks/common/openshift-cluster/openshift_hosted.yml
@@ -45,7 +45,7 @@
   - role: openshift_metrics
     when: openshift.hosted.metrics.deploy | bool
   - role: cockpit-ui
-    when: openshift.common.deployment_subtype == 'registry'
+    when: openshift.common.version_gte_3_3_or_1_3 | bool
 
 - name: Configure CA certificate for secure registry
   hosts: oo_nodes_to_config
@@ -55,19 +55,19 @@
   - name: Create temp directory for kubeconfig
     command: mktemp -d /tmp/openshift-ansible-XXXXXX
     register: mktemp
-    when: openshift.common.deployment_subtype == 'registry'
+    when: openshift.common.version_gte_3_3_or_1_3 | bool
     changed_when: false
     delegate_to: "{{ groups.oo_first_master.0 }}"
     run_once: true
   - set_fact:
       openshift_hosted_kubeconfig: "{{ mktemp.stdout }}/admin.kubeconfig"
-    when: openshift.common.deployment_subtype == 'registry'
+    when: openshift.common.version_gte_3_3_or_1_3 | bool
     delegate_to: "{{ groups.oo_first_master.0 }}"
     run_once: true
   - name: Copy the admin client config(s)
     command: >
       cp {{ openshift.common.config_base }}/master/admin.kubeconfig {{ openshift_hosted_kubeconfig }}
-    when: openshift.common.deployment_subtype == 'registry'
+    when: openshift.common.version_gte_3_3_or_1_3 | bool
     changed_when: false
     delegate_to: "{{ groups.oo_first_master.0 }}"
     run_once: true
@@ -78,7 +78,7 @@
       --config={{ openshift_hosted_kubeconfig }}
       -n default
     register: docker_registry_route
-    when: openshift.common.deployment_subtype == 'registry'
+    when: openshift.common.version_gte_3_3_or_1_3 | bool
     changed_when: false
     delegate_to: "{{ groups.oo_first_master.0 }}"
     run_once: true
@@ -87,9 +87,9 @@
       {{ openshift.common.client_binary }} get service docker-registry
       --template='{{ '{{' }} .spec.clusterIP {{ '}}' }}'
       --config={{ openshift_hosted_kubeconfig }}
-      -n default      
+      -n default
     register: docker_registry_service_ip
-    when: openshift.common.deployment_subtype == 'registry'
+    when: openshift.common.version_gte_3_3_or_1_3 | bool
     changed_when: false
     delegate_to: "{{ groups.oo_first_master.0 }}"
     run_once: true
@@ -101,7 +101,7 @@
     - "{{ docker_registry_service_ip.stdout }}:5000"
     - "{{ docker_registry_route.stdout }}"
     - "docker-registry.default.svc.cluster.local:5000"
-    when: openshift.common.deployment_subtype == 'registry'
+    when: openshift.common.version_gte_3_3_or_1_3 | bool
   - name: Copy CA to registry CA directories
     copy:
       src: "{{ openshift.common.config_base }}/node/ca.crt"
@@ -112,14 +112,14 @@
     - "{{ docker_registry_service_ip.stdout }}:5000"
     - "{{ docker_registry_route.stdout }}"
     - "docker-registry.default.svc.cluster.local:5000"
-    when: openshift.common.deployment_subtype == 'registry'
+    when: openshift.common.version_gte_3_3_or_1_3 | bool
     notify:
     - Restart docker
   - name: Delete temp directory
     file:
       name: "{{ mktemp.stdout }}"
       state: absent
-    when: openshift.common.deployment_subtype == 'registry'
+    when: openshift.common.version_gte_3_3_or_1_3 | bool
     changed_when: False
     delegate_to: "{{ groups.oo_first_master.0 }}"
     run_once: true