airship
/
treasuremap
Code Issues Proposed changes

[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
This commit is contained in:
Evgeny L 2019-06-11 21:37:42 +00:00
parent 5254785f57
commit a209b3c720
4 changed files with 5 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

2
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 ""
echo "Starting Airship deployment..." echo "Starting Airship deployment..."
sleep 1 sleep 1
../common/deploy-airship.sh demo common/deploy-airship.sh demo

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

@ -306,7 +306,7 @@ function execute_create_heat_stack() {
echo " " echo " "
set -x set -x
# Switch to directory where the script is located # 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 bash test_create_heat_stack.sh
popd popd
} }
@ -333,7 +333,7 @@ function print_dashboards() {
echo " Password: password" echo " Password: password"
echo " " echo " "
echo "OpenStack CLI commands could be launched via \`./run_openstack_cli.sh\` script, e.g.:" 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 " # ./run_openstack_cli.sh stack list"
echo " ..." echo " ..."
echo " " echo " "

6
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 # Install curl if it's not already installed
apt -y install --no-install-recommends curl apt -y install --no-install-recommends curl
cp /root/deploy/treasuremap/tools/openstack /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
# Change to the dev_single_node directory
cd /root/deploy/treasuremap/tools/deployment/aiab/dev_single_node
printf "\nCreating KeyPair\n" printf "\nCreating KeyPair\n"
./openstack keypair create heat-vm-key > id_rsa ./openstack keypair create heat-vm-key > id_rsa