diff options
| author | Michael Gugino <gugino.michael@yahoo.com> | 2017-12-08 09:52:15 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-12-08 09:52:15 -0500 |
| commit | 0f98871d0f4cf39eded2fcd6041fcea4f83bbed6 (patch) | |
| tree | dd4269d8cd6d4f8beb4becea8a883716e6081f13 /roles/openshift_node/defaults/main.yml | |
| parent | 2af8419bab887c8552337333023ce357b1a18bc0 (diff) | |
| parent | eb6b20fc9183cc2aae424c72efd1191b99110a93 (diff) | |
| download | openshift-0f98871d0f4cf39eded2fcd6041fcea4f83bbed6.tar.gz openshift-0f98871d0f4cf39eded2fcd6041fcea4f83bbed6.tar.bz2 openshift-0f98871d0f4cf39eded2fcd6041fcea4f83bbed6.tar.xz openshift-0f98871d0f4cf39eded2fcd6041fcea4f83bbed6.zip | |
Merge pull request #6278 from mgugino-upstream-stage/service_type
Remove openshift.common.service_type
Diffstat (limited to 'roles/openshift_node/defaults/main.yml')
| -rw-r--r-- | roles/openshift_node/defaults/main.yml | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/roles/openshift_node/defaults/main.yml b/roles/openshift_node/defaults/main.yml index f3867fe4a..fff927944 100644 --- a/roles/openshift_node/defaults/main.yml +++ b/roles/openshift_node/defaults/main.yml @@ -14,7 +14,11 @@ r_openshift_node_use_firewalld: "{{ os_firewall_use_firewalld | default(False) } l_is_node_system_container: "{{ (openshift_use_node_system_container | default(openshift_use_system_containers | default(false)) | bool) }}" openshift_deployment_type: "{{ openshift_deployment_type | default('origin') }}" -openshift_service_type: "{{ 'origin' if openshift_deployment_type == 'origin' else 'atomic-openshift' }}" +openshift_service_type_dict: + origin: origin + openshift-enterprise: atomic-openshift + +openshift_service_type: "{{ openshift_service_type_dict[openshift_deployment_type] }}" system_images_registry_dict: openshift-enterprise: "registry.access.redhat.com" |