diff options
| author | Brenton Leanhardt <bleanhar@redhat.com> | 2016-03-30 13:37:41 -0400 |
|---|---|---|
| committer | Brenton Leanhardt <bleanhar@redhat.com> | 2016-03-30 13:37:41 -0400 |
| commit | 5326629f754899c3a382b6a8a0bf97110b257c68 (patch) | |
| tree | d09aaad572dca0754720941a55e86b2279ec2551 | |
| parent | d4d0e1dc928adfd70e9ee297f214bd12e802c0c3 (diff) | |
| parent | 419ac7c78fabc34ca3f321bbf05233ae4abf6a70 (diff) | |
| download | openshift-5326629f754899c3a382b6a8a0bf97110b257c68.tar.gz openshift-5326629f754899c3a382b6a8a0bf97110b257c68.tar.bz2 openshift-5326629f754899c3a382b6a8a0bf97110b257c68.tar.xz openshift-5326629f754899c3a382b6a8a0bf97110b257c68.zip | |
Merge pull request #1682 from brenton/bz1322338
Bug 1322338 - The upgrade should keep the option insecure-registry=17…
| -rw-r--r-- | playbooks/common/openshift-cluster/upgrades/v3_1_to_v3_2/pre.yml | 2 | ||||
| -rw-r--r-- | playbooks/common/openshift-cluster/upgrades/v3_1_to_v3_2/upgrade.yml | 2 |
2 files changed, 4 insertions, 0 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 d491575f8..d6abeb345 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 @@ -87,6 +87,8 @@ 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.master.portal_net }}" handlers: - include: ../../../../../roles/openshift_master/handlers/main.yml - include: ../../../../../roles/openshift_node/handlers/main.yml 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 481d8e67a..b393b64fe 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 @@ -143,6 +143,8 @@ 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.master.portal_net }}" tasks: - name: Verifying the correct commandline tools are available shell: grep {{ verify_upgrade_version }} {{ openshift.common.admin_binary}} |