diff options
| author | Samuel Munilla <smunilla@redhat.com> | 2016-07-27 09:14:42 -0400 |
|---|---|---|
| committer | Samuel Munilla <smunilla@redhat.com> | 2016-08-26 10:57:45 -0400 |
| commit | 2fe8715d9935dc7372dab68fa2b93a702265a119 (patch) | |
| tree | f29dbb53a9b17f7213c90d4975d685f47b6ca302 /playbooks | |
| parent | 577195e3eefe19b95e39f0f52834cd3dc8f77cdf (diff) | |
| download | openshift-2fe8715d9935dc7372dab68fa2b93a702265a119.tar.gz openshift-2fe8715d9935dc7372dab68fa2b93a702265a119.tar.bz2 openshift-2fe8715d9935dc7372dab68fa2b93a702265a119.tar.xz openshift-2fe8715d9935dc7372dab68fa2b93a702265a119.zip | |
Add support for Atomic Registry Installs
Add the Registry deployment subtype as an option in the quick installer.
Diffstat (limited to 'playbooks')
| -rw-r--r-- | playbooks/byo/openshift-cluster/config.yml | 1 | ||||
| -rw-r--r-- | playbooks/common/openshift-cluster/additional_config.yml | 4 |
2 files changed, 4 insertions, 1 deletions
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 |