Skip to content
Snippets Groups Projects
Commit 54cbe068 authored by Zuul's avatar Zuul Committed by Gerrit Code Review
Browse files

Merge "Ubuntu: Use . to source shell scripts"

parents 337a0026 e360f7cd
No related branches found
No related tags found
No related merge requests found
......@@ -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 %} \
......
......@@ -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
......
......@@ -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
......
......@@ -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 }}"
......
......@@ -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 }}"
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment