diff options
| author | Michael Gugino <mgugino@redhat.com> | 2017-11-27 15:39:46 -0500 |
|---|---|---|
| committer | Michael Gugino <mgugino@redhat.com> | 2017-12-07 14:37:36 -0500 |
| commit | eb6b20fc9183cc2aae424c72efd1191b99110a93 (patch) | |
| tree | ae3dec3c4b4581471f3de0afd8a1711235242cc6 /roles/openshift_node/defaults | |
| parent | 37ffebc86cd4fe89373542285b40d92f61696270 (diff) | |
| download | openshift-eb6b20fc9183cc2aae424c72efd1191b99110a93.tar.gz openshift-eb6b20fc9183cc2aae424c72efd1191b99110a93.tar.bz2 openshift-eb6b20fc9183cc2aae424c72efd1191b99110a93.tar.xz openshift-eb6b20fc9183cc2aae424c72efd1191b99110a93.zip | |
Remove openshift.common.service_type
This commit removes openshift.common.service_type
in favor of openshift_service_type.
This commit also removes r_openshift_excluder_service_type
from plays in favor of using the role's defaults.
Diffstat (limited to 'roles/openshift_node/defaults')
| -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" |