diff options
| author | OpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com> | 2018-01-09 16:50:13 -0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-01-09 16:50:13 -0800 |
| commit | a594dd15a707651e0b9c8dac6d48991488537d4d (patch) | |
| tree | 0d0d71b986ba40f6a2c9a16b6d5f7da9a96f92dd | |
| parent | 77730cb7f2e04175c72759f627186a5efffcc3c1 (diff) | |
| parent | aae5250ed482423e7789c2dfb335d99475445493 (diff) | |
| download | openshift-a594dd15a707651e0b9c8dac6d48991488537d4d.tar.gz openshift-a594dd15a707651e0b9c8dac6d48991488537d4d.tar.bz2 openshift-a594dd15a707651e0b9c8dac6d48991488537d4d.tar.xz openshift-a594dd15a707651e0b9c8dac6d48991488537d4d.zip | |
Merge pull request #6658 from mgugino-upstream-stage/containerized_bools
Automatic merge from submit-queue.
ensure containerized bools are cast
| -rw-r--r-- | roles/etcd/tasks/migration/migrate.yml | 2 | ||||
| -rw-r--r-- | roles/openshift_etcd_facts/vars/main.yml | 2 | ||||
| -rw-r--r-- | roles/openshift_facts/defaults/main.yml | 2 | ||||
| -rw-r--r-- | roles/openshift_node/tasks/upgrade/config_changes.yml | 2 |
4 files changed, 4 insertions, 4 deletions
diff --git a/roles/etcd/tasks/migration/migrate.yml b/roles/etcd/tasks/migration/migrate.yml index 847b1d722..630640ab1 100644 --- a/roles/etcd/tasks/migration/migrate.yml +++ b/roles/etcd/tasks/migration/migrate.yml @@ -1,7 +1,7 @@ --- # Should this be run in a serial manner? - set_fact: - l_etcd_service: "{{ 'etcd_container' if openshift_is_containerized else 'etcd' }}" + l_etcd_service: "{{ 'etcd_container' if (openshift_is_containerized | bool) else 'etcd' }}" - name: Migrate etcd data command: > diff --git a/roles/openshift_etcd_facts/vars/main.yml b/roles/openshift_etcd_facts/vars/main.yml index 9e635b34f..d716c9505 100644 --- a/roles/openshift_etcd_facts/vars/main.yml +++ b/roles/openshift_etcd_facts/vars/main.yml @@ -1,5 +1,5 @@ --- -etcd_is_containerized: "{{ openshift_is_containerized }}" +etcd_is_containerized: "{{ openshift_is_containerized | bool }}" etcd_is_atomic: "{{ openshift_is_atomic }}" etcd_hostname: "{{ openshift.common.hostname }}" etcd_ip: "{{ openshift.common.ip }}" diff --git a/roles/openshift_facts/defaults/main.yml b/roles/openshift_facts/defaults/main.yml index 980350d14..a223ffba6 100644 --- a/roles/openshift_facts/defaults/main.yml +++ b/roles/openshift_facts/defaults/main.yml @@ -1,5 +1,5 @@ --- -openshift_client_binary: "{{ openshift_is_containerized | ternary('/usr/local/bin/oc', 'oc') }}" +openshift_client_binary: "{{ (openshift_is_containerized | bool) | ternary('/usr/local/bin/oc', 'oc') }}" openshift_cli_image_dict: origin: 'openshift/origin' diff --git a/roles/openshift_node/tasks/upgrade/config_changes.yml b/roles/openshift_node/tasks/upgrade/config_changes.yml index 210d174c2..721656117 100644 --- a/roles/openshift_node/tasks/upgrade/config_changes.yml +++ b/roles/openshift_node/tasks/upgrade/config_changes.yml @@ -1,7 +1,7 @@ --- - name: Update systemd units include_tasks: ../systemd_units.yml - when: openshift_is_containerized + when: openshift_is_containerized | bool - name: Update oreg value yedit: |