diff options
| author | Brenton Leanhardt <bleanhar@redhat.com> | 2016-05-16 16:58:54 -0400 |
|---|---|---|
| committer | Brenton Leanhardt <bleanhar@redhat.com> | 2016-05-16 16:58:54 -0400 |
| commit | 984f84ce1b19704b16db669593d96153182fc206 (patch) | |
| tree | 4305968d078b65aa4ec13036ec777ceeeaa3ce99 /playbooks/common/openshift-master/config.yml | |
| parent | bef0ae84568f8bcec002e27a6835c662a5f7c465 (diff) | |
| parent | 84fbacbb0554fcfe425dffd88c83fab96c8c9c2b (diff) | |
| download | openshift-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-master/config.yml')
| -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: |