summaryrefslogtreecommitdiffstats
path: root/playbooks/common
diff options
context:
space:
mode:
authorJason DeTiberus <detiber@gmail.com>2016-04-29 13:20:36 -0400
committerJason DeTiberus <detiber@gmail.com>2016-04-29 13:20:36 -0400
commit72f295fc7cdef47bffbdffa35b263e120ac9ad93 (patch)
tree485b6c14ab4e6e9537cfd783498db1e5fa8b8121 /playbooks/common
parent4502f8d649467c7be7bdfd5b273220063ec85d5d (diff)
parenta02741c2540de0577e58820bd0410d0c99a1b32e (diff)
downloadopenshift-72f295fc7cdef47bffbdffa35b263e120ac9ad93.tar.gz
openshift-72f295fc7cdef47bffbdffa35b263e120ac9ad93.tar.bz2
openshift-72f295fc7cdef47bffbdffa35b263e120ac9ad93.tar.xz
openshift-72f295fc7cdef47bffbdffa35b263e120ac9ad93.zip
Merge pull request #1841 from andrewklau/insecure-registry
Add openshift_docker_hosted_registry_insecure option
Diffstat (limited to 'playbooks/common')
-rw-r--r--playbooks/common/openshift-node/config.yml4
1 files changed, 2 insertions, 2 deletions
diff --git a/playbooks/common/openshift-node/config.yml b/playbooks/common/openshift-node/config.yml
index 264935a63..8a41b0b2f 100644
--- a/playbooks/common/openshift-node/config.yml
+++ b/playbooks/common/openshift-node/config.yml
@@ -118,7 +118,7 @@
# 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_insecure: "{{ openshift.docker.hosted_registry_insecure | default(True) }}"
openshift_docker_hosted_registry_network: "{{ hostvars[groups.oo_first_master.0].openshift.common.portal_net }}"
roles:
- openshift_node
@@ -131,7 +131,7 @@
# 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_insecure: "{{ openshift.docker.hosted_registry_insecure | default(True) }}"
openshift_docker_hosted_registry_network: "{{ hostvars[groups.oo_first_master.0].openshift.common.portal_net }}"
roles:
- openshift_node