From e360f7cd62e89f8bceb1519f13f676652790252a Mon Sep 17 00:00:00 2001
From: Mark Goddard <mark@stackhpc.com>
Date: Tue, 22 Dec 2020 13:20:28 +0000
Subject: [PATCH] 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
---
ansible/container-image-build.yml | 2 +-
ansible/overcloud-grafana-configure.yml | 2 +-
ansible/overcloud-introspection-rules.yml | 4 ++--
ansible/roles/dell-switch-bmp/handlers/main.yml | 6 +++---
ansible/seed-ipa-build.yml | 2 +-
5 files changed, 8 insertions(+), 8 deletions(-)
diff --git a/ansible/container-image-build.yml b/ansible/container-image-build.yml
index 664a0a65..452a1e1f 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 53c44e2f..7fd18a16 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 60878833..550e14ac 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 1cf0db2c..d06ba609 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 6f4bdc6f..c9c538a1 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 }}"
--
GitLab