Browse Source

Remove redundant openshift_hosted_registry_network_default

This commit removes openshift_hosted_registry_network_default
and changes openshift_hosted_registry_network to use
openshift_portal_net as the default.

openshift_portal_net must always be defined by users since
3.7.
Michael Gugino 7 years ago
parent
commit
2181794094
1 changed files with 1 additions and 2 deletions
  1. 1 2
      roles/container_runtime/defaults/main.yml

+ 1 - 2
roles/container_runtime/defaults/main.yml

@@ -15,8 +15,7 @@ openshift_docker_service_name: "{{ 'container-engine' if (openshift_docker_use_s
 
 openshift_docker_hosted_registry_insecure: False  # bool
 
-openshift_docker_hosted_registry_network_default: "{{ openshift_portal_net | default(openshift.common.portal_net) | default(False) }}"
-openshift_docker_hosted_registry_network: "{{ openshift_docker_hosted_registry_network_default }}"
+openshift_docker_hosted_registry_network: "{{ openshift_portal_net }}"
 
 openshift_docker_additional_registries: []
 openshift_docker_blocked_registries: []