Browse Source

Use internalRegistryHostname when bootstrapping

Clayton Coleman 7 years ago
parent
commit
b88970e105

+ 1 - 3
roles/openshift_control_plane/templates/master.yaml.v1.j2

@@ -88,9 +88,7 @@ etcdStorageConfig:
 imageConfig:
   format: {{ l_osm_registry_url }}
   latest: {{ openshift_master_image_config_latest }}
-{% if 'image_policy_config' in openshift.master %}
-imagePolicyConfig:{{ openshift.master.image_policy_config | lib_utils_to_padded_yaml(level=1) }}
-{% endif %}
+imagePolicyConfig:{{ openshift.master.image_policy_config | default({"internalRegistryHostname":"docker-registry.default.svc:5000"}) | lib_utils_to_padded_yaml(level=1) }}
 kubeletClientInfo:
 {# TODO: allow user specified kubelet port #}
   ca: ca-bundle.crt

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

@@ -108,7 +108,8 @@ openshift_hosted_registry_edits:
 openshift_hosted_registry_force:
 - False
 
-openshift_push_via_dns: False
+# TODO: this flag should be removed when master bootstrapping is enforced
+openshift_push_via_dns: True
 
 # NOTE: settting openshift_docker_hosted_registry_insecure may affect other roles
 openshift_hosted_docker_registry_insecure_default: "{{ openshift_docker_hosted_registry_insecure | default(False) }}"