diff options
| author | Brenton Leanhardt <bleanhar@redhat.com> | 2016-05-16 14:16:32 -0400 |
|---|---|---|
| committer | Brenton Leanhardt <bleanhar@redhat.com> | 2016-05-16 14:16:32 -0400 |
| commit | e3897f7be787ce729d51a150effe0fda9c08a08c (patch) | |
| tree | 32596a5500e5322779a0a6ce9b8b44852e75f438 /playbooks/common | |
| parent | 6600c694bedf88a246c0f8a2cccb9ae3c34dc6ea (diff) | |
| parent | 1b720085f2448794190e224011a07134b9425310 (diff) | |
| download | openshift-e3897f7be787ce729d51a150effe0fda9c08a08c.tar.gz openshift-e3897f7be787ce729d51a150effe0fda9c08a08c.tar.bz2 openshift-e3897f7be787ce729d51a150effe0fda9c08a08c.tar.xz openshift-e3897f7be787ce729d51a150effe0fda9c08a08c.zip | |
Merge pull request #1859 from dgoodwin/containerized-upgrade
Containerized Upgrade Fixes
Diffstat (limited to 'playbooks/common')
| -rw-r--r-- | playbooks/common/openshift-cluster/upgrades/v3_1_to_v3_2/pre.yml | 3 | ||||
| -rw-r--r-- | playbooks/common/openshift-cluster/upgrades/v3_1_to_v3_2/upgrade.yml | 1 |
2 files changed, 3 insertions, 1 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 1dd47dc15..ce589db2e 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 @@ -102,6 +102,7 @@ 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: - include: ../../../../../roles/openshift_master/handlers/main.yml - include: ../../../../../roles/openshift_node/handlers/main.yml @@ -110,7 +111,7 @@ # are modified to use the correct image tag. However, this can trigger a # docker restart if new configuration is laid down which would immediately # pull the latest image and defeat the purpose of these tasks. - - openshift_cli + - { role: openshift_cli } pre_tasks: - name: Clean package cache command: "{{ ansible_pkg_mgr }} clean all" 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 a91727ecd..d15653a3b 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 @@ -130,6 +130,7 @@ 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: - name: Verifying the correct commandline tools are available shell: grep {{ verify_upgrade_version }} {{ openshift.common.admin_binary}} |