From 0df6615cde569944c3d284797e648720a7d15548 Mon Sep 17 00:00:00 2001 From: blsaws Date: Tue, 30 Aug 2016 07:04:00 -0700 Subject: Fix line endings JIRA: MODELS-23 Change-Id: I159f8fc9232459ed8129d8e02a3c8c0267ca7f9a Signed-off-by: blsaws --- tests/utils/cloudify-setup.sh | 530 +++++++++++++++++++++--------------------- tests/vHello.sh | 486 +++++++++++++++++++------------------- 2 files changed, 508 insertions(+), 508 deletions(-) (limited to 'tests') diff --git a/tests/utils/cloudify-setup.sh b/tests/utils/cloudify-setup.sh index cd4f198..492e617 100644 --- a/tests/utils/cloudify-setup.sh +++ b/tests/utils/cloudify-setup.sh @@ -1,265 +1,265 @@ -#!/bin/bash -# Copyright 2016 AT&T Intellectual Property, Inc -# -# Licensed under the Apache License, Version 2.0 (the "License"); -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. -# -# What this is: Setup script for the Cloudify Manager starting from an -# Unbuntu Xenial docker container. -# -# Status: this is a work in progress, under test. -# -# How to use: -# $ bash cloudify-setup.sh [cloudify-cli|cloudify-manager] [ 1 || 2 ] -# cloudify-cli: use Cloudify CLI -# cloudify-manager: use Cloudify Manager -# 1: Initial setup of the docker container -# 2: Setup of the Cloudify Manager in the docker container - -function setenv () { -if [ "$dist" == "Ubuntu" ]; then - echo "$0: Ubuntu-based install" - echo "$0: Create the environment file" - KEYSTONE_HOST=$(juju status --format=short | awk "/keystone\/0/ { print \$3 }") - cat </tmp/cloudify/admin-openrc.sh -export CONGRESS_HOST=$(juju status --format=short | awk "/openstack-dashboard/ { print \$3 }") -export HORIZON_HOST=$(juju status --format=short | awk "/openstack-dashboard/ { print \$3 }") -export KEYSTONE_HOST=$KEYSTONE_HOST -export CEILOMETER_HOST=$(juju status --format=short | awk "/ceilometer\/0/ { print \$3 }") -export CINDER_HOST=$(juju status --format=short | awk "/cinder\/0/ { print \$3 }") -export GLANCE_HOST=$(juju status --format=short | awk "/glance\/0/ { print \$3 }") -export NEUTRON_HOST=$(juju status --format=short | awk "/neutron-api\/0/ { print \$3 }") -export NOVA_HOST=$(juju status --format=short | awk "/nova-cloud-controller\/0/ { print \$3 }") -export OS_USERNAME=admin -export OS_PASSWORD=openstack -export OS_TENANT_NAME=admin -export OS_AUTH_URL=http://$KEYSTONE_HOST:5000/v2.0 -export OS_REGION_NAME=RegionOne -EOF -else - # Centos - echo "$0: Centos-based install" - echo "$0: Setup undercloud environment so we can get overcloud Controller server address" - source ~/stackrc - echo "$0: Get address of Controller node" - export CONTROLLER_HOST1=$(openstack server list | awk "/overcloud-controller-0/ { print \$8 }" | sed 's/ctlplane=//g') - echo "$0: Create the environment file" - cat </tmp/cloudify/admin-openrc.sh -export CONGRESS_HOST=$CONTROLLER_HOST1 -export KEYSTONE_HOST=$CONTROLLER_HOST1 -export CEILOMETER_HOST=$CONTROLLER_HOST1 -export CINDER_HOST=$CONTROLLER_HOST1 -export GLANCE_HOST=$CONTROLLER_HOST1 -export NEUTRON_HOST=$CONTROLLER_HOST1 -export NOVA_HOST=$CONTROLLER_HOST1 -EOF - cat ~/overcloudrc >>/tmp/cloudify/admin-openrc.sh - source ~/overcloudrc - export OS_REGION_NAME=$(openstack endpoint list | awk "/ nova / { print \$4 }") - # sed command below is a workaound for a bug - region shows up twice for some reason - cat <>/tmp/cloudify/admin-openrc.sh -export OS_REGION_NAME=$OS_REGION_NAME -EOF -fi -source /tmp/cloudify/admin-openrc.sh -} - -function get_external_net () { - network_ids=($(neutron net-list|grep -v "+"|grep -v name|awk '{print $2}')) - for id in ${network_ids[@]}; do - [[ $(neutron net-show ${id}|grep 'router:external'|grep -i "true") != "" ]] && ext_net_id=${id} - done - if [[ $ext_net_id ]]; then - EXTERNAL_NETWORK_NAME=$(openstack network show $ext_net_id | awk "/ name / { print \$4 }") - EXTERNAL_SUBNET_ID=$(openstack network show $EXTERNAL_NETWORK_NAME | awk "/ subnets / { print \$4 }") - else - echo "$0: External network not found" - exit 1 - fi -} - -dist=`grep DISTRIB_ID /etc/*-release | awk -F '=' '{print $2}'` -if [ "$2" == "1" ]; then - echo "$0: Copy this script to /tmp/cloudify" - mkdir /tmp/cloudify - cp $0 /tmp/cloudify/. - chmod 755 /tmp/cloudify/*.sh - - echo "$0: Setup admin-openrc.sh" - setenv - echo "$0: Setup container" - if [ "$dist" == "Ubuntu" ]; then - # xenial is needed for python 3.5 - sudo docker pull ubuntu:xenial - sudo service docker start -# sudo docker run -it -v ~/git/joid/ci/cloud/admin-openrc.sh:/root/admin-openrc.sh -v ~/cloudify/cloudify-setup.sh:/root/cloudify-setup.sh ubuntu:xenial /bin/bash - sudo docker run -it -d -v /tmp/cloudify/:/tmp/cloudify ubuntu:xenial /bin/bash - exit 0 - else - # Centos - echo "Centos-based install" - sudo tee /etc/yum.repos.d/docker.repo <<-'EOF' -[dockerrepo] -name=Docker Repository -baseurl=https://yum.dockerproject.org/repo/main/centos/7/ -enabled=1 -gpgcheck=1 -gpgkey=https://yum.dockerproject.org/gpg -EOF - sudo yum install -y docker-engine - # xenial is needed for python 3.5 - sudo docker pull ubuntu:xenial - sudo service docker start -# sudo docker run -it -v ~/git/joid/ci/cloud/admin-openrc.sh:/root/admin-openrc.sh -v ~/cloudify/cloudify-setup.sh:/root/cloudify-setup.sh ubuntu:xenial /bin/bash - sudo docker run -i -t -d -v /tmp/cloudify/:/tmp/cloudify ubuntu:xenial /bin/bash - exit 0 - fi -else - if [ "$2" == "2" ]; then - echo "$0: Install dependencies - OS specific" - if [ "$dist" == "Ubuntu" ]; then - apt-get update - apt-get install -y python - apt-get install -y python-dev - apt-get install -y python-pip - apt-get install -y wget - apt-get install -y openssh-server - apt-get install -y git -# apt-get install -y apg git gcc python-dev libxml2 libxslt1-dev libzip-dev -# pip install --upgrade pip virtualenv setuptools pbr tox - fi - else - echo "usage: bash cloudify-setup.sh [ 1 || 2 ]" - echo "1: Initial setup of the docker container" - echo "2: Setup of the Cloudify Manager in the docker container" - exit 1 - fi -fi - -cd ~ - -echo "$0: Install dependencies - generic" -pip install --upgrade pip virtualenv - -echo "$0: Upgrage pip again - needs to be the latest version due to errors found in earlier testing" -pip install --upgrade pip - -echo "$0: install python-openstackclient python-glanceclient" -pip install --upgrade python-openstackclient python-glanceclient python-neutronclient - -echo "$0: cleanup any previous install attempt" -if [ -d "~/cloudify" ]; then rm -rf ~/cloudify; fi -if [ -d "~/cloudify-manager" ]; then rm -rf ~/cloudify-manager; fi -rm ~/get-cloudify.py - -echo "$0: Create virtualenv" -virtualenv ~/cloudify/venv -source ~/cloudify/venv/bin/activate - -echo "$0: Get Cloudify" -wget http://gigaspaces-repository-eu.s3.amazonaws.com/org/cloudify3/get-cloudify.py -python get-cloudify.py --upgrade - -echo "$0: Initialize Cloudify" -cfy init - -echo "$0: Setup admin-openrc.sh" -source /tmp/cloudify/admin-openrc.sh - -if [ "$1" == "cloudify-manager" ]; then - echo "$0: Prepare the Cloudify Manager prerequisites and data" - mkdir -p ~/cloudify-manager - cd ~/cloudify-manager - wget https://github.com/cloudify-cosmo/cloudify-manager-blueprints/archive/3.4.tar.gz - mv 3.4.tar.gz cloudify-manager-blueprints.tar.gz - tar -xzvf cloudify-manager-blueprints.tar.gz - cd cloudify-manager-blueprints-3.4 - - echo "$0: Setup keystone_username" - sed -i -- "s/keystone_username: ''/keystone_username: '$OS_USERNAME'/g" openstack-manager-blueprint-inputs.yaml - - echo "$0: Setup keystone_password" - sed -i -- "s/keystone_password: ''/keystone_password: '$OS_PASSWORD'/g" openstack-manager-blueprint-inputs.yaml - - echo "$0: Setup keystone_tenant_name" - sed -i -- "s/keystone_tenant_name: ''/keystone_tenant_name: '$OS_TENANT_NAME'/g" openstack-manager-blueprint-inputs.yaml - - echo "$0: Setup keystone_url" - # Use ~ instead of / as regex delimeter, since this variable contains slashes - sed -i -- "s~keystone_url: ''~keystone_url: '$OS_AUTH_URL'~g" openstack-manager-blueprint-inputs.yaml - - echo "$0: Setup region" - sed -i -- "s/region: ''/region: '$OS_REGION_NAME'/g" openstack-manager-blueprint-inputs.yaml - - echo "$0: Setup manager_public_key_name" - sed -i -- "s/#manager_public_key_name: ''/manager_public_key_name: 'cloudify-manager'/g" openstack-manager-blueprint-inputs.yaml - - echo "$0: Setup agent_public_key_name" - sed -i -- "s/#agent_public_key_name: ''/agent_public_key_name: 'cloudify-agent'/g" openstack-manager-blueprint-inputs.yaml - - echo "$0: Setup image_id" - # CentOS-7-x86_64-GenericCloud.qcow2 failed to be routable (?), so changed to 1607 version - image=$(openstack image list | awk "/ CentOS-7-x86_64-GenericCloud-1607 / { print \$2 }") - if [ -z $image ]; then - glance --os-image-api-version 1 image-create --name CentOS-7-x86_64-GenericCloud-1607 --disk-format qcow2 --location http://cloud.centos.org/centos/7/images/CentOS-7-x86_64-GenericCloud-1607.qcow2 --container-format bare - fi - image=$(openstack image list | awk "/ CentOS-7-x86_64-GenericCloud-1607 / { print \$2 }") - sed -i -- "s/image_id: ''/image_id: '$image'/g" openstack-manager-blueprint-inputs.yaml - - echo "$0: Setup flavor_id" - flavor=$(nova flavor-show m1.large | awk "/ id / { print \$4 }") - sed -i -- "s/flavor_id: ''/flavor_id: '$flavor'/g" openstack-manager-blueprint-inputs.yaml - - echo "$0: Setup external_network_name" - get_external_net - sed -i -- "s/external_network_name: ''/external_network_name: '$EXTERNAL_NETWORK_NAME'/g" openstack-manager-blueprint-inputs.yaml - - # 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 - echo "$0: Add nameservers" - sed -i -- "s/#management_subnet_dns_nameservers: \[\]/management_subnet_dns_nameservers: \[8.8.8.8\]/g" openstack-manager-blueprint-inputs.yaml - - echo "$0: Bootstrap the manager" - cfy bootstrap --install-plugins --keep-up-on-failure --task-retries=10 -p openstack-manager-blueprint.yaml -i openstack-manager-blueprint-inputs.yaml - - echo "$0: install needed packages to support blueprints 'not using managed plugins'" - # See https://cloudifysource.atlassian.net/browse/CFY-5050 - cfy ssh -c "sudo yum install -y gcc gcc-c++ python-devel" -else - echo "$0: Prepare the Cloudify CLI prerequisites and data" - cd /tmp/cloudify - git clone https://github.com/cloudify-cosmo/cloudify-openstack-plugin.git - cd cloudify-openstack-plugin - - echo "Create management network" - if [ $(neutron net-list | awk "/ cloudify_mgmt / { print \$2 }") ]; then - echo "$0: cloudify_mgmt network exists" - else - neutron net-create cloudify_mgmt - echo "$0: Create management subnet" - 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 - fi - - echo "$0: Create router for cloudify_mgmt network" - neutron router-create cloudify_mgmt_router - - echo "$0: Create router gateway for cloudify_mgmt network" - neutron router-gateway-set cloudify_mgmt_router $EXTERNAL_NETWORK_NAME - - echo "$0: Add router interface for cloudify_mgmt network" - neutron router-interface-add cloudify_mgmt_router subnet=cloudify_mgmt - - echo "$0: Patch plugin.yaml to reference management network" - sed -i -- "s/management_network_name:\n default: ''/management_network_name:\n default: 'cloudify_mgmt'/" /tmp/cloudify/cloudify-openstack-plugin/plugin.yaml - - python setup.py build - python setup.py install -fi +#!/bin/bash +# Copyright 2016 AT&T Intellectual Property, Inc +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. +# +# What this is: Setup script for the Cloudify Manager starting from an +# Unbuntu Xenial docker container. +# +# Status: this is a work in progress, under test. +# +# How to use: +# $ bash cloudify-setup.sh [cloudify-cli|cloudify-manager] [ 1 || 2 ] +# cloudify-cli: use Cloudify CLI +# cloudify-manager: use Cloudify Manager +# 1: Initial setup of the docker container +# 2: Setup of the Cloudify Manager in the docker container + +function setenv () { +if [ "$dist" == "Ubuntu" ]; then + echo "$0: Ubuntu-based install" + echo "$0: Create the environment file" + KEYSTONE_HOST=$(juju status --format=short | awk "/keystone\/0/ { print \$3 }") + cat </tmp/cloudify/admin-openrc.sh +export CONGRESS_HOST=$(juju status --format=short | awk "/openstack-dashboard/ { print \$3 }") +export HORIZON_HOST=$(juju status --format=short | awk "/openstack-dashboard/ { print \$3 }") +export KEYSTONE_HOST=$KEYSTONE_HOST +export CEILOMETER_HOST=$(juju status --format=short | awk "/ceilometer\/0/ { print \$3 }") +export CINDER_HOST=$(juju status --format=short | awk "/cinder\/0/ { print \$3 }") +export GLANCE_HOST=$(juju status --format=short | awk "/glance\/0/ { print \$3 }") +export NEUTRON_HOST=$(juju status --format=short | awk "/neutron-api\/0/ { print \$3 }") +export NOVA_HOST=$(juju status --format=short | awk "/nova-cloud-controller\/0/ { print \$3 }") +export OS_USERNAME=admin +export OS_PASSWORD=openstack +export OS_TENANT_NAME=admin +export OS_AUTH_URL=http://$KEYSTONE_HOST:5000/v2.0 +export OS_REGION_NAME=RegionOne +EOF +else + # Centos + echo "$0: Centos-based install" + echo "$0: Setup undercloud environment so we can get overcloud Controller server address" + source ~/stackrc + echo "$0: Get address of Controller node" + export CONTROLLER_HOST1=$(openstack server list | awk "/overcloud-controller-0/ { print \$8 }" | sed 's/ctlplane=//g') + echo "$0: Create the environment file" + cat </tmp/cloudify/admin-openrc.sh +export CONGRESS_HOST=$CONTROLLER_HOST1 +export KEYSTONE_HOST=$CONTROLLER_HOST1 +export CEILOMETER_HOST=$CONTROLLER_HOST1 +export CINDER_HOST=$CONTROLLER_HOST1 +export GLANCE_HOST=$CONTROLLER_HOST1 +export NEUTRON_HOST=$CONTROLLER_HOST1 +export NOVA_HOST=$CONTROLLER_HOST1 +EOF + cat ~/overcloudrc >>/tmp/cloudify/admin-openrc.sh + source ~/overcloudrc + export OS_REGION_NAME=$(openstack endpoint list | awk "/ nova / { print \$4 }") + # sed command below is a workaound for a bug - region shows up twice for some reason + cat <>/tmp/cloudify/admin-openrc.sh +export OS_REGION_NAME=$OS_REGION_NAME +EOF +fi +source /tmp/cloudify/admin-openrc.sh +} + +function get_external_net () { + network_ids=($(neutron net-list|grep -v "+"|grep -v name|awk '{print $2}')) + for id in ${network_ids[@]}; do + [[ $(neutron net-show ${id}|grep 'router:external'|grep -i "true") != "" ]] && ext_net_id=${id} + done + if [[ $ext_net_id ]]; then + EXTERNAL_NETWORK_NAME=$(openstack network show $ext_net_id | awk "/ name / { print \$4 }") + EXTERNAL_SUBNET_ID=$(openstack network show $EXTERNAL_NETWORK_NAME | awk "/ subnets / { print \$4 }") + else + echo "$0: External network not found" + exit 1 + fi +} + +dist=`grep DISTRIB_ID /etc/*-release | awk -F '=' '{print $2}'` +if [ "$2" == "1" ]; then + echo "$0: Copy this script to /tmp/cloudify" + mkdir /tmp/cloudify + cp $0 /tmp/cloudify/. + chmod 755 /tmp/cloudify/*.sh + + echo "$0: Setup admin-openrc.sh" + setenv + echo "$0: Setup container" + if [ "$dist" == "Ubuntu" ]; then + # xenial is needed for python 3.5 + sudo docker pull ubuntu:xenial + sudo service docker start +# sudo docker run -it -v ~/git/joid/ci/cloud/admin-openrc.sh:/root/admin-openrc.sh -v ~/cloudify/cloudify-setup.sh:/root/cloudify-setup.sh ubuntu:xenial /bin/bash + sudo docker run -it -d -v /tmp/cloudify/:/tmp/cloudify ubuntu:xenial /bin/bash + exit 0 + else + # Centos + echo "Centos-based install" + sudo tee /etc/yum.repos.d/docker.repo <<-'EOF' +[dockerrepo] +name=Docker Repository +baseurl=https://yum.dockerproject.org/repo/main/centos/7/ +enabled=1 +gpgcheck=1 +gpgkey=https://yum.dockerproject.org/gpg +EOF + sudo yum install -y docker-engine + # xenial is needed for python 3.5 + sudo docker pull ubuntu:xenial + sudo service docker start +# sudo docker run -it -v ~/git/joid/ci/cloud/admin-openrc.sh:/root/admin-openrc.sh -v ~/cloudify/cloudify-setup.sh:/root/cloudify-setup.sh ubuntu:xenial /bin/bash + sudo docker run -i -t -d -v /tmp/cloudify/:/tmp/cloudify ubuntu:xenial /bin/bash + exit 0 + fi +else + if [ "$2" == "2" ]; then + echo "$0: Install dependencies - OS specific" + if [ "$dist" == "Ubuntu" ]; then + apt-get update + apt-get install -y python + apt-get install -y python-dev + apt-get install -y python-pip + apt-get install -y wget + apt-get install -y openssh-server + apt-get install -y git +# apt-get install -y apg git gcc python-dev libxml2 libxslt1-dev libzip-dev +# pip install --upgrade pip virtualenv setuptools pbr tox + fi + else + echo "usage: bash cloudify-setup.sh [ 1 || 2 ]" + echo "1: Initial setup of the docker container" + echo "2: Setup of the Cloudify Manager in the docker container" + exit 1 + fi +fi + +cd ~ + +echo "$0: Install dependencies - generic" +pip install --upgrade pip virtualenv + +echo "$0: Upgrage pip again - needs to be the latest version due to errors found in earlier testing" +pip install --upgrade pip + +echo "$0: install python-openstackclient python-glanceclient" +pip install --upgrade python-openstackclient python-glanceclient python-neutronclient + +echo "$0: cleanup any previous install attempt" +if [ -d "~/cloudify" ]; then rm -rf ~/cloudify; fi +if [ -d "~/cloudify-manager" ]; then rm -rf ~/cloudify-manager; fi +rm ~/get-cloudify.py + +echo "$0: Create virtualenv" +virtualenv ~/cloudify/venv +source ~/cloudify/venv/bin/activate + +echo "$0: Get Cloudify" +wget http://gigaspaces-repository-eu.s3.amazonaws.com/org/cloudify3/get-cloudify.py +python get-cloudify.py --upgrade + +echo "$0: Initialize Cloudify" +cfy init + +echo "$0: Setup admin-openrc.sh" +source /tmp/cloudify/admin-openrc.sh + +if [ "$1" == "cloudify-manager" ]; then + echo "$0: Prepare the Cloudify Manager prerequisites and data" + mkdir -p ~/cloudify-manager + cd ~/cloudify-manager + wget https://github.com/cloudify-cosmo/cloudify-manager-blueprints/archive/3.4.tar.gz + mv 3.4.tar.gz cloudify-manager-blueprints.tar.gz + tar -xzvf cloudify-manager-blueprints.tar.gz + cd cloudify-manager-blueprints-3.4 + + echo "$0: Setup keystone_username" + sed -i -- "s/keystone_username: ''/keystone_username: '$OS_USERNAME'/g" openstack-manager-blueprint-inputs.yaml + + echo "$0: Setup keystone_password" + sed -i -- "s/keystone_password: ''/keystone_password: '$OS_PASSWORD'/g" openstack-manager-blueprint-inputs.yaml + + echo "$0: Setup keystone_tenant_name" + sed -i -- "s/keystone_tenant_name: ''/keystone_tenant_name: '$OS_TENANT_NAME'/g" openstack-manager-blueprint-inputs.yaml + + echo "$0: Setup keystone_url" + # Use ~ instead of / as regex delimeter, since this variable contains slashes + sed -i -- "s~keystone_url: ''~keystone_url: '$OS_AUTH_URL'~g" openstack-manager-blueprint-inputs.yaml + + echo "$0: Setup region" + sed -i -- "s/region: ''/region: '$OS_REGION_NAME'/g" openstack-manager-blueprint-inputs.yaml + + echo "$0: Setup manager_public_key_name" + sed -i -- "s/#manager_public_key_name: ''/manager_public_key_name: 'cloudify-manager'/g" openstack-manager-blueprint-inputs.yaml + + echo "$0: Setup agent_public_key_name" + sed -i -- "s/#agent_public_key_name: ''/agent_public_key_name: 'cloudify-agent'/g" openstack-manager-blueprint-inputs.yaml + + echo "$0: Setup image_id" + # CentOS-7-x86_64-GenericCloud.qcow2 failed to be routable (?), so changed to 1607 version + image=$(openstack image list | awk "/ CentOS-7-x86_64-GenericCloud-1607 / { print \$2 }") + if [ -z $image ]; then + glance --os-image-api-version 1 image-create --name CentOS-7-x86_64-GenericCloud-1607 --disk-format qcow2 --location http://cloud.centos.org/centos/7/images/CentOS-7-x86_64-GenericCloud-1607.qcow2 --container-format bare + fi + image=$(openstack image list | awk "/ CentOS-7-x86_64-GenericCloud-1607 / { print \$2 }") + sed -i -- "s/image_id: ''/image_id: '$image'/g" openstack-manager-blueprint-inputs.yaml + + echo "$0: Setup flavor_id" + flavor=$(nova flavor-show m1.large | awk "/ id / { print \$4 }") + sed -i -- "s/flavor_id: ''/flavor_id: '$flavor'/g" openstack-manager-blueprint-inputs.yaml + + echo "$0: Setup external_network_name" + get_external_net + sed -i -- "s/external_network_name: ''/external_network_name: '$EXTERNAL_NETWORK_NAME'/g" openstack-manager-blueprint-inputs.yaml + + # 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 + echo "$0: Add nameservers" + sed -i -- "s/#management_subnet_dns_nameservers: \[\]/management_subnet_dns_nameservers: \[8.8.8.8\]/g" openstack-manager-blueprint-inputs.yaml + + echo "$0: Bootstrap the manager" + cfy bootstrap --install-plugins --keep-up-on-failure --task-retries=10 -p openstack-manager-blueprint.yaml -i openstack-manager-blueprint-inputs.yaml + + echo "$0: install needed packages to support blueprints 'not using managed plugins'" + # See https://cloudifysource.atlassian.net/browse/CFY-5050 + cfy ssh -c "sudo yum install -y gcc gcc-c++ python-devel" +else + echo "$0: Prepare the Cloudify CLI prerequisites and data" + cd /tmp/cloudify + git clone https://github.com/cloudify-cosmo/cloudify-openstack-plugin.git + cd cloudify-openstack-plugin + + echo "Create management network" + if [ $(neutron net-list | awk "/ cloudify_mgmt / { print \$2 }") ]; then + echo "$0: cloudify_mgmt network exists" + else + neutron net-create cloudify_mgmt + echo "$0: Create management subnet" + 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 + fi + + echo "$0: Create router for cloudify_mgmt network" + neutron router-create cloudify_mgmt_router + + echo "$0: Create router gateway for cloudify_mgmt network" + neutron router-gateway-set cloudify_mgmt_router $EXTERNAL_NETWORK_NAME + + echo "$0: Add router interface for cloudify_mgmt network" + neutron router-interface-add cloudify_mgmt_router subnet=cloudify_mgmt + + echo "$0: Patch plugin.yaml to reference management network" + sed -i -- "s/management_network_name:\n default: ''/management_network_name:\n default: 'cloudify_mgmt'/" /tmp/cloudify/cloudify-openstack-plugin/plugin.yaml + + python setup.py build + python setup.py install +fi diff --git a/tests/vHello.sh b/tests/vHello.sh index 4b49f41..c9bc995 100644 --- a/tests/vHello.sh +++ b/tests/vHello.sh @@ -1,243 +1,243 @@ -#!/bin/bash -# Copyright 2016 AT&T Intellectual Property, Inc -# -# Licensed under the Apache License, Version 2.0 (the "License"); -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. -# -# What this is: Deployment test for the Cloudify Hello World blueprint. -# -# Status: this is a work in progress, under test. -# -# How to use: -# $ wget https://git.opnfv.org/cgit/models/plain/tests/vHello.sh -# $ bash vHello.sh [cloudify-cli|cloudify-manager] [setup|start|clean] -# cloudify-cli: use Cloudify CLI -# cloudify-manager: use Cloudify Manager -# setup: setup test environment -# start: run test -# clean: cleanup after test - -set -x - -pass() { - echo "Hooray!" - set +x #echo off - exit 0 -} - -# Use this to trigger fail() at the right places -# if [ "$RESULT" == "Test Failed!" ]; then fail; fi -fail() { - echo "Test Failed!" - set +x - exit 1 -} - -function get_floating_net () { - network_ids=($(neutron net-list|grep -v "+"|grep -v name|awk '{print $2}')) - for id in ${network_ids[@]}; do - [[ $(neutron net-show ${id}|grep 'router:external'|grep -i "true") != "" ]] && floating_network_id=${id} - done - if [[ $floating_network_id ]]; then - floating_network_name=$(openstack network show $floating_network_id | awk "/ name / { print \$4 }") - else - echo "vHello.sh: Floating network not found" - exit 1 - fi -} - -select_manager() { - echo "vHello.sh: select manager to use" - MANAGER_IP=$(openstack server list | awk "/ cloudify-manager-server / { print \$9 }") - cfy use -t $MANAGER_IP - if [ $? -eq 1 ]; then fail; fi -} - -start() { - echo "vHello.sh: reset blueprints folder" - if [[ -d /tmp/cloudify/blueprints ]]; then rm -rf /tmp/cloudify/blueprints; fi - mkdir -p /tmp/cloudify/blueprints - cd /tmp/cloudify/blueprints - - echo "vHello.sh: clone cloudify-hello-world-example" - git clone https://github.com/cloudify-cosmo/cloudify-hello-world-example.git - cd cloudify-hello-world-example - git checkout 3.4.1-build - - echo "vHello.sh: setup OpenStack CLI environment" - source /tmp/cloudify/admin-openrc.sh - - echo "vHello.sh: Setup image_id" -# image=$(openstack image list | awk "/ CentOS-7-x86_64-GenericCloud-1607 / { print \$2 }") - image=$(openstack image list | awk "/ xenial-server / { print \$2 }") - if [ -z $image ]; then -# glance --os-image-api-version 1 image-create --name CentOS-7-x86_64-GenericCloud-1607 --disk-format qcow2 --location http://cloud.centos.org/centos/7/images/CentOS-7-x86_64-GenericCloud-1607.qcow2 --container-format bare - glance --os-image-api-version 1 image-create --name xenial-server --disk-format qcow2 --location http://cloud-images.ubuntu.com/xenial/current/xenial-server-cloudimg-amd64-disk1.img - fi -# image=$(openstack image list | awk "/ CentOS-7-x86_64-GenericCloud-1607 / { print \$2 }") - image=$(openstack image list | awk "/ xenial-server / { print \$2 }") - - echo "vHello.sh: create blueprint inputs file" - # Set host image per Cloudify agent compatibility: http://docs.getcloudify.org/3.4.0/agents/overview/ - cd /tmp/cloudify/blueprints - cat <vHello-inputs.yaml -image: xenial-server -flavor: m1.small -agent_user: ubuntu -webserver_port: 8080 -EOF - - if [[ "$1" == "cloudify-cli" ]]; then - # Workarounds for error in allocating floating IP - # Workflow failed: Task failed 'neutron_plugin.floatingip.create' -> Failed to parse request. Required attribute 'floating_network_id' not specified [status_code=400] - get_floating_net - - echo "vHello.sh: update blueprint with parameters needed for Cloudify CLI use" - cat <>vHello-inputs.yaml -external_network_name: $floating_network_name -EOF - - sed -i -- 's/description: Openstack flavor name or id to use for the new server/description: Openstack flavor name or id to use for the new server\n external_network_name:\n description: External network name/g' cloudify-hello-world-example/blueprint.yaml - - sed -i -- 's/type: cloudify.openstack.nodes.FloatingIP/type: cloudify.openstack.nodes.FloatingIP\n properties:\n floatingip:\n floating_network_name: { get_input: external_network_name }/g' cloudify-hello-world-example/blueprint.yaml - - echo "vHello.sh: Create Nova key pair" - mkdir -p ~/.ssh - nova keypair-delete vHello - nova keypair-add vHello > ~/.ssh/vHello.pem - chmod 600 ~/.ssh/vHello.pem - -# Workarounds for error in allocating keypair -# Task failed 'nova_plugin.server.create' -> server must have a keypair, yet no keypair was connected to the server node, the "key_name" nested property wasn't used, and there is no agent keypair in the provider context -# Tried the following but keypair is not supported by http://www.getcloudify.org/spec/openstack-plugin/1.4/plugin.yaml -# sed -i -- 's/target: security_group/target: security_group\n - type: cloudify.openstack.server_connected_to_keypair\n target: keypair/g' cloudify-hello-world-example/blueprint.yaml -# sed -i -- 's/description: External network name/description: External network name\n private_key_path:\n description: Path to private key/g' cloudify-hello-world-example/blueprint.yaml -# sed -i -- '0,/interfaces:/s//interfaces:\n cloudify.interfaces.lifecycle:\n start:\n implementation: openstack.nova_plugin.server.start\n inputs:\n private_key_path: { get_input: private_key_path }/' cloudify-hello-world-example/blueprint.yaml - -# 'key_name' is a subproperty of 'server' per test-start-operation-retry-blueprint.yaml in the cloudify-openstack-plugin repo - sed -i -- 's/description: External network name/description: External network name\n key_name:\n description: Name of private key/g' cloudify-hello-world-example/blueprint.yaml - - sed -i -- 's/flavor: { get_input: flavor }/flavor: { get_input: flavor }\n server:\n key_name: { get_input: key_name }/' cloudify-hello-world-example/blueprint.yaml - - echo "vHello.sh: update blueprint with parameters needed for Cloudify CLI use" - #private_key_path: /root/.ssh/vHello.pem - cat <>vHello-inputs.yaml -key_name: vHello -EOF - - echo "vHello.sh: disable cloudify agent install in blueprint" - sed -i -- ':a;N;$!ba;s/ agent_user:\n description: User name used when SSH-ing into the started machine\n//g' cloudify-hello-world-example/blueprint.yaml - sed -i -- ':a;N;$!ba;s/agent_config:\n user: { get_input: agent_user }/install_agent: false/' cloudify-hello-world-example/blueprint.yaml - sed -i -- ':a;N;$!ba;s/agent_user: centos\n//' vHello-inputs.yaml - fi - - echo "vHello.sh: activate cloudify Virtualenv" - source ~/cloudify/venv/bin/activate - - echo "vHello.sh: initialize cloudify environment" - cd /tmp/cloudify/blueprints - cfy init -r - - if [[ "$1" == "cloudify-manager" ]]; then - select_manager - echo "vHello.sh: upload blueprint via manager" - cfy blueprints delete -b cloudify-hello-world-example - cfy blueprints upload -p cloudify-hello-world-example/blueprint.yaml -b cloudify-hello-world-example - if [ $? -eq 1 ]; then fail; fi - - echo "vHello.sh: create vHello deployment via manager" - cfy deployments create --debug -d vHello -i vHello-inputs.yaml -b cloudify-hello-world-example - if [ $? -eq 1 ]; then fail; fi - - echo "vHello.sh: execute 'install' workflow for vHello deployment via manager" - cfy executions start -w install -d vHello --timeout 1800 - if [ $? -eq 1 ]; then fail; fi - - echo "vHello.sh: get vHello server address" - SERVER_URL=$(cfy deployments outputs -d vHello | awk "/ Value: / { print \$2 }") - else - echo "vHello.sh: install local blueprint" - cfy local install --install-plugins -i vHello-inputs.yaml -p cloudify-hello-world-example/blueprint.yaml --allow-custom-parameters --parameters="floating_network_name=$floating_network_name" --task-retries=10 --task-retry-interval=30 - if [ $? -eq 1 ]; then fail; fi -# cfy local install replaces the following, per http://getcloudify.org/2016/04/07/cloudify-update-from-developers-features-improvements-open-source-python-devops.html -# cfy local init --install-plugins -i vHello-inputs.yaml -p cloudify-hello-world-example/blueprint.yaml -# cfy local execute -w install -# Not sure if needed -# cfy local create-requirements -p cloudify-hello-world-example/blueprint.yaml -# if [ $? -eq 1 ]; then fail; fi - - echo "vHello.sh: get vHello server address" - SERVER_URL=$(cfy local outputs | awk "/http_endpoint/ { print \$2 }") - fi - - echo "vHello.sh: verify vHello server is running" - apt-get install -y curl - if [[ $(curl $SERVER_URL | grep -c "Hello, World!") != 1 ]]; then fail; fi - - pass -} - -clean() { - echo "vHello.sh: activate cloudify Virtualenv" - source ~/cloudify/venv/bin/activate - - echo "vHello.sh: setup OpenStack CLI environment" - source /tmp/cloudify/admin-openrc.sh - - echo "vHello.sh: initialize cloudify environment" - cd /tmp/cloudify/blueprints - - if [[ "$1" == "cloudify-manager" ]]; then - select_manager - echo "vHello.sh: uninstall vHello blueprint via manager" - cfy executions start -w uninstall -d vHello - if [ $? -eq 1 ]; then fail; fi - - echo "vHello.sh: delete vHello blueprint" - cfy deployments delete -d vHello - if [ $? -eq 1 ]; then fail; fi - else - echo "vHello.sh: uninstall vHello blueprint via CLI" - cfy local uninstall - if [ $? -eq 1 ]; then fail; fi - fi - pass -} - -if [[ "$2" == "setup" ]]; then - echo "vHello.sh: Setup temp test folder /tmp/cloudify and copy this script there" - mkdir /tmp/cloudify - chmod 777 /tmp/cloudify/ - cp $0 /tmp/cloudify/. - chmod 755 /tmp/cloudify/*.sh - - echo "vHello.sh: cloudify-setup part 1" - bash utils/cloudify-setup.sh $1 1 - - echo "vHello.sh: cloudify-setup part 2" - CONTAINER=$(sudo docker ps -l | awk "/ ubuntu:xenial / { print \$1 }") - sudo docker exec $CONTAINER /tmp/cloudify/cloudify-setup.sh $1 2 - if [ $? -eq 1 ]; then fail; fi - pass -else - if [[ $# -eq 3 ]]; then - # running inside the cloudify container, ready to go - if [[ "$3" == "start" ]]; then start $1; fi - if [[ "$3" == "clean" ]]; then clean $1; fi - else - echo "vHello.sh: pass $2 command to vHello.sh in cloudify container" - CONTAINER=$(sudo docker ps -l | awk "/ ubuntu:xenial / { print \$1 }") - sudo docker exec $CONTAINER /tmp/cloudify/vHello.sh $1 $2 $2 - if [ $? -eq 1 ]; then fail; fi - pass - fi -fi +#!/bin/bash +# Copyright 2016 AT&T Intellectual Property, Inc +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. +# +# What this is: Deployment test for the Cloudify Hello World blueprint. +# +# Status: this is a work in progress, under test. +# +# How to use: +# $ wget https://git.opnfv.org/cgit/models/plain/tests/vHello.sh +# $ bash vHello.sh [cloudify-cli|cloudify-manager] [setup|start|clean] +# cloudify-cli: use Cloudify CLI +# cloudify-manager: use Cloudify Manager +# setup: setup test environment +# start: run test +# clean: cleanup after test + +set -x + +pass() { + echo "Hooray!" + set +x #echo off + exit 0 +} + +# Use this to trigger fail() at the right places +# if [ "$RESULT" == "Test Failed!" ]; then fail; fi +fail() { + echo "Test Failed!" + set +x + exit 1 +} + +function get_floating_net () { + network_ids=($(neutron net-list|grep -v "+"|grep -v name|awk '{print $2}')) + for id in ${network_ids[@]}; do + [[ $(neutron net-show ${id}|grep 'router:external'|grep -i "true") != "" ]] && floating_network_id=${id} + done + if [[ $floating_network_id ]]; then + floating_network_name=$(openstack network show $floating_network_id | awk "/ name / { print \$4 }") + else + echo "vHello.sh: Floating network not found" + exit 1 + fi +} + +select_manager() { + echo "vHello.sh: select manager to use" + MANAGER_IP=$(openstack server list | awk "/ cloudify-manager-server / { print \$9 }") + cfy use -t $MANAGER_IP + if [ $? -eq 1 ]; then fail; fi +} + +start() { + echo "vHello.sh: reset blueprints folder" + if [[ -d /tmp/cloudify/blueprints ]]; then rm -rf /tmp/cloudify/blueprints; fi + mkdir -p /tmp/cloudify/blueprints + cd /tmp/cloudify/blueprints + + echo "vHello.sh: clone cloudify-hello-world-example" + git clone https://github.com/cloudify-cosmo/cloudify-hello-world-example.git + cd cloudify-hello-world-example + git checkout 3.4.1-build + + echo "vHello.sh: setup OpenStack CLI environment" + source /tmp/cloudify/admin-openrc.sh + + echo "vHello.sh: Setup image_id" +# image=$(openstack image list | awk "/ CentOS-7-x86_64-GenericCloud-1607 / { print \$2 }") + image=$(openstack image list | awk "/ xenial-server / { print \$2 }") + if [ -z $image ]; then +# glance --os-image-api-version 1 image-create --name CentOS-7-x86_64-GenericCloud-1607 --disk-format qcow2 --location http://cloud.centos.org/centos/7/images/CentOS-7-x86_64-GenericCloud-1607.qcow2 --container-format bare + glance --os-image-api-version 1 image-create --name xenial-server --disk-format qcow2 --location http://cloud-images.ubuntu.com/xenial/current/xenial-server-cloudimg-amd64-disk1.img + fi +# image=$(openstack image list | awk "/ CentOS-7-x86_64-GenericCloud-1607 / { print \$2 }") + image=$(openstack image list | awk "/ xenial-server / { print \$2 }") + + echo "vHello.sh: create blueprint inputs file" + # Set host image per Cloudify agent compatibility: http://docs.getcloudify.org/3.4.0/agents/overview/ + cd /tmp/cloudify/blueprints + cat <vHello-inputs.yaml +image: xenial-server +flavor: m1.small +agent_user: ubuntu +webserver_port: 8080 +EOF + + if [[ "$1" == "cloudify-cli" ]]; then + # Workarounds for error in allocating floating IP + # Workflow failed: Task failed 'neutron_plugin.floatingip.create' -> Failed to parse request. Required attribute 'floating_network_id' not specified [status_code=400] + get_floating_net + + echo "vHello.sh: update blueprint with parameters needed for Cloudify CLI use" + cat <>vHello-inputs.yaml +external_network_name: $floating_network_name +EOF + + sed -i -- 's/description: Openstack flavor name or id to use for the new server/description: Openstack flavor name or id to use for the new server\n external_network_name:\n description: External network name/g' cloudify-hello-world-example/blueprint.yaml + + sed -i -- 's/type: cloudify.openstack.nodes.FloatingIP/type: cloudify.openstack.nodes.FloatingIP\n properties:\n floatingip:\n floating_network_name: { get_input: external_network_name }/g' cloudify-hello-world-example/blueprint.yaml + + echo "vHello.sh: Create Nova key pair" + mkdir -p ~/.ssh + nova keypair-delete vHello + nova keypair-add vHello > ~/.ssh/vHello.pem + chmod 600 ~/.ssh/vHello.pem + +# Workarounds for error in allocating keypair +# Task failed 'nova_plugin.server.create' -> server must have a keypair, yet no keypair was connected to the server node, the "key_name" nested property wasn't used, and there is no agent keypair in the provider context +# Tried the following but keypair is not supported by http://www.getcloudify.org/spec/openstack-plugin/1.4/plugin.yaml +# sed -i -- 's/target: security_group/target: security_group\n - type: cloudify.openstack.server_connected_to_keypair\n target: keypair/g' cloudify-hello-world-example/blueprint.yaml +# sed -i -- 's/description: External network name/description: External network name\n private_key_path:\n description: Path to private key/g' cloudify-hello-world-example/blueprint.yaml +# sed -i -- '0,/interfaces:/s//interfaces:\n cloudify.interfaces.lifecycle:\n start:\n implementation: openstack.nova_plugin.server.start\n inputs:\n private_key_path: { get_input: private_key_path }/' cloudify-hello-world-example/blueprint.yaml + +# 'key_name' is a subproperty of 'server' per test-start-operation-retry-blueprint.yaml in the cloudify-openstack-plugin repo + sed -i -- 's/description: External network name/description: External network name\n key_name:\n description: Name of private key/g' cloudify-hello-world-example/blueprint.yaml + + sed -i -- 's/flavor: { get_input: flavor }/flavor: { get_input: flavor }\n server:\n key_name: { get_input: key_name }/' cloudify-hello-world-example/blueprint.yaml + + echo "vHello.sh: update blueprint with parameters needed for Cloudify CLI use" + #private_key_path: /root/.ssh/vHello.pem + cat <>vHello-inputs.yaml +key_name: vHello +EOF + + echo "vHello.sh: disable cloudify agent install in blueprint" + sed -i -- ':a;N;$!ba;s/ agent_user:\n description: User name used when SSH-ing into the started machine\n//g' cloudify-hello-world-example/blueprint.yaml + sed -i -- ':a;N;$!ba;s/agent_config:\n user: { get_input: agent_user }/install_agent: false/' cloudify-hello-world-example/blueprint.yaml + sed -i -- ':a;N;$!ba;s/agent_user: centos\n//' vHello-inputs.yaml + fi + + echo "vHello.sh: activate cloudify Virtualenv" + source ~/cloudify/venv/bin/activate + + echo "vHello.sh: initialize cloudify environment" + cd /tmp/cloudify/blueprints + cfy init -r + + if [[ "$1" == "cloudify-manager" ]]; then + select_manager + echo "vHello.sh: upload blueprint via manager" + cfy blueprints delete -b cloudify-hello-world-example + cfy blueprints upload -p cloudify-hello-world-example/blueprint.yaml -b cloudify-hello-world-example + if [ $? -eq 1 ]; then fail; fi + + echo "vHello.sh: create vHello deployment via manager" + cfy deployments create --debug -d vHello -i vHello-inputs.yaml -b cloudify-hello-world-example + if [ $? -eq 1 ]; then fail; fi + + echo "vHello.sh: execute 'install' workflow for vHello deployment via manager" + cfy executions start -w install -d vHello --timeout 1800 + if [ $? -eq 1 ]; then fail; fi + + echo "vHello.sh: get vHello server address" + SERVER_URL=$(cfy deployments outputs -d vHello | awk "/ Value: / { print \$2 }") + else + echo "vHello.sh: install local blueprint" + cfy local install --install-plugins -i vHello-inputs.yaml -p cloudify-hello-world-example/blueprint.yaml --allow-custom-parameters --parameters="floating_network_name=$floating_network_name" --task-retries=10 --task-retry-interval=30 + if [ $? -eq 1 ]; then fail; fi +# cfy local install replaces the following, per http://getcloudify.org/2016/04/07/cloudify-update-from-developers-features-improvements-open-source-python-devops.html +# cfy local init --install-plugins -i vHello-inputs.yaml -p cloudify-hello-world-example/blueprint.yaml +# cfy local execute -w install +# Not sure if needed +# cfy local create-requirements -p cloudify-hello-world-example/blueprint.yaml +# if [ $? -eq 1 ]; then fail; fi + + echo "vHello.sh: get vHello server address" + SERVER_URL=$(cfy local outputs | awk "/http_endpoint/ { print \$2 }") + fi + + echo "vHello.sh: verify vHello server is running" + apt-get install -y curl + if [[ $(curl $SERVER_URL | grep -c "Hello, World!") != 1 ]]; then fail; fi + + pass +} + +clean() { + echo "vHello.sh: activate cloudify Virtualenv" + source ~/cloudify/venv/bin/activate + + echo "vHello.sh: setup OpenStack CLI environment" + source /tmp/cloudify/admin-openrc.sh + + echo "vHello.sh: initialize cloudify environment" + cd /tmp/cloudify/blueprints + + if [[ "$1" == "cloudify-manager" ]]; then + select_manager + echo "vHello.sh: uninstall vHello blueprint via manager" + cfy executions start -w uninstall -d vHello + if [ $? -eq 1 ]; then fail; fi + + echo "vHello.sh: delete vHello blueprint" + cfy deployments delete -d vHello + if [ $? -eq 1 ]; then fail; fi + else + echo "vHello.sh: uninstall vHello blueprint via CLI" + cfy local uninstall + if [ $? -eq 1 ]; then fail; fi + fi + pass +} + +if [[ "$2" == "setup" ]]; then + echo "vHello.sh: Setup temp test folder /tmp/cloudify and copy this script there" + mkdir /tmp/cloudify + chmod 777 /tmp/cloudify/ + cp $0 /tmp/cloudify/. + chmod 755 /tmp/cloudify/*.sh + + echo "vHello.sh: cloudify-setup part 1" + bash utils/cloudify-setup.sh $1 1 + + echo "vHello.sh: cloudify-setup part 2" + CONTAINER=$(sudo docker ps -l | awk "/ ubuntu:xenial / { print \$1 }") + sudo docker exec $CONTAINER /tmp/cloudify/cloudify-setup.sh $1 2 + if [ $? -eq 1 ]; then fail; fi + pass +else + if [[ $# -eq 3 ]]; then + # running inside the cloudify container, ready to go + if [[ "$3" == "start" ]]; then start $1; fi + if [[ "$3" == "clean" ]]; then clean $1; fi + else + echo "vHello.sh: pass $2 command to vHello.sh in cloudify container" + CONTAINER=$(sudo docker ps -l | awk "/ ubuntu:xenial / { print \$1 }") + sudo docker exec $CONTAINER /tmp/cloudify/vHello.sh $1 $2 $2 + if [ $? -eq 1 ]; then fail; fi + pass + fi +fi -- cgit 1.2.3-korg