Browse Source

[aiab] Move dev_single_node content to aiab

`dev_single_node` directory is inherited from an old
aiab repo and does not have much meaning in the current
directories layout, move all the scripts to aiab directory.

Change-Id: Ib59e14a81727104b66e372a2c61c5040282f2dc9
tags/v1.1
Evgeny L 8 months ago
parent
commit
a209b3c720
4 changed files with 5 additions and 7 deletions
  1. +0
    -0
      tools/deployment/aiab/README.rst
  2. +1
    -1
      tools/deployment/aiab/airship-in-a-bottle.sh
  3. +2
    -2
      tools/deployment/aiab/common/deploy-airship.sh
  4. +2
    -4
      tools/deployment/aiab/common/test_create_heat_stack.sh

tools/deployment/aiab/dev_single_node/README.txt → tools/deployment/aiab/README.rst View File


tools/deployment/aiab/dev_single_node/airship-in-a-bottle.sh → tools/deployment/aiab/airship-in-a-bottle.sh View File

@@ -160,4 +160,4 @@ fi
echo ""
echo "Starting Airship deployment..."
sleep 1
../common/deploy-airship.sh demo
common/deploy-airship.sh demo

+ 2
- 2
tools/deployment/aiab/common/deploy-airship.sh View File

@@ -306,7 +306,7 @@ function execute_create_heat_stack() {
echo " "
set -x
# Switch to directory where the script is located
pushd ${WORKSPACE}/treasuremap/tools/deployment/aiab/dev_single_node/
pushd ${WORKSPACE}/treasuremap/tools/deployment/aiab/
bash test_create_heat_stack.sh
popd
}
@@ -333,7 +333,7 @@ function print_dashboards() {
echo " Password: password"
echo " "
echo "OpenStack CLI commands could be launched via \`./run_openstack_cli.sh\` script, e.g.:"
echo " # cd ${WORKSPACE}/treasuremap/tools/deployment/aiab/dev_single_node"
echo " # cd ${WORKSPACE}/treasuremap/tools/deployment/aiab"
echo " # ./run_openstack_cli.sh stack list"
echo " ..."
echo " "

tools/deployment/aiab/dev_single_node/test_create_heat_stack.sh → tools/deployment/aiab/common/test_create_heat_stack.sh View File

@@ -23,10 +23,8 @@ export OSH_EXT_SUBNET="172.24.8.0/24"
# Install curl if it's not already installed
apt -y install --no-install-recommends curl

cp /root/deploy/treasuremap/tools/openstack /root/deploy/treasuremap/tools/deployment/aiab/dev_single_node

# Change to the dev_single_node directory
cd /root/deploy/treasuremap/tools/deployment/aiab/dev_single_node
cp /root/deploy/treasuremap/tools/openstack /root/deploy/treasuremap/tools/deployment/aiab
cd /root/deploy/treasuremap/tools/deployment/aiab

printf "\nCreating KeyPair\n"
./openstack keypair create heat-vm-key > id_rsa

Loading…
Cancel
Save