Ubuntu: Use . to source shell scripts

Ubuntu uses sh rather than bash by default, which does not support the
source keyword.

Change-Id: Ic36531c0f26fc7dee361bebb83a1d3089166c1eb
Story: 2004960
Task: 41490
This commit is contained in:
Mark Goddard 2020-12-22 13:20:28 +00:00
parent 05867bfa18
commit e360f7cd62
5 changed files with 8 additions and 8 deletions

View File

@ -45,7 +45,7 @@
- name: Ensure Kolla container images are built - name: Ensure Kolla container images are built
shell: > shell: >
set -o pipefail && set -o pipefail &&
source {{ kolla_venv }}/bin/activate && . {{ kolla_venv }}/bin/activate &&
kolla-build \ kolla-build \
--config-dir {{ kolla_build_config_path }} \ --config-dir {{ kolla_build_config_path }} \
{% if item.type is defined %}--type {{ item.type }}{% endif %} \ {% if item.type is defined %}--type {{ item.type }}{% endif %} \

View File

@ -40,7 +40,7 @@
tasks: tasks:
- name: Look up Monasca control plane project ID - name: Look up Monasca control plane project ID
shell: > shell: >
source {{ venv }}/bin/activate && . {{ venv }}/bin/activate &&
openstack project show {{ monasca_control_plane_project }} --format json --column id openstack project show {{ monasca_control_plane_project }} --format json --column id
register: monasca_project_show register: monasca_project_show
changed_when: False changed_when: False

View File

@ -41,7 +41,7 @@
- name: Retrieve the IPA kernel Glance image UUID - name: Retrieve the IPA kernel Glance image UUID
shell: > shell: >
source {{ venv }}/bin/activate && . {{ venv }}/bin/activate &&
openstack image show '{{ ipa_images_kernel_name }}' -f value -c id openstack image show '{{ ipa_images_kernel_name }}' -f value -c id
changed_when: False changed_when: False
register: ipa_kernel_id register: ipa_kernel_id
@ -49,7 +49,7 @@
- name: Retrieve the IPA ramdisk Glance image UUID - name: Retrieve the IPA ramdisk Glance image UUID
shell: > shell: >
source {{ venv }}/bin/activate && . {{ venv }}/bin/activate &&
openstack image show '{{ ipa_images_ramdisk_name }}' -f value -c id openstack image show '{{ ipa_images_ramdisk_name }}' -f value -c id
changed_when: False changed_when: False
register: ipa_ramdisk_id register: ipa_ramdisk_id

View File

@ -2,7 +2,7 @@
- name: Copy dnsmasq configuration - name: Copy dnsmasq configuration
command: > command: >
docker exec bifrost_deploy docker exec bifrost_deploy
bash -c 'source /bifrost/env-vars && bash -c '. /bifrost/env-vars &&
ansible -vvvv target -i /bifrost/playbooks/inventory/target ansible -vvvv target -i /bifrost/playbooks/inventory/target
-m copy -m copy
-a "src=/etc/bifrost/dell-switch-bmp.conf dest=/etc/dnsmasq.d/dell-switch-bmp.conf" -a "src=/etc/bifrost/dell-switch-bmp.conf dest=/etc/dnsmasq.d/dell-switch-bmp.conf"
@ -11,7 +11,7 @@
- name: Restart bifrost dnsmasq - name: Restart bifrost dnsmasq
command: > command: >
docker exec bifrost_deploy docker exec bifrost_deploy
bash -c 'source /bifrost/env-vars && bash -c '. /bifrost/env-vars &&
ansible -vvvv target -i /bifrost/playbooks/inventory/target ansible -vvvv target -i /bifrost/playbooks/inventory/target
-m service -m service
-a "name=dnsmasq state=restarted" -a "name=dnsmasq state=restarted"
@ -20,7 +20,7 @@
- name: Copy Dell switch BMP images - name: Copy Dell switch BMP images
command: > command: >
docker exec bifrost_deploy docker exec bifrost_deploy
bash -c 'source /bifrost/env-vars && bash -c '. /bifrost/env-vars &&
ansible -vvvv target -i /bifrost/playbooks/inventory/target ansible -vvvv target -i /bifrost/playbooks/inventory/target
-m copy -m copy
-a "src=/etc/bifrost/{{ item.dest }} dest={{ dell_switch_bmp_httpboot_path }}/{{ item.dest }}" -a "src=/etc/bifrost/{{ item.dest }} dest={{ dell_switch_bmp_httpboot_path }}/{{ item.dest }}"

View File

@ -45,7 +45,7 @@
- name: Copy Ironic Python Agent images into /httpboot - name: Copy Ironic Python Agent images into /httpboot
command: > command: >
docker exec bifrost_deploy docker exec bifrost_deploy
bash -c 'source /bifrost/env-vars && bash -c '. /bifrost/env-vars &&
ansible -vvvv target -i /bifrost/playbooks/inventory/target ansible -vvvv target -i /bifrost/playbooks/inventory/target
-m copy -m copy
-a "src=/etc/bifrost/{{ item }} dest=/httpboot/{{ item }}" -a "src=/etc/bifrost/{{ item }} dest=/httpboot/{{ item }}"