X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=blobdiff_plain;f=ci%2Fopenstack.sh;h=a7d91fb6ea7fe99e919ee6d83dca101402663164;hb=cad8852bf819f51f2e9602b11d4fc8b723623006;hp=9c93c10c0c673f3bda22cf1405d8054ef3f7f57e;hpb=2367ad5ad0ea945bad5c08b6f28b6cc5d3f271aa;p=joid.git diff --git a/ci/openstack.sh b/ci/openstack.sh index 9c93c10c..a7d91fb6 100755 --- a/ci/openstack.sh +++ b/ci/openstack.sh @@ -1,5 +1,4 @@ #!/bin/bash -ex - ############################################################################## # All rights reserved. This program and the accompanying materials # are made available under the terms of the Apache License, Version 2.0 @@ -7,6 +6,17 @@ # http://www.apache.org/licenses/LICENSE-2.0 ############################################################################## +set -ex + +source common/tools.sh + +#./openstack.sh "$opnfvsdn" "$opnfvlab" "$opnfvdistro" "$openstack" || true + +opnfvsdn=$1 +opnfvlab=$2 +opnfvdistro=$3 +opnfvos=$4 + if [ -f ./deployconfig.yaml ];then EXTERNAL_NETWORK=`grep floating-ip-range deployconfig.yaml | cut -d ' ' -f 4 ` @@ -19,7 +29,7 @@ if [ -f ./deployconfig.yaml ];then EXTNET_GW=${EXTNET[2]} EXTNET_NET=${EXTNET[3]} EXTNET_PORT=`grep "ext-port" deployconfig.yaml | cut -d ' ' -f 4 | sed -e 's/ //' | tr ',' ' '` - + ADMNET_GW=`grep "admNetgway" deployconfig.yaml | cut -d ' ' -f 4 | sed -e 's/ //' | tr ',' ' '` fi # launch eth on computer nodes and remove default gw route @@ -28,7 +38,7 @@ launch_eth() { for node in $computer_list; do echo "node name is ${node}" juju ssh $node "sudo ifconfig $EXTNET_PORT up" - juju ssh $node "sudo route del default gw $EXTNET_GW" + #juju ssh $node "sudo route del default gw $ADMNET_GW" done } @@ -37,95 +47,161 @@ update_gw_mac() { ## get gateway mac EXTNET_GW_MAC=$(juju ssh nova-compute/0 "arp -a ${EXTNET_GW} | grep -Eo '([0-9a-fA-F]{2})(([/\s:-][0-9a-fA-F]{2}){5})'") ## set external gateway mac in onos - juju set onos-controller gateway-mac=$EXTNET_GW_MAC + juju config onos-controller gateway-mac=$EXTNET_GW_MAC } unitAddress() { - juju status | python -c "import yaml; import sys; print yaml.load(sys.stdin)[\"services\"][\"$1\"][\"units\"][\"$1/$2\"][\"public-address\"]" 2> /dev/null + juju status --format yaml | python -c "import yaml; import sys; print yaml.load(sys.stdin)[\"applications\"][\"$1\"][\"units\"][\"$1/$2\"][\"public-address\"]" 2> /dev/null } unitMachine() { - juju status | python -c "import yaml; import sys; print yaml.load(sys.stdin)[\"services\"][\"$1\"][\"units\"][\"$1/$2\"][\"machine\"]" 2> /dev/null + juju status --format yaml | python -c "import yaml; import sys; print yaml.load(sys.stdin)[\"applications\"][\"$1\"][\"units\"][\"$1/$2\"][\"machine\"]" 2> /dev/null +} + +keystoneIp() { + if [ $(juju status keystone --format=short | grep " keystone"|wc -l) == 1 ];then + unitAddress keystone 0 + else + juju config keystone | python -c "import yaml; import sys; print yaml.load(sys.stdin)['settings']['vip']['value']" | cut -d " " -f 1 + fi } # create external network and subnet in openstack create_openrc() { + echo_info "Creating the openrc (OpenStack client environment scripts)" + mkdir -m 0700 -p cloud - keystoneIp=$(unitAddress keystone 0) - adminPasswd=$(juju get keystone | grep admin-password -A 5 | grep value | awk '{print $2}') - configOpenrc admin $adminPasswd admin http://$keystoneIp:5000/v2.0 Canonical > cloud/admin-openrc - chmod 0600 cloud/admin-openrc + keystoneIp=$(keystoneIp) + adminPasswd=$(juju config keystone | grep admin-password -A 5 | grep value | awk '{print $2}' 2> /dev/null) + + v3api=`juju config keystone preferred-api-version` + + if [[ "$v3api" == "3" ]]; then + configOpenrc admin $adminPasswd admin http://$keystoneIp:5000/v3 RegionOne publicURL > ~/joid_config/admin-openrc + chmod 0600 ~/joid_config/admin-openrc + source ~/joid_config/admin-openrc + projectid=`openstack project show admin -c id -f value` + projectdomainid=`openstack domain show admin_domain -c id -f value` + userdomainid=`openstack user show admin -c domain_id -f value` + urlapi=`openstack catalog show keystone --format yaml | python -c "import yaml; import sys; print yaml.load(sys.stdin)['endpoints']" | grep public | cut -d " " -f 4` + configOpenrc admin $adminPasswd admin $urlapi RegionOne > ~/joid_config/admin-openrc + else + configOpenrc2 admin $adminPasswd admin http://$keystoneIp:5000/v2.0 RegionOne > ~/joid_config/admin-openrc + chmod 0600 ~/joid_config/admin-openrc + fi +} + +configOpenrc2() { +cat <<-EOF +export SERVICE_ENDPOINT=$4 +unset SERVICE_TOKEN +unset SERVICE_ENDPOINT +export OS_USERNAME=$1 +export OS_PASSWORD=$2 +export OS_TENANT_NAME=$3 +export OS_AUTH_URL=$4 +export OS_REGION_NAME=$5 +EOF } configOpenrc() { - cat <<-EOF - export OS_USERNAME=$1 - export OS_PASSWORD=$2 - export OS_TENANT_NAME=$3 - export OS_AUTH_URL=$4 - export OS_REGION_NAME=$5 - EOF +cat <<-EOF +#export OS_NO_CACHE='true' +export OS_AUTH_URL=$4 +export OS_USER_DOMAIN_NAME=admin_domain +export OS_PROJECT_DOMAIN_NAME=admin_domain +export OS_USERNAME=$1 +export OS_TENANT_NAME=$3 +export OS_PROJECT_NAME=$3 +export OS_PASSWORD=$2 +export OS_IDENTITY_API_VERSION=3 +export OS_REGION_NAME=$5 +#export OS_INSECURE=true +#export OS_CASSL=~/joid_config/ca.pem +EOF } +# Create an load openrc create_openrc -. ./cloud/admin-openrc - -wget -P /tmp/images http://download.cirros-cloud.net/0.3.3/cirros-0.3.3-x86_64-disk.img -glance image-create --name "cirros-0.3.3-x86_64" --file /tmp/images/cirros-0.3.3-x86_64-disk.img --disk-format qcow2 --container-format bare --progress - -#wget -P /tmp/images http://cloud-images.ubuntu.com/trusty/current/trusty-server-cloudimg-amd64-disk1.img -#glance image-create --name "ubuntu-trusty-daily" --file /tmp/images/trusty-server-cloudimg-amd64-disk1.img --disk-format qcow2 --container-format bare --progress -rm -rf /tmp/images +. ~/joid_config/admin-openrc -# adjust tiny image -nova flavor-delete m1.tiny -nova flavor-create m1.tiny 1 512 8 1 - -# configure security groups -neutron security-group-rule-create --direction ingress --ethertype IPv4 --protocol icmp --remote-ip-prefix 0.0.0.0/0 default -neutron security-group-rule-create --direction ingress --ethertype IPv4 --protocol tcp --port-range-min 22 --port-range-max 22 --remote-ip-prefix 0.0.0.0/0 default - -# import key pair -keystone tenant-create --name demo --description "Demo Tenant" -keystone user-create --name demo --tenant demo --pass demo --email demo@demo.demo - -nova keypair-add --pub-key ~/.ssh/id_rsa.pub ubuntu-keypair +## +## removing the swift API endpoint which is created by radosgw. +## one option is not to used radosgw and other one is remove endpoint. +## -# configure external network +#echo "Removing swift endpoint and service" +#swift_service_id=$(openstack service list | grep swift | cut -d ' ' -f 2) +#swift_endpoint_id=$(openstack endpoint list | grep swift | cut -d ' ' -f 2) +#openstack endpoint delete $swift_endpoint_id +#openstack service delete $swift_service_id ## ## Create external subnet Network ## -if [ "onos" == "$1" ]; then - launch_eth - neutron net-create ext-net --shared --router:external=True - neutron subnet-create ext-net --name ext-subnet $CIDR" - update_gw_mac -else - neutron net-create ext-net --shared --router:external --provider:physical_network external --provider:network_type flat - neutron subnet-create ext-net --name ext-subnet \ - --allocation-pool start=$EXTNET_FIP,end=$EXTNET_LIP \ - --disable-dhcp --gateway $EXTNET_GW $EXTNET_NET -fi -# create vm network -neutron net-create demo-net -neutron subnet-create --name demo-subnet --gateway 10.20.5.1 demo-net 10.20.5.0/24 +echo_info "Creating external network with neutron" -neutron router-create demo-router +if [ "onos" == "$opnfvsdn" ]; then + launch_eth + neutron net-show ext-net > /dev/null 2>&1 || neutron net-create ext-net \ + --router:external=True +elif [ "ocl" == "$opnfvsdn" ]; then + neutron net-show ext-net > /dev/null 2>&1 || neutron net-create ext-net \ + --router:external=True -neutron router-interface-add demo-router demo-subnet +else + neutron net-show ext-net > /dev/null 2>&1 || neutron net-create ext-net \ + --router:external=True \ + --provider:network_type flat \ + --provider:physical_network physnet1 +fi -neutron router-gateway-set demo-router ext-net +neutron subnet-show ext-subnet > /dev/null 2>&1 || neutron subnet-create ext-net \ + --name ext-subnet --allocation-pool start=$EXTNET_FIP,end=$EXTNET_LIP \ + --disable-dhcp --gateway $EXTNET_GW $EXTNET_NET -# create pool of floating ips -i=0 -while [ $i -ne 3 ]; do - neutron floatingip-create ext-net - i=$((i + 1)) -done +# Ocl can push packets to the fabric network in order to reach a gateway if BGP/L3VPN hasn't been configured. +if [ "ocl" == "$opnfvsdn" ]; then + echo "Creating simple gateway functions on ocl vRouters" + juju run --application nova-compute "sudo \ + python /opt/contrail/utils/provision_vgw_interface.py \ + --oper create --interface vgw1 --subnets $EXTNET_NET --routes 0.0.0.0/24 --vrf default-domain:admin:ext-net:ext-net" +fi -#http://docs.openstack.org/juno/install-guide/install/apt/content/launch-instance-neutron.html -# nova boot --flavor m1.small --image cirros-0.3.3-x86_64 --nic net-id=b65479a4-3638-4595-9245-6e41ccd8bfd8 --security-group default --key-name ubuntu-keypair demo-instance1 -# nova floating-ip-associate demo-instance1 10.5.8.35 +#congress team is not updating and supporting charm anymore so defer it. + +# Create Congress datasources +#sudo apt-get install -y python-congressclient + +#openstack congress datasource create nova "nova" \ +# --config username=$OS_USERNAME \ +# --config tenant_name=$OS_TENANT_NAME \ +# --config password=$OS_PASSWORD \ +# --config auth_url=http://$keystoneIp:5000/v2.0 +#openstack congress datasource create neutronv2 "neutronv2" \ +# --config username=$OS_USERNAME \ +# --config tenant_name=$OS_TENANT_NAME \ +# --config password=$OS_PASSWORD \ +# --config auth_url=http://$keystoneIp:5000/v2.0 +#openstack congress datasource create ceilometer "ceilometer" \ +# --config username=$OS_USERNAME \ +# --config tenant_name=$OS_TENANT_NAME \ +# --config password=$OS_PASSWORD \ +# --config auth_url=http://$keystoneIp:5000/v2.0 +#openstack congress datasource create cinder "cinder" \ +# --config username=$OS_USERNAME \ +# --config tenant_name=$OS_TENANT_NAME \ +# --config password=$OS_PASSWORD \ +# --config auth_url=http://$keystoneIp:5000/v2.0 +#openstack congress datasource create glancev2 "glancev2" \ +# --config username=$OS_USERNAME \ +# --config tenant_name=$OS_TENANT_NAME \ +# --config password=$OS_PASSWORD \ +# --config auth_url=http://$keystoneIp:5000/v2.0 +#openstack congress datasource create keystone "keystone" \ +# --config username=$OS_USERNAME \ +# --config tenant_name=$OS_TENANT_NAME \ +# --config password=$OS_PASSWORD \ +# --config auth_url=http://$keystoneIp:5000/v2.0