diff options
| author | Scott Dodson <sdodson@redhat.com> | 2017-06-26 09:41:23 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-06-26 09:41:23 -0400 |
| commit | 576b7192754ef973ea45243e149967c67daeaa18 (patch) | |
| tree | 9365c2b1681469a26a629f732cae3fd6f057ff83 | |
| parent | 90d517d4c179f59e2027965a7eb52c3c0f19cff9 (diff) | |
| parent | cf94ac2d89637f2e428b8975dcae6e726cd55fc6 (diff) | |
| download | openshift-576b7192754ef973ea45243e149967c67daeaa18.tar.gz openshift-576b7192754ef973ea45243e149967c67daeaa18.tar.bz2 openshift-576b7192754ef973ea45243e149967c67daeaa18.tar.xz openshift-576b7192754ef973ea45243e149967c67daeaa18.zip | |
Merge pull request #4578 from sdodson/push-via-dns
Also configure default registry on HA masters
| -rw-r--r-- | roles/openshift_master/templates/native-cluster/atomic-openshift-master-api.j2 | 3 | ||||
| -rw-r--r-- | roles/openshift_master/templates/native-cluster/atomic-openshift-master-controllers.j2 | 3 |
2 files changed, 6 insertions, 0 deletions
diff --git a/roles/openshift_master/templates/native-cluster/atomic-openshift-master-api.j2 b/roles/openshift_master/templates/native-cluster/atomic-openshift-master-api.j2 index c484d23cc..c05a27559 100644 --- a/roles/openshift_master/templates/native-cluster/atomic-openshift-master-api.j2 +++ b/roles/openshift_master/templates/native-cluster/atomic-openshift-master-api.j2 @@ -1,5 +1,8 @@ OPTIONS=--loglevel={{ openshift.master.debug_level }} --listen={{ 'https' if openshift.master.api_use_ssl else 'http' }}://{{ openshift.master.bind_addr }}:{{ openshift.master.api_port }} --master={{ openshift.master.loopback_api_url }} CONFIG_FILE={{ openshift_master_config_file }} +{% if openshift_push_via_dns | default(false) %} +OPENSHIFT_DEFAULT_REGISTRY=docker-registry.default.svc:5000 +{% endif %} {% if openshift.common.is_containerized | bool %} IMAGE_VERSION={{ openshift_image_tag }} {% endif %} diff --git a/roles/openshift_master/templates/native-cluster/atomic-openshift-master-controllers.j2 b/roles/openshift_master/templates/native-cluster/atomic-openshift-master-controllers.j2 index e0adbbf52..a153fb33d 100644 --- a/roles/openshift_master/templates/native-cluster/atomic-openshift-master-controllers.j2 +++ b/roles/openshift_master/templates/native-cluster/atomic-openshift-master-controllers.j2 @@ -1,5 +1,8 @@ OPTIONS=--loglevel={{ openshift.master.debug_level }} --listen={{ 'https' if openshift.master.api_use_ssl else 'http' }}://{{ openshift.master.bind_addr }}:{{ openshift.master.controllers_port }} CONFIG_FILE={{ openshift_master_config_file }} +{% if openshift_push_via_dns | default(false) %} +OPENSHIFT_DEFAULT_REGISTRY=docker-registry.default.svc:5000 +{% endif %} {% if openshift.common.is_containerized | bool %} IMAGE_VERSION={{ openshift_image_tag }} {% endif %} |