diff options
| author | Jenkins <jenkins@review.openstack.org> | 2017-01-03 12:50:58 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2017-01-03 12:50:58 +0000 |
| commit | 52d8a71d485e5991997f93792513efe9c0083f53 (patch) | |
| tree | a2fd3fad63229afdcd01faee92067a5d8bf68eda /tools | |
| parent | cb7dec77349107ac0fa1988e08df91b59453e809 (diff) | |
| parent | c07d95e1afa690d8b4f28072f4d09aa760da91d8 (diff) | |
| download | kolla-52d8a71d485e5991997f93792513efe9c0083f53.tar.gz kolla-52d8a71d485e5991997f93792513efe9c0083f53.zip | |
Merge "Clean up kolla-ansible related files from Kolla"
Diffstat (limited to 'tools')
| -rwxr-xr-x | tools/deploy_aio.sh | 4 | ||||
| l--------- | tools/generate_passwords.py | 1 | ||||
| -rwxr-xr-x | tools/setup_gate.sh | 2 |
3 files changed, 4 insertions, 3 deletions
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 7556affe9..a7b635e54 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. |