diff options
| author |   Markos Chandras <mchandras@suse.de> | 2017-09-22 15:37:16 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <gerrit@opnfv.org> | 2017-09-22 15:37:16 +0000 |
| commit | 3aae4a146649595359bc517c1c8cbb7cfec898ec (patch) | |
| tree | 85a8390085206a10c9dd25e40301c534b566f0dc | |
| parent | 264c513842f00ea523a3b46259510b64c6d31075 (diff) | |
| parent | 2a4b1866a7eb25fdcff58c49128ef72a75470c7c (diff) | |
Merge changes from topic 'split-variable-creation-to-task'
* changes:
xci: configure-localhost: Do not check /etc/ssl/certs on SUSE
xci: xci-deploy.sh: Ensure env_reset is not present
| -rw-r--r-- | xci/playbooks/configure-localhost.yml | 1 | ||||
| -rwxr-xr-x | xci/xci-deploy.sh | 2 |
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 |