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-cluster | |
| 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-cluster')
| -rw-r--r-- | playbooks/common/openshift-cluster/upgrades/v3_1_to_v3_2/pre.yml | 1 | ||||
| -rw-r--r-- | playbooks/common/openshift-cluster/upgrades/v3_1_to_v3_2/upgrade.yml | 3 |
2 files changed, 2 insertions, 2 deletions
diff --git a/playbooks/common/openshift-cluster/upgrades/v3_1_to_v3_2/pre.yml b/playbooks/common/openshift-cluster/upgrades/v3_1_to_v3_2/pre.yml index ce589db2e..dd9843290 100644 --- a/playbooks/common/openshift-cluster/upgrades/v3_1_to_v3_2/pre.yml +++ b/playbooks/common/openshift-cluster/upgrades/v3_1_to_v3_2/pre.yml @@ -100,7 +100,6 @@ hosts: oo_masters_to_config:oo_nodes_to_config vars: target_version: "{{ '1.2' if deployment_type == 'origin' else '3.1.1.900' }}" - openshift_docker_hosted_registry_insecure: True openshift_docker_hosted_registry_network: "{{ hostvars[groups.oo_first_master.0].openshift.common.portal_net }}" upgrading: True handlers: diff --git a/playbooks/common/openshift-cluster/upgrades/v3_1_to_v3_2/upgrade.yml b/playbooks/common/openshift-cluster/upgrades/v3_1_to_v3_2/upgrade.yml index d15653a3b..a2d88341a 100644 --- a/playbooks/common/openshift-cluster/upgrades/v3_1_to_v3_2/upgrade.yml +++ b/playbooks/common/openshift-cluster/upgrades/v3_1_to_v3_2/upgrade.yml @@ -27,6 +27,8 @@ hosts: oo_masters_to_config:oo_nodes_to_config roles: - { role: openshift_docker_facts } + vars: + openshift_docker_hosted_registry_network: "{{ hostvars[groups.oo_first_master.0].openshift.common.portal_net }}" tasks: - name: Pull Images command: > @@ -128,7 +130,6 @@ vars: origin_reconcile_bindings: "{{ deployment_type == 'origin' and g_new_version | version_compare('1.0.6', '>') }}" ent_reconcile_bindings: true - openshift_docker_hosted_registry_insecure: True openshift_docker_hosted_registry_network: "{{ hostvars[groups.oo_first_master.0].openshift.common.portal_net }}" upgrading: True tasks: |