diff options
| author | Brenton Leanhardt <bleanhar@redhat.com> | 2016-03-17 13:24:39 -0400 |
|---|---|---|
| committer | Brenton Leanhardt <bleanhar@redhat.com> | 2016-03-17 13:24:39 -0400 |
| commit | df453bc226f92f3c68c82d290226dc0efc2417be (patch) | |
| tree | 46f3a628edd93350b3ed889da37ae11c29140ba0 /playbooks | |
| parent | 3dbcb72f88b951247f1eb999bcf7f36df902de8e (diff) | |
| parent | bc114a192e2682204aa237fb7d69009ddfa5b747 (diff) | |
| download | openshift-df453bc226f92f3c68c82d290226dc0efc2417be.tar.gz openshift-df453bc226f92f3c68c82d290226dc0efc2417be.tar.bz2 openshift-df453bc226f92f3c68c82d290226dc0efc2417be.tar.xz openshift-df453bc226f92f3c68c82d290226dc0efc2417be.zip | |
Merge pull request #1614 from detiber/bz1317755
Bug 1317755 - Set insecure-registry for internal registry by default
Diffstat (limited to 'playbooks')
| -rw-r--r-- | playbooks/common/openshift-node/config.yml | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/playbooks/common/openshift-node/config.yml b/playbooks/common/openshift-node/config.yml index a4e0d4c8c..7ca941732 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 |