X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=blobdiff_plain;f=ci%2Fopenstack.sh;h=5bee7d08fab363a108d0d8419488ed71a19b35c5;hb=64d633617d7b5a2dc635d95558cf5dbbdcbc5fe7;hp=100299a3f6ddf43c54a8c48fdc78235dd5c01a31;hpb=7c34d298ecd10989c94e2a08b1e073a20fadf349;p=joid.git diff --git a/ci/openstack.sh b/ci/openstack.sh index 100299a3..5bee7d08 100755 --- a/ci/openstack.sh +++ b/ci/openstack.sh @@ -7,6 +7,13 @@ # http://www.apache.org/licenses/LICENSE-2.0 ############################################################################## +#./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 ` @@ -20,7 +27,7 @@ if [ -f ./deployconfig.yaml ];then 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 ',' ' '` - + API_FQDN=`grep "os-domain-name" deployconfig.yaml | cut -d ' ' -f 4 | sed -e 's/ //' | tr ',' ' '` fi # launch eth on computer nodes and remove default gw route @@ -49,105 +56,140 @@ unitMachine() { juju status | python -c "import yaml; import sys; print yaml.load(sys.stdin)[\"services\"][\"$1\"][\"units\"][\"$1/$2\"][\"machine\"]" 2> /dev/null } +keystoneIp() { + KEYSTONE=$(juju status keystone |grep public-address|sed -- 's/.*\: //') + if [ $(echo $KEYSTONE|wc -w) == 1 ];then + echo $KEYSTONE + else + juju get keystone | python -c "import yaml; import sys; print yaml.load(sys.stdin)['settings']['vip']['value']" + fi +} + # create external network and subnet in openstack create_openrc() { mkdir -m 0700 -p cloud - keystoneIp=$(juju get keystone | grep vip: -A 7 | grep value | awk '{print $2}') - if [ -z "$keystoneIp" ]; then - keystoneIp=$(unitAddress keystone 0) - fi - 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 + keystoneIp=$(keystoneIp) + adminPasswd=$(juju get keystone | grep admin-password -A 5 | grep value | awk '{print $2}' 2> /dev/null) + configOpenrc admin $adminPasswd admin http://$keystoneIp:5000/v2.0 RegionOne > cloud/admin-openrc chmod 0600 cloud/admin-openrc } 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 +if [ "$API_FQDN" != "None" ]; then + 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 + export OS_ENDPOINT_TYPE='internalURL' + export CINDER_ENDPOINT_TYPE='internalURL' + export GLANCE_ENDPOINT_TYPE='internalURL' + export KEYSTONE_ENDPOINT_TYPE='internalURL' + export NEUTRON_ENDPOINT_TYPE='internalURL' + export NOVA_ENDPOINT_TYPE='internalURL' +EOF +else + 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 + +fi } +if [ "$API_FQDN" != "None" ]; then + # Push api fqdn local ip to all /etc/hosts + API_FQDN=$(juju get keystone | python -c "import yaml; import sys;\ + print yaml.load(sys.stdin)['settings']['os-public-hostname']['value']") + + KEYSTONEIP=$(keystoneIp) + juju run --all "if grep $API_FQDN /etc/hosts > /dev/null; then \ + echo 'API FQDN already present'; \ + else \ + sudo sh -c 'echo $KEYSTONEIP $API_FQDN >> /etc/hosts'; \ + echo 'API FQDN injected'; \ + fi" + + # remove this enhancement for heat that does not manage endpoints + juju run --service=heat "cp /etc/hosts /tmp/hosts ; \ + grep -v $API_FQDN /tmp/hosts > /etc/hosts" + + #change in jumphost as well as below commands will run on jumphost + if grep $API_FQDN /etc/hosts; then + echo 'API FQDN already present' + else + sudo sh -c "echo $KEYSTONEIP $API_FQDN >> /etc/hosts" + echo 'API FQDN injected' + fi +fi + +# 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 -openstack image create --file /tmp/images/cirros-0.3.3-x86_64-disk.img --disk-format qcow2 --container-format bare "cirros-0.3.3-x86_64" - -#wget -P /tmp/images http://cloud-images.ubuntu.com/trusty/current/trusty-server-cloudimg-amd64-disk1.img -#openstack image create --file /tmp/images/trusty-server-cloudimg-amd64-disk1.img --disk-format qcow2 --container-format bare "ubuntu-trusty-daily" -#wget -P /tmp/images http://cloud-images.ubuntu.com/trusty/current/xenial-server-cloudimg-amd64.tar.gz -#openstack image create --file /tmp/images/xenial-server-cloudimg-amd64.tar.gz --container-format bare --disk-format raw "xenial-server-cloudimg-amd64" - -rm -rf /tmp/images - -# adjust tiny image -#nova flavor-delete m1.tiny -#nova flavor-create m1.tiny 1 512 8 1 +echo "...... deploy public api proxy ......" +if [ "$opnfvlab" == "orangepod1" ] && [ "$opnfvsdn" == "nosdn" ]; then # only for first test phase + if [ -e ./labconfig.yaml ]; then + PUB_API_NET=$(grep floating-ip-range ./labconfig.yaml |cut -d/ -f2) + PUB_API_IP=$(grep public-api-ip ./labconfig.yaml |cut -d: -f2) + juju run --unit nodes/0 "sudo ip a a ${PUB_API_IP}/${PUB_API_NET} dev br-ex" || true + juju run --unit nodes/0 "sudo ip l set dev br-ex up" || true + python genPublicAPIProxyBundle.py -l labconfig.yaml >> bundles.yaml + juju-deployer -vW -d -t 7200 -r 5 -c bundles.yaml $opnfvdistro-"$opnfvos" || true + fi +fi -# import key pair -openstack project create --description "Demo Tenant" demo -openstack user create --project demo --password demo --email demo@demo.demo demo +echo "...... deploy end public api proxy ......" -openstack keypair create --public-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 + +if [ "onos" == "$opnfvsdn" ]; then launch_eth - neutron net-create ext-net --shared --router:external=True - neutron subnet-create ext-net --name ext-subnet $EXTNET_NET + neutron net-show ext-net > /dev/null 2>&1 || neutron net-create ext-net --router:external=True + 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 + #neutron subnet-create ext-net --name ext-subnet $EXTNET_NET #update_gw_mac -elif [ "nosdn" == "$1" ]; then - 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 - # 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 +elif [ "nosdn" == "$opnfvsdn" ]; then + neutron net-show ext-net > /dev/null 2>&1 || neutron net-create ext-net \ + --router:external=True \ + --provider:network_type flat \ + --provider:physical_network external + + 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 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 - # 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 + neutron net-show ext-net > /dev/null 2>&1 || neutron net-create ext-net --router:external=True + 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 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 - -neutron router-create demo-router - -neutron router-interface-add demo-router demo-subnet - -neutron router-gateway-set demo-router ext-net - -# create pool of floating ips -i=0 -while [ $i -ne 3 ]; do - neutron floatingip-create ext-net - i=$((i + 1)) -done - -#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 - # 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 \