summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--xci/playbooks/configure-localhost.yml1
-rwxr-xr-xxci/xci-deploy.sh2
2 files changed, 3 insertions, 0 deletions
diff --git a/xci/playbooks/configure-localhost.yml b/xci/playbooks/configure-localhost.yml
index 915d1959..7bbe420b 100644
--- a/xci/playbooks/configure-localhost.yml
+++ b/xci/playbooks/configure-localhost.yml
@@ -86,6 +86,7 @@
file:
path: "/etc/ssl/certs"
state: directory
+ when: ansible_pkg_mgr != 'zypper'
- name: create key directory /etc/ssl/private
file:
path: "/etc/ssl/private"
diff --git a/xci/xci-deploy.sh b/xci/xci-deploy.sh
index 78194fbe..c985c7dd 100755
--- a/xci/xci-deploy.sh
+++ b/xci/xci-deploy.sh
@@ -114,6 +114,8 @@ fi
#-------------------------------------------------------------------------------
echo "Info: Starting provisining VM nodes using openstack/bifrost"
echo "-------------------------------------------------------------------------"
+# We are using sudo so we need to make sure that env_reset is not present
+sudo sed -i "s/^Defaults.*env_reset/#&/" /etc/sudoers
cd $XCI_PATH/../bifrost/
sudo -E bash ./scripts/destroy-env.sh
cd $XCI_PATH/playbooks