From c07d95e1afa690d8b4f28072f4d09aa760da91d8 Mon Sep 17 00:00:00 2001
From: Sayantani Goswami <sayantani.goswami@intel.com>
Date: Fri, 2 Dec 2016 23:25:29 -0600
Subject: Clean up kolla-ansible related files from Kolla

- Remove globals.yml and passwords.yml files.
- The gate was still using these files from the kolla
directory. Modified the gate to prevent using these files
from the kolla directory.
- Modified the deploy_aio.sh file to populate passwords
in passwords.yml using kolla-ansible.

Change-Id: I1ed7849d54cab6d5a9217dced73327ea13f06636
Closes-Bug: #1653035
---
 tools/deploy_aio.sh         | 4 ++++
 tools/generate_passwords.py | 1 -
 tools/setup_gate.sh         | 2 --
 3 files changed, 4 insertions(+), 3 deletions(-)
 delete mode 120000 tools/generate_passwords.py

(limited to 'tools')

diff --git a/tools/deploy_aio.sh b/tools/deploy_aio.sh
index e4db71288..bc3c032c9 100755
--- a/tools/deploy_aio.sh
+++ b/tools/deploy_aio.sh
@@ -20,5 +20,9 @@ EOF
     openstack/kolla-ansible
 
 pushd "${KOLLA_ANSIBLE_DIR}"
+# Copy configs
+sudo cp -a etc/kolla /etc/
+# Generate passwords
+sudo tools/generate_passwords.py
 ./tools/deploy_aio.sh "$KOLLA_BASE" "$KOLLA_TYPE"
 popd
diff --git a/tools/generate_passwords.py b/tools/generate_passwords.py
deleted file mode 120000
index e157963a3..000000000
--- a/tools/generate_passwords.py
+++ /dev/null
@@ -1 +0,0 @@
-../kolla/cmd/genpwd.py
\ No newline at end of file
diff --git a/tools/setup_gate.sh b/tools/setup_gate.sh
index dffcb69f9..7b73b991c 100755
--- a/tools/setup_gate.sh
+++ b/tools/setup_gate.sh
@@ -22,8 +22,6 @@ function setup_config {
     tox -e genconfig
     # Copy configs
     sudo cp -a etc/kolla /etc/
-    # Generate passwords
-    sudo tools/generate_passwords.py
 
     # Use Infra provided pypi.
     # Wheel package mirror may be not compatible. So do not enable it.
-- 
cgit v1.2.3