diff --git a/ansible/container-image-build.yml b/ansible/container-image-build.yml index 664a0a65dafea9c6f7cba371a6541293af8310cb..452a1e1f3ce9a5109a90bebbad4afa327026e178 100644 --- a/ansible/container-image-build.yml +++ b/ansible/container-image-build.yml @@ -45,7 +45,7 @@ - name: Ensure Kolla container images are built shell: > set -o pipefail && - source {{ kolla_venv }}/bin/activate && + . {{ kolla_venv }}/bin/activate && kolla-build \ --config-dir {{ kolla_build_config_path }} \ {% if item.type is defined %}--type {{ item.type }}{% endif %} \ diff --git a/ansible/overcloud-grafana-configure.yml b/ansible/overcloud-grafana-configure.yml index 53c44e2ff99e5ac9898377975b7e8fec8c876d32..7fd18a16dbade69f71084feae00406152e291779 100644 --- a/ansible/overcloud-grafana-configure.yml +++ b/ansible/overcloud-grafana-configure.yml @@ -40,7 +40,7 @@ tasks: - name: Look up Monasca control plane project ID shell: > - source {{ venv }}/bin/activate && + . {{ venv }}/bin/activate && openstack project show {{ monasca_control_plane_project }} --format json --column id register: monasca_project_show changed_when: False diff --git a/ansible/overcloud-introspection-rules.yml b/ansible/overcloud-introspection-rules.yml index 608788338b64646ff5dec5e09b5a0bdea42b7321..550e14ac320cfb63e9545c970802d31daf5cdacc 100644 --- a/ansible/overcloud-introspection-rules.yml +++ b/ansible/overcloud-introspection-rules.yml @@ -41,7 +41,7 @@ - name: Retrieve the IPA kernel Glance image UUID shell: > - source {{ venv }}/bin/activate && + . {{ venv }}/bin/activate && openstack image show '{{ ipa_images_kernel_name }}' -f value -c id changed_when: False register: ipa_kernel_id @@ -49,7 +49,7 @@ - name: Retrieve the IPA ramdisk Glance image UUID shell: > - source {{ venv }}/bin/activate && + . {{ venv }}/bin/activate && openstack image show '{{ ipa_images_ramdisk_name }}' -f value -c id changed_when: False register: ipa_ramdisk_id diff --git a/ansible/roles/dell-switch-bmp/handlers/main.yml b/ansible/roles/dell-switch-bmp/handlers/main.yml index 1cf0db2c6d7332b8179fce4dc535e7faf5ace0ba..d06ba609c224e50473a51eeee3a046703ea16cee 100644 --- a/ansible/roles/dell-switch-bmp/handlers/main.yml +++ b/ansible/roles/dell-switch-bmp/handlers/main.yml @@ -2,7 +2,7 @@ - name: Copy dnsmasq configuration command: > docker exec bifrost_deploy - bash -c 'source /bifrost/env-vars && + bash -c '. /bifrost/env-vars && ansible -vvvv target -i /bifrost/playbooks/inventory/target -m copy -a "src=/etc/bifrost/dell-switch-bmp.conf dest=/etc/dnsmasq.d/dell-switch-bmp.conf" @@ -11,7 +11,7 @@ - name: Restart bifrost dnsmasq command: > docker exec bifrost_deploy - bash -c 'source /bifrost/env-vars && + bash -c '. /bifrost/env-vars && ansible -vvvv target -i /bifrost/playbooks/inventory/target -m service -a "name=dnsmasq state=restarted" @@ -20,7 +20,7 @@ - name: Copy Dell switch BMP images command: > docker exec bifrost_deploy - bash -c 'source /bifrost/env-vars && + bash -c '. /bifrost/env-vars && ansible -vvvv target -i /bifrost/playbooks/inventory/target -m copy -a "src=/etc/bifrost/{{ item.dest }} dest={{ dell_switch_bmp_httpboot_path }}/{{ item.dest }}" diff --git a/ansible/seed-ipa-build.yml b/ansible/seed-ipa-build.yml index 6f4bdc6f736c8e165c206d5c35bb3f37e45348bb..c9c538a1c55a9827153f8d3c71251195a7948d44 100644 --- a/ansible/seed-ipa-build.yml +++ b/ansible/seed-ipa-build.yml @@ -45,7 +45,7 @@ - name: Copy Ironic Python Agent images into /httpboot command: > docker exec bifrost_deploy - bash -c 'source /bifrost/env-vars && + bash -c '. /bifrost/env-vars && ansible -vvvv target -i /bifrost/playbooks/inventory/target -m copy -a "src=/etc/bifrost/{{ item }} dest=/httpboot/{{ item }}"