From 17d10d8b39a4475ea7faa0f59151f9edd278d9f0 Mon Sep 17 00:00:00 2001 From: Markos Chandras Date: Tue, 19 Sep 2017 11:43:35 +0100 Subject: xci: xci-deploy.sh: Ensure env_reset is not present We are making use of 'sudo -E' to preserve environment variables when using 'sudo' so we need to make sure that we don't use env_reset in the configuration file. Change-Id: I45a818da6c5c090ece67898e54f2dc4ba48cb452 Signed-off-by: Markos Chandras --- xci/xci-deploy.sh | 2 ++ 1 file changed, 2 insertions(+) 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 -- cgit 1.2.3-korg From 2a4b1866a7eb25fdcff58c49128ef72a75470c7c Mon Sep 17 00:00:00 2001 From: Markos Chandras Date: Wed, 20 Sep 2017 08:52:32 +0100 Subject: xci: configure-localhost: Do not check /etc/ssl/certs on SUSE /etc/ssl/certs is a symlink so skip this task on SUSE. Change-Id: Ibc188b76f47c4f7d1c5aa452a21e838420d65e6a Signed-off-by: Markos Chandras --- xci/playbooks/configure-localhost.yml | 1 + 1 file changed, 1 insertion(+) 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" -- cgit 1.2.3-korg