Merge "Fix conditionals in CI playbook"

This commit is contained in:
Zuul 2019-07-07 10:52:01 +00:00 committed by Gerrit Code Review
commit db55408620

View File

@ -102,15 +102,15 @@
# nova-compute.conf # nova-compute.conf
- src: "tests/templates/nova-compute-overrides.j2" - src: "tests/templates/nova-compute-overrides.j2"
dest: /etc/kolla/config/nova/nova-compute.conf dest: /etc/kolla/config/nova/nova-compute.conf
when: scenario != "bifrost" when: "{{ scenario != 'bifrost' }}"
# ceph.conf # ceph.conf
- src: "tests/templates/ceph-overrides.j2" - src: "tests/templates/ceph-overrides.j2"
dest: /etc/kolla/config/ceph.conf dest: /etc/kolla/config/ceph.conf
when: "{{ 'ceph' in scenario }}" when: "{{ is_ceph }}"
# bifrost/dib.yml # bifrost/dib.yml
- src: "tests/templates/bifrost-dib-overrides.j2" - src: "tests/templates/bifrost-dib-overrides.j2"
dest: /etc/kolla/config/bifrost/dib.yml dest: /etc/kolla/config/bifrost/dib.yml
when: scenario == "bifrost" when: "{{ scenario == 'bifrost' }}"
- src: "tests/templates/ironic-overrides.j2" - src: "tests/templates/ironic-overrides.j2"
dest: /etc/kolla/config/ironic.conf dest: /etc/kolla/config/ironic.conf
when: "{{ scenario == 'ironic' }}" when: "{{ scenario == 'ironic' }}"