diff options
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/utils/cloudify-setup.sh | 23 | ||||
| -rw-r--r-- | tests/vHello.sh | 4 |
2 files changed, 22 insertions, 5 deletions
diff --git a/tests/utils/cloudify-setup.sh b/tests/utils/cloudify-setup.sh index 71b0822..e5cb637 100644 --- a/tests/utils/cloudify-setup.sh +++ b/tests/utils/cloudify-setup.sh @@ -235,9 +235,10 @@ if [ "$1" == "cloudify-manager" ]; then cfy ssh -c "sudo yum install -y gcc gcc-c++ python-devel" else echo "$0: Prepare the Cloudify CLI prerequisites and data" + + echo "$0: Install Cloudify OpenStack Plugin" cd /tmp/cloudify - git clone https://github.com/cloudify-cosmo/cloudify-openstack-plugin.git - cd cloudify-openstack-plugin + git clone https://github.com/cloudify-cosmo/cloudify-openstack-plugin.git echo "Create management network" if [ $(neutron net-list | awk "/ cloudify_mgmt / { print \$2 }") ]; then @@ -258,8 +259,24 @@ else 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 + sed -i -- ":a;N;\$!ba;s/management_network_name:\n default: ''/management_network_name:\n default: 'cloudify_mgmt'/" /tmp/cloudify/cloudify-openstack-plugin/plugin.yaml + cd cloudify-openstack-plugin + python setup.py build + python setup.py install + cd .. + + echo "$0: Install Cloudify Fabric (SSH) Plugin" + git clone https://github.com/cloudify-cosmo/cloudify-fabric-plugin.git + cd cloudify-fabric-plugin + python setup.py build + python setup.py install + cd .. + + echo "$0: Install Cloudify Diamond Plugin" + git clone https://github.com/cloudify-cosmo/cloudify-diamond-plugin.git + cd cloudify-diamond-plugin python setup.py build python setup.py install + cd .. fi diff --git a/tests/vHello.sh b/tests/vHello.sh index 51c2a67..b315e0c 100644 --- a/tests/vHello.sh +++ b/tests/vHello.sh @@ -154,8 +154,8 @@ EOF SERVER_URL=$(cfy deployments outputs -d vHello | awk "/ Value: / { print \$2 }") else echo "$0: install local blueprint" -# cfy local install --install-plugins -i vHello-inputs.yaml -p cloudify-cli-hello-world-example/blueprint.yaml --allow-custom-parameters --parameters="floating_network_name=$floating_network_name" --task-retries=10 --task-retry-interval=30 - cfy local install -i vHello-inputs.yaml -p cloudify-cli-hello-world-example/blueprint.yaml --allow-custom-parameters --parameters="floating_network_name=$floating_network_name" --task-retries=10 --task-retry-interval=30 + # don't use --install-plugins, causes openstack plugin 1.4.1 to be rolled back to 1.4 and then an error + cfy local install -i vHello-inputs.yaml -p cloudify-cli-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 echo "$0: get vHello server address" |