summaryrefslogtreecommitdiffstats
path: root/playbooks/common/openshift-node
diff options
context:
space:
mode:
authorBrenton Leanhardt <bleanhar@redhat.com>2016-05-16 16:58:54 -0400
committerBrenton Leanhardt <bleanhar@redhat.com>2016-05-16 16:58:54 -0400
commit984f84ce1b19704b16db669593d96153182fc206 (patch)
tree4305968d078b65aa4ec13036ec777ceeeaa3ce99 /playbooks/common/openshift-node
parentbef0ae84568f8bcec002e27a6835c662a5f7c465 (diff)
parent84fbacbb0554fcfe425dffd88c83fab96c8c9c2b (diff)
downloadopenshift-984f84ce1b19704b16db669593d96153182fc206.tar.gz
openshift-984f84ce1b19704b16db669593d96153182fc206.tar.bz2
openshift-984f84ce1b19704b16db669593d96153182fc206.tar.xz
openshift-984f84ce1b19704b16db669593d96153182fc206.zip
Merge pull request #1880 from dgoodwin/registry-insecure
Fixes for openshift_docker_hosted_registry_insecure var.
Diffstat (limited to 'playbooks/common/openshift-node')
-rw-r--r--playbooks/common/openshift-node/config.yml8
1 files changed, 0 insertions, 8 deletions
diff --git a/playbooks/common/openshift-node/config.yml b/playbooks/common/openshift-node/config.yml
index b0407ef74..a41fca45a 100644
--- a/playbooks/common/openshift-node/config.yml
+++ b/playbooks/common/openshift-node/config.yml
@@ -115,10 +115,6 @@
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: "{{ 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
@@ -128,10 +124,6 @@
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: "{{ 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