summaryrefslogtreecommitdiffstats
path: root/playbooks
diff options
context:
space:
mode:
authorJason DeTiberus <jdetiber@redhat.com>2016-03-15 22:21:39 -0400
committerJason DeTiberus <jdetiber@redhat.com>2016-03-17 00:46:02 -0400
commitbc114a192e2682204aa237fb7d69009ddfa5b747 (patch)
tree081da29f0ab839e6530eb183dcb4ea6b44fcb14c /playbooks
parent4551e7cddf4a9d1756a064fd31777b6bed7d3567 (diff)
downloadopenshift-bc114a192e2682204aa237fb7d69009ddfa5b747.tar.gz
openshift-bc114a192e2682204aa237fb7d69009ddfa5b747.tar.bz2
openshift-bc114a192e2682204aa237fb7d69009ddfa5b747.tar.xz
openshift-bc114a192e2682204aa237fb7d69009ddfa5b747.zip
Bug 1317755 - Set insecure-registry for internal registry by default
Diffstat (limited to 'playbooks')
-rw-r--r--playbooks/common/openshift-node/config.yml10
1 files changed, 10 insertions, 0 deletions
diff --git a/playbooks/common/openshift-node/config.yml b/playbooks/common/openshift-node/config.yml
index 1f32f2786..1116a8178 100644
--- a/playbooks/common/openshift-node/config.yml
+++ b/playbooks/common/openshift-node/config.yml
@@ -115,6 +115,11 @@
vars:
openshift_node_master_api_url: "{{ hostvars[groups.oo_first_master.0].openshift.master.api_url }}"
openshift_node_first_master_ip: "{{ hostvars[groups.oo_first_master.0].openshift.common.ip }}"
+ # TODO: configure these based on
+ # hostvars[groups.oo_first_master.0].openshift.hosted.registry instead of
+ # hardcoding
+ openshift_docker_hosted_registry_insecure: True
+ openshift_docker_hosted_registry_network: "{{ hostvars[groups.oo_first_master.0].openshift.master.portal_net }}"
roles:
- openshift_node
@@ -123,6 +128,11 @@
vars:
openshift_node_master_api_url: "{{ hostvars[groups.oo_first_master.0].openshift.master.api_url }}"
openshift_node_first_master_ip: "{{ hostvars[groups.oo_first_master.0].openshift.common.ip }}"
+ # TODO: configure these based on
+ # hostvars[groups.oo_first_master.0].openshift.hosted.registry instead of
+ # hardcoding
+ openshift_docker_hosted_registry_insecure: True
+ openshift_docker_hosted_registry_network: "{{ hostvars[groups.oo_first_master.0].openshift.master.portal_net }}"
roles:
- openshift_node