X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=blobdiff_plain;f=ci%2Fopenstack.sh;h=513bf99175ffa7d6c60e5866559c5dc1585fa72c;hb=3134224776bece970627c7ae8adef338f13136c1;hp=a01359c4ceda33e46066a9431247e9a884222757;hpb=eb637946cfb232a246ba64b6c10a30c58c361527;p=joid.git diff --git a/ci/openstack.sh b/ci/openstack.sh index a01359c4..513bf991 100755 --- a/ci/openstack.sh +++ b/ci/openstack.sh @@ -7,6 +7,15 @@ # http://www.apache.org/licenses/LICENSE-2.0 ############################################################################## +#./openstack.sh "$opnfvsdn" "$opnfvlab" "$opnfvdistro" "$openstack" || true + +opnfvsdn=$1 +opnfvlab=$2 +opnfvdistro=$3 +opnfvos=$4 + +jujuver=`juju --version` + if [ -f ./deployconfig.yaml ];then EXTERNAL_NETWORK=`grep floating-ip-range deployconfig.yaml | cut -d ' ' -f 4 ` @@ -38,23 +47,38 @@ 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 + if [[ "$jujuver" < "2" ]]; then + juju set onos-controller gateway-mac=$EXTNET_GW_MAC + else + juju config onos-controller gateway-mac=$EXTNET_GW_MAC + fi } unitAddress() { - juju status | python -c "import yaml; import sys; print yaml.load(sys.stdin)[\"services\"][\"$1\"][\"units\"][\"$1/$2\"][\"public-address\"]" 2> /dev/null + if [[ "$jujuver" < "2" ]]; then + juju status --format yaml | python -c "import yaml; import sys; print yaml.load(sys.stdin)[\"services\"][\"$1\"][\"units\"][\"$1/$2\"][\"public-address\"]" 2> /dev/null + else + 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 + fi } unitMachine() { - juju status | python -c "import yaml; import sys; print yaml.load(sys.stdin)[\"services\"][\"$1\"][\"units\"][\"$1/$2\"][\"machine\"]" 2> /dev/null + if [[ "$jujuver" < "2" ]]; then + juju status --format yaml | python -c "import yaml; import sys; print yaml.load(sys.stdin)[\"services\"][\"$1\"][\"units\"][\"$1/$2\"][\"machine\"]" 2> /dev/null + else + juju status --format yaml | python -c "import yaml; import sys; print yaml.load(sys.stdin)[\"applications\"][\"$1\"][\"units\"][\"$1/$2\"][\"machine\"]" 2> /dev/null + fi } keystoneIp() { - KEYSTONE=$(juju status keystone |grep public-address|sed -- 's/.*\: //') - if [ $(echo $KEYSTONE|wc -w) == 1 ];then - echo $KEYSTONE + if [ $(juju status keystone --format=short | grep " keystone"|wc -l) == 1 ];then + unitAddress keystone 0 else - juju get keystone | python -c "import yaml; import sys; print yaml.load(sys.stdin)['settings']['vip']['value']" + if [[ "$jujuver" < "2" ]]; then + juju get keystone | python -c "import yaml; import sys; print yaml.load(sys.stdin)['settings']['vip']['value']" + else + juju config keystone | python -c "import yaml; import sys; print yaml.load(sys.stdin)['settings']['vip']['value']" + fi fi } @@ -62,14 +86,22 @@ keystoneIp() { create_openrc() { mkdir -m 0700 -p cloud 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 + if [[ "$jujuver" < "2" ]]; then + adminPasswd=$(juju get keystone | grep admin-password -A 5 | grep value | awk '{print $2}' 2> /dev/null) + else + adminPasswd=$(juju config keystone | grep admin-password -A 5 | grep value | awk '{print $2}' 2> /dev/null) + fi + + configOpenrc admin $adminPasswd admin http://$keystoneIp:35357/v2.0 RegionOne > ~/joid_config/admin-openrc + chmod 0600 ~/joid_config/admin-openrc } configOpenrc() { -if [ "$API_FQDN" != "''" ]; then +if [ "$API_FQDN" != "None" ]; then 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 @@ -84,6 +116,9 @@ if [ "$API_FQDN" != "''" ]; then EOF else 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 @@ -94,10 +129,16 @@ EOF fi } -if [ "$API_FQDN" != "''" ]; then +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']") + if [[ "$jujuver" < "2" ]]; then + API_FQDN=$(juju get keystone | python -c "import yaml; import sys;\ + print yaml.load(sys.stdin)['settings']['os-public-hostname']['value']") + else + API_FQDN=$(juju config keystone | python -c "import yaml; import sys;\ + print yaml.load(sys.stdin)['settings']['os-public-hostname']['value']") + fi + KEYSTONEIP=$(keystoneIp) juju run --all "if grep $API_FQDN /etc/hosts > /dev/null; then \ @@ -107,8 +148,11 @@ if [ "$API_FQDN" != "''" ]; then echo 'API FQDN injected'; \ fi" - #change in jumphost as well as below commands will run on jumphost + # 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 @@ -120,44 +164,94 @@ fi # Create an load openrc create_openrc -. ./cloud/admin-openrc +. ~/joid_config/admin-openrc + +echo "...... deploy public api proxy ......" + +if ([ "$opnfvlab" == "orangepod1" ] \ + || [ "$opnfvlab" == "intelpod6" ]) \ + && [ "$opnfvsdn" == "nosdn" ] \ + && [ "$API_FQDN" != "None" ]; then # only for first test phase + if [ -e ./labconfig.yaml ]; then + PUB_API_MASK=$(grep floating-ip-range ./labconfig.yaml |cut -d/ -f2) + PUB_API_NET=$(grep floating-ip-range ./labconfig.yaml |cut -d, -f4) + PUB_API_IP=$(grep public-api-ip ./labconfig.yaml |cut -d: -f2) + if grep "- type: public" ./labconfig.yaml; then + # The public network exists on MAAS, so we push the dns record to it + + # Recover maas ips and login to it + maas_ip=$(grep " ip_address" deployment.yaml | cut -d ':' -f 2 | sed -e 's/ //') + maas_pubip=$(grep floating-ip-range ./labconfig.yaml |cut -d, -f4 |perl -pe 's!^(.*)\.\d+/\d+$!$1.5!') + apikey=$(grep maas-oauth: environments.yaml | cut -d "'" -f 2) + maas login maas http://${maas_ip}/MAAS/api/1.0 ${apikey} + + # Configure maas to add the record + CLUSTER_UUID=$(maas ubuntu node-groups list | grep uuid | cut -d\" -f4) + PUBLIC_MAAS_IF=$(maas ubuntu node-group-interfaces list $cluster_uuid |\ + python -c "import yaml; import sys; cfg=yaml.load(sys.stdin); net_h={net['ip']:net['name'] for net in cfg}; print(net_h['$maas_pubip'])") + maas maas node-group-interface update ${CLUSTER_UUID} ${PUBLIC_MAAS_IF} static_ip_range_high=${PUB_API_IP} static_ip_range_low=${PUB_API_IP} + maas maas ipaddresses reserve network=${PUB_API_NET} requested_address=${PUB_API_IP} hostname=${API_FQDN} + dig ${PUB_API_IP} @${maas_ip} # just for log + fi + juju run --unit nodes/0 "sudo ip a a ${PUB_API_IP}/${PUB_API_MASK} 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 + +echo "...... deploy end public api proxy ......" ## ## removing the swift API endpoint which is created by radosgw. ## one option is not to used radosgw and other one is remove endpoint. ## -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 +#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 ## -#neutron net-create ext-net --shared --router:external=True -neutron net-create ext-net --router:external=True - -if [ "onos" == "$1" ]; then +if [ "onos" == "$opnfvsdn" ]; then launch_eth - neutron subnet-create ext-net --name ext-subnet \ - --allocation-pool start=$EXTNET_FIP,end=$EXTNET_LIP \ - --disable-dhcp --gateway $EXTNET_GW --dns-nameserver 8.8.8.8 $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 subnet-create ext-net --name ext-subnet \ - --allocation-pool start=$EXTNET_FIP,end=$EXTNET_LIP \ - --disable-dhcp --gateway $EXTNET_GW --dns-nameserver 8.8.8.8 $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 -else - neutron subnet-create ext-net --name ext-subnet \ - --allocation-pool start=$EXTNET_FIP,end=$EXTNET_LIP \ - --disable-dhcp --gateway $EXTNET_GW --dns-nameserver 8.8.8.8 $EXTNET_NET +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 physnet1 + + 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 + +elif [ "odl" == "$opnfvsdn" ]; then + neutron net-show ext-net > /dev/null 2>&1 || neutron net-create ext-net \ + --router:external=True \ + --provider:network_type vxlan + + 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-show ext-net > /dev/null 2>&1 || neutron net-create ext-net \ + --router:external=True \ + --provider:network_type flat \ + --provider:physical_network physnet1 + + 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 @@ -194,4 +288,3 @@ openstack congress datasource create keystone "keystone" \ --config tenant_name=$OS_TENANT_NAME \ --config password=$OS_PASSWORD \ --config auth_url=http://$keystoneIp:5000/v2.0 -