diff options
| author | Devan Goodwin <dgoodwin@redhat.com> | 2016-05-11 10:55:17 -0300 |
|---|---|---|
| committer | Devan Goodwin <dgoodwin@redhat.com> | 2016-05-16 15:38:46 -0300 |
| commit | 84fbacbb0554fcfe425dffd88c83fab96c8c9c2b (patch) | |
| tree | ce38c24a015e48a437262744fb9c553ed03a0b54 /playbooks/common/openshift-master | |
| parent | 2356e549bae059a1d3e9336102115f13163ffd31 (diff) | |
| download | openshift-84fbacbb0554fcfe425dffd88c83fab96c8c9c2b.tar.gz openshift-84fbacbb0554fcfe425dffd88c83fab96c8c9c2b.tar.bz2 openshift-84fbacbb0554fcfe425dffd88c83fab96c8c9c2b.tar.xz openshift-84fbacbb0554fcfe425dffd88c83fab96c8c9c2b.zip | |
Fixes for openshift_docker_hosted_registry_insecure var.
Fixes a failure on masters if you explicitly set
openshift_docker_hosted_registry_insecure=true. This is the default but
if you tried to set it an error would trigger as a relevant variable was
not passed in the master playbooks.
Fixes setting the variable to false being ignored.
master/node playbooks were referencing the docker fact, which was not
set at that point and thus we were always getting the default of true,
regardless what was in your inventory.
Stop passing registry insecure in via playbooks, we can access it when running
openshift_facts itself. Add a new default in openshift facts.
Diffstat (limited to 'playbooks/common/openshift-master')
| -rw-r--r-- | playbooks/common/openshift-master/config.yml | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/playbooks/common/openshift-master/config.yml b/playbooks/common/openshift-master/config.yml index 1f5e3aaff..91d66a9cb 100644 --- a/playbooks/common/openshift-master/config.yml +++ b/playbooks/common/openshift-master/config.yml @@ -204,6 +204,7 @@ | oo_collect('openshift.common.all_hostnames') | oo_flatten | unique }}" sync_tmpdir: "{{ hostvars.localhost.g_master_mktemp.stdout }}" + openshift_docker_hosted_registry_network: "{{ hostvars[groups.oo_first_master.0].openshift.common.portal_net }}" roles: - openshift_master_certificates post_tasks: @@ -346,6 +347,7 @@ openshift_master_count: "{{ openshift.master.master_count }}" openshift_master_session_auth_secrets: "{{ hostvars[groups.oo_first_master.0].openshift.master.session_auth_secrets }}" openshift_master_session_encryption_secrets: "{{ hostvars[groups.oo_first_master.0].openshift.master.session_encryption_secrets }}" + openshift_docker_hosted_registry_network: "{{ hostvars[groups.oo_first_master.0].openshift.common.portal_net }}" pre_tasks: - name: Ensure certificate directory exists file: |