From 2fe8715d9935dc7372dab68fa2b93a702265a119 Mon Sep 17 00:00:00 2001 From: Samuel Munilla Date: Wed, 27 Jul 2016 09:14:42 -0400 Subject: Add support for Atomic Registry Installs Add the Registry deployment subtype as an option in the quick installer. --- playbooks/byo/openshift-cluster/config.yml | 1 + playbooks/common/openshift-cluster/additional_config.yml | 4 +++- 2 files changed, 4 insertions(+), 1 deletion(-) (limited to 'playbooks') diff --git a/playbooks/byo/openshift-cluster/config.yml b/playbooks/byo/openshift-cluster/config.yml index 389ba3419..6c5ece9bd 100644 --- a/playbooks/byo/openshift-cluster/config.yml +++ b/playbooks/byo/openshift-cluster/config.yml @@ -26,3 +26,4 @@ openshift_cluster_id: "{{ cluster_id | default('default') }}" openshift_debug_level: "{{ debug_level | default(2) }}" openshift_deployment_type: "{{ deployment_type }}" + openshift_deployment_subtype: "{{ deployment_subtype }}" diff --git a/playbooks/common/openshift-cluster/additional_config.yml b/playbooks/common/openshift-cluster/additional_config.yml index ebbd45a67..c3b1a9365 100644 --- a/playbooks/common/openshift-cluster/additional_config.yml +++ b/playbooks/common/openshift-cluster/additional_config.yml @@ -15,6 +15,8 @@ when: openshift.common.use_manageiq | bool - role: cockpit when: not openshift.common.is_atomic and ( deployment_type in ['atomic-enterprise','openshift-enterprise'] ) and - (osm_use_cockpit | bool or osm_use_cockpit is undefined ) + (osm_use_cockpit | bool or osm_use_cockpit is undefined ) and ( deployment_subtype != 'registry' ) + - role: cockpit-ui + when: not openshift.common.is_atomic and ( deployment_subtype == 'registry' ) - role: flannel_register when: openshift.common.use_flannel | bool -- cgit v1.2.3 From 2e975430061785e1acf2189e57ee7bfaee1a9411 Mon Sep 17 00:00:00 2001 From: Andrew Butcher Date: Tue, 23 Aug 2016 16:24:46 -0400 Subject: Re-organize registry-console deployment. --- playbooks/common/openshift-cluster/additional_config.yml | 2 -- playbooks/common/openshift-cluster/openshift_hosted.yml | 3 +++ 2 files changed, 3 insertions(+), 2 deletions(-) (limited to 'playbooks') diff --git a/playbooks/common/openshift-cluster/additional_config.yml b/playbooks/common/openshift-cluster/additional_config.yml index c3b1a9365..ba6a4eace 100644 --- a/playbooks/common/openshift-cluster/additional_config.yml +++ b/playbooks/common/openshift-cluster/additional_config.yml @@ -16,7 +16,5 @@ - role: cockpit when: not openshift.common.is_atomic and ( deployment_type in ['atomic-enterprise','openshift-enterprise'] ) and (osm_use_cockpit | bool or osm_use_cockpit is undefined ) and ( deployment_subtype != 'registry' ) - - role: cockpit-ui - when: not openshift.common.is_atomic and ( deployment_subtype == 'registry' ) - role: flannel_register when: openshift.common.use_flannel | bool diff --git a/playbooks/common/openshift-cluster/openshift_hosted.yml b/playbooks/common/openshift-cluster/openshift_hosted.yml index c90c85cbd..7028ad438 100644 --- a/playbooks/common/openshift-cluster/openshift_hosted.yml +++ b/playbooks/common/openshift-cluster/openshift_hosted.yml @@ -1,3 +1,4 @@ +--- - name: Create persistent volumes hosts: oo_first_master tags: @@ -43,3 +44,5 @@ - role: openshift_hosted - role: openshift_metrics when: openshift.hosted.metrics.deploy | bool + - role: cockpit-ui + when: not openshift.common.is_atomic and ( deployment_subtype == 'registry' ) -- cgit v1.2.3 From 517f3390c14bc9bf570581a914fa64ac55c1ccd9 Mon Sep 17 00:00:00 2001 From: Samuel Munilla Date: Thu, 25 Aug 2016 09:20:17 -0400 Subject: Remove atomic check and cockpit.socket --- playbooks/byo/openshift-cluster/config.yml | 2 +- playbooks/common/openshift-cluster/additional_config.yml | 2 +- playbooks/common/openshift-cluster/openshift_hosted.yml | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) (limited to 'playbooks') diff --git a/playbooks/byo/openshift-cluster/config.yml b/playbooks/byo/openshift-cluster/config.yml index 6c5ece9bd..0b85b2485 100644 --- a/playbooks/byo/openshift-cluster/config.yml +++ b/playbooks/byo/openshift-cluster/config.yml @@ -26,4 +26,4 @@ openshift_cluster_id: "{{ cluster_id | default('default') }}" openshift_debug_level: "{{ debug_level | default(2) }}" openshift_deployment_type: "{{ deployment_type }}" - openshift_deployment_subtype: "{{ deployment_subtype }}" + openshift_deployment_subtype: "{{ deployment_subtype | default(none) }}" diff --git a/playbooks/common/openshift-cluster/additional_config.yml b/playbooks/common/openshift-cluster/additional_config.yml index ba6a4eace..26b31d313 100644 --- a/playbooks/common/openshift-cluster/additional_config.yml +++ b/playbooks/common/openshift-cluster/additional_config.yml @@ -15,6 +15,6 @@ when: openshift.common.use_manageiq | bool - role: cockpit when: not openshift.common.is_atomic and ( deployment_type in ['atomic-enterprise','openshift-enterprise'] ) and - (osm_use_cockpit | bool or osm_use_cockpit is undefined ) and ( deployment_subtype != 'registry' ) + (osm_use_cockpit | bool or osm_use_cockpit is undefined ) and ( openshift.common.deployment_subtype != 'registry' ) - role: flannel_register when: openshift.common.use_flannel | bool diff --git a/playbooks/common/openshift-cluster/openshift_hosted.yml b/playbooks/common/openshift-cluster/openshift_hosted.yml index 7028ad438..f65b7a2cd 100644 --- a/playbooks/common/openshift-cluster/openshift_hosted.yml +++ b/playbooks/common/openshift-cluster/openshift_hosted.yml @@ -45,4 +45,4 @@ - role: openshift_metrics when: openshift.hosted.metrics.deploy | bool - role: cockpit-ui - when: not openshift.common.is_atomic and ( deployment_subtype == 'registry' ) + when: ( openshift.common.deployment_subtype == 'registry' ) -- cgit v1.2.3