diff options
| author | Samuel Munilla <smunilla@redhat.com> | 2016-09-20 13:34:15 -0400 |
|---|---|---|
| committer | Samuel Munilla <smunilla@redhat.com> | 2016-09-29 15:12:38 -0400 |
| commit | a3ab3d539bb57bc224b3f4457a0bfc68484cf8ee (patch) | |
| tree | 01f60be74a0fd658ac2fecfb0433cd1d213e3eee | |
| parent | cd922e0f4a1370118c0e2fd60230a68d74b47095 (diff) | |
| download | openshift-a3ab3d539bb57bc224b3f4457a0bfc68484cf8ee.tar.gz openshift-a3ab3d539bb57bc224b3f4457a0bfc68484cf8ee.tar.bz2 openshift-a3ab3d539bb57bc224b3f4457a0bfc68484cf8ee.tar.xz openshift-a3ab3d539bb57bc224b3f4457a0bfc68484cf8ee.zip | |
Install Registry by Default
Instead of restricting cockpit-ui to Atomic Registry installations,
install it by default everywhere.
Fixes Bug 1371459
| -rw-r--r-- | playbooks/common/openshift-cluster/openshift_hosted.yml | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/playbooks/common/openshift-cluster/openshift_hosted.yml b/playbooks/common/openshift-cluster/openshift_hosted.yml index 3975e2686..044de2c94 100644 --- a/playbooks/common/openshift-cluster/openshift_hosted.yml +++ b/playbooks/common/openshift-cluster/openshift_hosted.yml @@ -65,7 +65,7 @@ openshift_hosted_logging_elasticsearch_ops_pvc_prefix: "{{ 'logging-es' if openshift.hosted.logging.storage_kind | default(none) is not none else '' }}" - role: cockpit-ui - when: openshift.common.deployment_subtype == 'registry' + when: openshift.common.version_gte_3_3_or_1_3 | bool - name: Configure all masters for logging serial: 1 @@ -94,19 +94,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 @@ -117,7 +117,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 @@ -128,7 +128,7 @@ --config={{ openshift_hosted_kubeconfig }} -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 @@ -140,7 +140,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" @@ -151,14 +151,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 |