summaryrefslogtreecommitdiffstats
path: root/playbooks/common
diff options
context:
space:
mode:
authorJason DeTiberus <jdetiber@redhat.com>2015-11-11 15:27:57 -0500
committerJason DeTiberus <jdetiber@redhat.com>2015-11-11 15:59:35 -0500
commit35e52819020fbf6925bbc7b43c9a5ca40e3eb6a5 (patch)
tree61dbc20224f5e832ce60ada2022fb3784666b6cf /playbooks/common
parent32596e5b6440ca7e1cc53aba36c0b4c50fa528f1 (diff)
downloadopenshift-35e52819020fbf6925bbc7b43c9a5ca40e3eb6a5.tar.gz
openshift-35e52819020fbf6925bbc7b43c9a5ca40e3eb6a5.tar.bz2
openshift-35e52819020fbf6925bbc7b43c9a5ca40e3eb6a5.tar.xz
openshift-35e52819020fbf6925bbc7b43c9a5ca40e3eb6a5.zip
Fix update error for templates that didn't previously exist
Diffstat (limited to 'playbooks/common')
-rw-r--r--playbooks/common/openshift-cluster/upgrades/v3_0_to_v3_1/upgrade.yml9
1 files changed, 8 insertions, 1 deletions
diff --git a/playbooks/common/openshift-cluster/upgrades/v3_0_to_v3_1/upgrade.yml b/playbooks/common/openshift-cluster/upgrades/v3_0_to_v3_1/upgrade.yml
index 1cd7327cb..78797f8b8 100644
--- a/playbooks/common/openshift-cluster/upgrades/v3_0_to_v3_1/upgrade.yml
+++ b/playbooks/common/openshift-cluster/upgrades/v3_0_to_v3_1/upgrade.yml
@@ -363,13 +363,20 @@
- name: Upgrade default router and default registry
hosts: oo_first_master
vars:
- openshift_examples_import_command: "update"
openshift_deployment_type: "{{ deployment_type }}"
registry_image: "{{ openshift.master.registry_url | replace( '${component}', 'docker-registry' ) | replace ( '${version}', 'v' + g_new_version ) }}"
router_image: "{{ openshift.master.registry_url | replace( '${component}', 'haproxy-router' ) | replace ( '${version}', 'v' + g_new_version ) }}"
oc_cmd: "{{ openshift.common.client_binary }} --config={{ openshift.common.config_base }}/master/admin.kubeconfig"
roles:
+ # Create the new templates shipped in 3.1, existing templates are left
+ # unmodified. This prevents the subsequent role definition for
+ # openshift_examples from failing when trying to replace templates that do
+ # not already exist. We could have potentially done a replace --force to
+ # create and update in one step.
- openshift_examples
+ # Update the existing templates
+ - role: openshift_examples
+ openshift_examples_import_command: replace
pre_tasks:
- name: Check for default router
command: >