Use $0 instead of script name in echo; fix formatting

JIRA: MODELS-23

Change-Id: I3e5a76197ccc57f7e2a3b94c1601f823e02193ad
Signed-off-by: blsaws <bryan.sullivan@att.com>

diff --git a/tests/utils/cloudify-setup.sh b/tests/utils/cloudify-setup.sh
index 5dca3dc..cd4f198 100644 (file)
--- a/tests/utils/cloudify-setup.sh
+++ b/tests/utils/cloudify-setup.sh
@@ -27,8 +27,8 @@
 \r
 function setenv () {\r
 if [ "$dist" == "Ubuntu" ]; then\r
-  echo "cloudify-setup.sh: Ubuntu-based install"\r
-  echo "cloudify-setup.sh: Create the environment file"\r
+  echo "$0: Ubuntu-based install"\r
+  echo "$0: Create the environment file"\r
   KEYSTONE_HOST=$(juju status --format=short | awk "/keystone\/0/ { print \$3 }")\r
   cat <<EOF >/tmp/cloudify/admin-openrc.sh\r
 export CONGRESS_HOST=$(juju status --format=short | awk "/openstack-dashboard/ { print \$3 }")\r
@@ -47,12 +47,12 @@ export OS_REGION_NAME=RegionOne
 EOF\r
 else\r
   # Centos\r
-  echo "cloudify-setup.sh: Centos-based install"\r
-  echo "cloudify-setup.sh: Setup undercloud environment so we can get overcloud Controller server address"\r
+  echo "$0: Centos-based install"\r
+  echo "$0: Setup undercloud environment so we can get overcloud Controller server address"\r
   source ~/stackrc\r
-  echo "cloudify-setup.sh: Get address of Controller node"\r
+  echo "$0: Get address of Controller node"\r
   export CONTROLLER_HOST1=$(openstack server list | awk "/overcloud-controller-0/ { print \$8 }" | sed 's/ctlplane=//g')\r
-  echo "cloudify-setup.sh: Create the environment file"\r
+  echo "$0: Create the environment file"\r
   cat <<EOF >/tmp/cloudify/admin-openrc.sh\r
 export CONGRESS_HOST=$CONTROLLER_HOST1\r
 export KEYSTONE_HOST=$CONTROLLER_HOST1\r
@@ -82,21 +82,21 @@ function get_external_net () {
     EXTERNAL_NETWORK_NAME=$(openstack network show $ext_net_id | awk "/ name / { print \$4 }")\r
     EXTERNAL_SUBNET_ID=$(openstack network show $EXTERNAL_NETWORK_NAME | awk "/ subnets / { print \$4 }")\r
   else\r
-    echo "cloudify-setup.sh: External network not found"\r
+    echo "$0: External network not found"\r
     exit 1\r
   fi\r
 }\r
 \r
 dist=`grep DISTRIB_ID /etc/*-release | awk -F '=' '{print $2}'`\r
 if [ "$2" == "1" ]; then\r
-  echo "cloudify-setup.sh: Copy this script to /tmp/cloudify"\r
+  echo "$0: Copy this script to /tmp/cloudify"\r
        mkdir /tmp/cloudify\r
   cp $0 /tmp/cloudify/.\r
   chmod 755 /tmp/cloudify/*.sh\r
 \r
-  echo "cloudify-setup.sh: Setup admin-openrc.sh"\r
+  echo "$0: Setup admin-openrc.sh"\r
   setenv\r
-  echo "cloudify-setup.sh: Setup container"\r
+  echo "$0: Setup container"\r
   if [ "$dist" == "Ubuntu" ]; then\r
     # xenial is needed for python 3.5\r
     sudo docker pull ubuntu:xenial\r
@@ -125,7 +125,7 @@ EOF
   fi\r
 else \r
   if [ "$2" == "2" ]; then\r
-    echo "cloudify-setup.sh: Install dependencies - OS specific"\r
+    echo "$0: Install dependencies - OS specific"\r
     if [ "$dist" == "Ubuntu" ]; then\r
       apt-get update\r
       apt-get install -y python\r
@@ -147,36 +147,36 @@ fi
 \r
 cd ~\r
 \r
-echo "cloudify-setup.sh: Install dependencies - generic"\r
+echo "$0: Install dependencies - generic"\r
 pip install --upgrade pip virtualenv\r
 \r
-echo "cloudify-setup.sh: Upgrage pip again - needs to be the latest version due to errors found in earlier testing"\r
+echo "$0: Upgrage pip again - needs to be the latest version due to errors found in earlier testing"\r
 pip install --upgrade pip\r
 \r
-echo "cloudify-setup.sh: install python-openstackclient python-glanceclient"\r
+echo "$0: install python-openstackclient python-glanceclient"\r
 pip install --upgrade python-openstackclient python-glanceclient  python-neutronclient\r
 \r
-echo "cloudify-setup.sh: cleanup any previous install attempt"\r
+echo "$0: cleanup any previous install attempt"\r
 if [ -d "~/cloudify" ]; then rm -rf ~/cloudify; fi  \r
 if [ -d "~/cloudify-manager" ]; then rm -rf ~/cloudify-manager; fi  \r
 rm ~/get-cloudify.py\r
 \r
-echo "cloudify-setup.sh: Create virtualenv"\r
+echo "$0: Create virtualenv"\r
 virtualenv ~/cloudify/venv\r
 source ~/cloudify/venv/bin/activate\r
 \r
-echo "cloudify-setup.sh: Get Cloudify"\r
+echo "$0: Get Cloudify"\r
 wget http://gigaspaces-repository-eu.s3.amazonaws.com/org/cloudify3/get-cloudify.py\r
 python get-cloudify.py --upgrade\r
 \r
-echo "cloudify-setup.sh: Initialize Cloudify"\r
+echo "$0: Initialize Cloudify"\r
 cfy init\r
 \r
-echo "cloudify-setup.sh: Setup admin-openrc.sh"\r
+echo "$0: Setup admin-openrc.sh"\r
 source /tmp/cloudify/admin-openrc.sh\r
 \r
 if [ "$1" == "cloudify-manager" ]; then\r
-  echo "cloudify-setup.sh: Prepare the Cloudify Manager prerequisites and data"\r
+  echo "$0: Prepare the Cloudify Manager prerequisites and data"\r
   mkdir -p ~/cloudify-manager\r
   cd ~/cloudify-manager\r
   wget https://github.com/cloudify-cosmo/cloudify-manager-blueprints/archive/3.4.tar.gz\r
@@ -184,29 +184,29 @@ if [ "$1" == "cloudify-manager" ]; then
   tar -xzvf cloudify-manager-blueprints.tar.gz\r
   cd cloudify-manager-blueprints-3.4\r
 \r
-  echo "cloudify-setup.sh: Setup keystone_username"\r
+  echo "$0: Setup keystone_username"\r
   sed -i -- "s/keystone_username: ''/keystone_username: '$OS_USERNAME'/g" openstack-manager-blueprint-inputs.yaml\r
 \r
-  echo "cloudify-setup.sh: Setup keystone_password"\r
+  echo "$0: Setup keystone_password"\r
   sed -i -- "s/keystone_password: ''/keystone_password: '$OS_PASSWORD'/g" openstack-manager-blueprint-inputs.yaml\r
 \r
-  echo "cloudify-setup.sh: Setup keystone_tenant_name"\r
+  echo "$0: Setup keystone_tenant_name"\r
   sed -i -- "s/keystone_tenant_name: ''/keystone_tenant_name: '$OS_TENANT_NAME'/g" openstack-manager-blueprint-inputs.yaml\r
 \r
-  echo "cloudify-setup.sh: Setup keystone_url"\r
+  echo "$0: Setup keystone_url"\r
   # Use ~ instead of / as regex delimeter, since this variable contains slashes\r
   sed -i -- "s~keystone_url: ''~keystone_url: '$OS_AUTH_URL'~g" openstack-manager-blueprint-inputs.yaml\r
 \r
-  echo "cloudify-setup.sh: Setup region"\r
+  echo "$0: Setup region"\r
   sed -i -- "s/region: ''/region: '$OS_REGION_NAME'/g" openstack-manager-blueprint-inputs.yaml\r
 \r
-  echo "cloudify-setup.sh: Setup manager_public_key_name"\r
+  echo "$0: Setup manager_public_key_name"\r
   sed -i -- "s/#manager_public_key_name: ''/manager_public_key_name: 'cloudify-manager'/g" openstack-manager-blueprint-inputs.yaml\r
 \r
-  echo "cloudify-setup.sh: Setup agent_public_key_name"\r
+  echo "$0: Setup agent_public_key_name"\r
   sed -i -- "s/#agent_public_key_name: ''/agent_public_key_name: 'cloudify-agent'/g" openstack-manager-blueprint-inputs.yaml\r
 \r
-  echo "cloudify-setup.sh: Setup image_id"\r
+  echo "$0: Setup image_id"\r
   # CentOS-7-x86_64-GenericCloud.qcow2 failed to be routable (?), so changed to 1607 version\r
   image=$(openstack image list | awk "/ CentOS-7-x86_64-GenericCloud-1607 / { print \$2 }")\r
   if [ -z $image ]; then \r
@@ -215,51 +215,51 @@ if [ "$1" == "cloudify-manager" ]; then
   image=$(openstack image list | awk "/ CentOS-7-x86_64-GenericCloud-1607 / { print \$2 }")\r
   sed -i -- "s/image_id: ''/image_id: '$image'/g" openstack-manager-blueprint-inputs.yaml\r
 \r
-  echo "cloudify-setup.sh: Setup flavor_id"\r
+  echo "$0: Setup flavor_id"\r
   flavor=$(nova flavor-show m1.large | awk "/ id / { print \$4 }")\r
   sed -i -- "s/flavor_id: ''/flavor_id: '$flavor'/g" openstack-manager-blueprint-inputs.yaml\r
 \r
-  echo "cloudify-setup.sh: Setup external_network_name"\r
+  echo "$0: Setup external_network_name"\r
   get_external_net\r
   sed -i -- "s/external_network_name: ''/external_network_name: '$EXTERNAL_NETWORK_NAME'/g" openstack-manager-blueprint-inputs.yaml\r
 \r
   # By default, only the cloudify-management-router is setup as DNS server, and it was failing to resolve internet domain names, which was blocking download of needed resources\r
-  echo "cloudify-setup.sh: Add nameservers"\r
+  echo "$0: Add nameservers"\r
   sed -i -- "s/#management_subnet_dns_nameservers: \[\]/management_subnet_dns_nameservers: \[8.8.8.8\]/g" openstack-manager-blueprint-inputs.yaml\r
 \r
-  echo "cloudify-setup.sh: Bootstrap the manager"\r
+  echo "$0: Bootstrap the manager"\r
   cfy bootstrap --install-plugins --keep-up-on-failure --task-retries=10 -p openstack-manager-blueprint.yaml -i openstack-manager-blueprint-inputs.yaml\r
 \r
-  echo "cloudify-setup.sh: install needed packages to support blueprints 'not using managed plugins'"\r
+  echo "$0: install needed packages to support blueprints 'not using managed plugins'"\r
   # See https://cloudifysource.atlassian.net/browse/CFY-5050\r
   cfy ssh -c "sudo yum install -y gcc gcc-c++ python-devel"\r
 else\r
-    echo "cloudify-setup.sh: Prepare the Cloudify CLI prerequisites and data"\r
-    cd ~\r
-    git clone https://github.com/cloudify-cosmo/cloudify-openstack-plugin.git          \r
-    cd cloudify-openstack-plugin\r
+  echo "$0: Prepare the Cloudify CLI prerequisites and data"\r
+  cd /tmp/cloudify\r
+  git clone https://github.com/cloudify-cosmo/cloudify-openstack-plugin.git            \r
+  cd cloudify-openstack-plugin\r
 \r
-    echo "Create management network"\r
-    if [ $(neutron net-list | awk "/ cloudify_mgmt / { print \$2 }") ]; then\r
-      echo "cloudify-setup.sh: cloudify_mgmt network exists"\r
-    else\r
-      neutron net-create cloudify_mgmt         \r
-      echo "Create management subnet"\r
-      neutron subnet-create cloudify_mgmt 10.0.0.0/24 --name cloudify_mgmt --gateway 10.0.0.1 --enable-dhcp --allocation-pool start=10.0.0.2,end=10.0.0.254 --dns-nameserver 8.8.8.8\r
-    fi\r
-    echo "cloudify-setup.sh: Create router for cloudify_mgmt network"\r
-    neutron router-create cloudify_mgmt_router\r
+  echo "Create management network"\r
+  if [ $(neutron net-list | awk "/ cloudify_mgmt / { print \$2 }") ]; then\r
+    echo "$0: cloudify_mgmt network exists"\r
+  else\r
+    neutron net-create cloudify_mgmt           \r
+    echo "$0: Create management subnet"\r
+    neutron subnet-create cloudify_mgmt 10.0.0.0/24 --name cloudify_mgmt --gateway 10.0.0.1 --enable-dhcp --allocation-pool start=10.0.0.2,end=10.0.0.254 --dns-nameserver 8.8.8.8\r
+  fi\r
 \r
-    echo "cloudify-setup.sh: Create router gateway for cloudify_mgmt network"\r
-    neutron router-gateway-set cloudify_mgmt_router $EXTERNAL_NETWORK_NAME\r
+  echo "$0: Create router for cloudify_mgmt network"\r
+  neutron router-create cloudify_mgmt_router\r
 \r
-    echo "cloudify-setup.sh: Add router interface for cloudify_mgmt network"\r
-    neutron router-interface-add cloudify_mgmt_router subnet=cloudify_mgmt\r
-    fi\r
+  echo "$0: Create router gateway for cloudify_mgmt network"\r
+  neutron router-gateway-set cloudify_mgmt_router $EXTERNAL_NETWORK_NAME\r
+\r
+  echo "$0: Add router interface for cloudify_mgmt network"\r
+  neutron router-interface-add cloudify_mgmt_router subnet=cloudify_mgmt\r
                \r
-  echo "cloudify-setup.sh: Patch plugin.yaml to reference management network"\r
-  sed -i -- "s/management_network_name:\n        default: ''/management_network_name:\n        default: 'cloudify_mgmt'/" ~/cloudify-openstack-plugin/plugin.yaml\r
+  echo "$0: Patch plugin.yaml to reference management network"\r
+  sed -i -- "s/management_network_name:\n        default: ''/management_network_name:\n        default: 'cloudify_mgmt'/" /tmp/cloudify/cloudify-openstack-plugin/plugin.yaml\r
                \r
-    python setup.py build\r
-    python setup.py install\r
+  python setup.py build\r
+  python setup.py install\r
 fi\r