|
@@ -30,7 +30,6 @@ l_os_registry_url: "{{ oreg_url | default(l_osm_registry_url_default) | regex_re
|
|
|
openshift_image_default: "{{ l_os_registry_url | regex_replace('${component}' | regex_escape, 'node') }}"
|
|
|
# not sure why this one is more complicated than other images
|
|
|
openshift_cli_image: "{{ (system_images_registry == 'docker') | ternary(openshift_image_default, (openshift_image_default.split('/')|length==2) | ternary(system_images_registry + '/' + openshift_image_default, openshift_image_default)) }}"
|
|
|
-system_openshift_cli_image: "{{ (system_images_registry == 'docker') | ternary('docker:' + openshift_cli_image, openshift_cli_image) }}"
|
|
|
osn_image: "{{ l_os_registry_url | regex_replace('${component}' | regex_escape, 'node') }}"
|
|
|
osm_image: "{{ l_osm_registry_url | regex_replace('${component}' | regex_escape, 'control-plane') }}"
|
|
|
|
|
@@ -41,9 +40,7 @@ openshift_use_crio: False
|
|
|
openshift_use_crio_only: False
|
|
|
openshift_crio_enable_docker_gc: True
|
|
|
|
|
|
-# osm_default_subdomain is an old migrated fact, can probably be removed.
|
|
|
-osm_default_subdomain: "router.default.svc.cluster.local"
|
|
|
-openshift_master_default_subdomain: "{{ osm_default_subdomain }}"
|
|
|
+openshift_master_default_subdomain: "router.default.svc.cluster.local"
|
|
|
|
|
|
openshift_portal_net: "{{ openshift_master_portal_net | default(None) }}"
|
|
|
openshift_cluster_network_cidr: "{{ osm_cluster_network_cidr | default('10.128.0.0/14') }}"
|