Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Don't assume storage_migration control variables are already boolean #5389

Merged
merged 1 commit into from Sep 14, 2017
Merged

Don't assume storage_migration control variables are already boolean #5389

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
18 changes: 9 additions & 9 deletions playbooks/common/openshift-cluster/upgrades/upgrade_control_plane.yml
View file
Open in desktop
Expand Up @@ -13,11 +13,11 @@
{{ openshift.common.client_binary }} adm --config={{ openshift.common.config_base }}/master/admin.kubeconfig
migrate storage --include=* --confirm
register: l_pb_upgrade_control_plane_pre_upgrade_storage
when: openshift_upgrade_pre_storage_migration_enabled | default(true,true) | bool
when: openshift_upgrade_pre_storage_migration_enabled | default(true) | bool
failed_when:
- openshift_upgrade_pre_storage_migration_enabled | default(true,true) | bool
- openshift_upgrade_pre_storage_migration_enabled | default(true) | bool
- l_pb_upgrade_control_plane_pre_upgrade_storage.rc != 0
- openshift_upgrade_pre_storage_migration_fatal | default(true,true) | bool
- openshift_upgrade_pre_storage_migration_fatal | default(true) | bool

# If facts cache were for some reason deleted, this fact may not be set, and if not set
# it will always default to true. This causes problems for the etcd data dir fact detection
Expand Down Expand Up @@ -151,11 +151,11 @@
{{ openshift.common.client_binary }} adm --config={{ openshift.common.config_base }}/master/admin.kubeconfig
migrate storage --include=clusterpolicies --confirm
register: l_pb_upgrade_control_plane_post_upgrade_storage
when: openshift_upgrade_post_storage_migration_enabled | default(true,true) | bool
when: openshift_upgrade_post_storage_migration_enabled | default(true) | bool
failed_when:
- openshift_upgrade_post_storage_migration_enabled | default(true,true) | bool
- openshift_upgrade_post_storage_migration_enabled | default(true) | bool
- l_pb_upgrade_control_plane_post_upgrade_storage.rc != 0
- openshift_upgrade_post_storage_migration_fatal | default(false,true) | bool
- openshift_upgrade_post_storage_migration_fatal | default(false) | bool
run_once: true
delegate_to: "{{ groups.oo_first_master.0 }}"

Expand Down Expand Up @@ -247,11 +247,11 @@
migrate storage --include=* --confirm
run_once: true
register: l_pb_upgrade_control_plane_post_upgrade_storage
when: openshift_upgrade_post_storage_migration_enabled | default(true,true) | bool
when: openshift_upgrade_post_storage_migration_enabled | default(true) | bool
failed_when:
- openshift_upgrade_post_storage_migration_enabled | default(true,true) | bool
- openshift_upgrade_post_storage_migration_enabled | default(true) | bool
- l_pb_upgrade_control_plane_post_upgrade_storage.rc != 0
- openshift_upgrade_post_storage_migration_fatal | default(false,true) | bool
- openshift_upgrade_post_storage_migration_fatal | default(false) | bool

- set_fact:
reconcile_complete: True
Expand Down