X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=blobdiff_plain;f=ci%2Fopenstack.sh;h=24d068f96abc4d41a43c45cab20c68583e981af9;hb=af481b1d002cba3e31b0fce082afb5fe85c11666;hp=5e0b9bf1c442bb4d3517fce89fb1cf40bc8f3133;hpb=6d508d3203fe4a914db1b8cc65f7e2358b1f4766;p=joid.git

diff --git a/ci/openstack.sh b/ci/openstack.sh
index 5e0b9bf1..24d068f9 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']" | cut -d " " -f 1
+        else
+            juju config keystone | python -c "import yaml; import sys; print yaml.load(sys.stdin)['settings']['vip']['value']" | cut -d " " -f 1
+        fi
     fi
 }
 
@@ -62,42 +86,43 @@ 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 Canonical > 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:5000/v3 RegionOne > ~/joid_config/admin-openrc
+
+    chmod 0600 ~/joid_config/admin-openrc
 }
 
 configOpenrc() {
-if [ "$API_FQDN" != "''" ]; 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
+cat <<-EOF
+export OS_AUTH_URL=$4
+export OS_USERNAME=$1
+export OS_PASSWORD=$2
+export OS_USER_DOMAIN_NAME=admin_domain
+export OS_PROJECT_DOMAIN_NAME=admin_domain
+export OS_PROJECT_NAME=$3
+export OS_TENANT_NAME=$3
+export OS_REGION_NAME=$5
+export OS_IDENTITY_API_VERSION=3
+# Swift needs this:
+export OS_AUTH_VERSION=3
 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 +132,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,127 +148,106 @@ 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" deployconfig.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 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
+    neutron net-show ext-net > /dev/null 2>&1 || neutron net-create ext-net \
+                                                   --router:external=True
 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
+    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 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 Congress datasources
-sudo apt-get install -y python-congressclient
-
-# Remove public endpoint and recreate it from internal
-# Waiting congress client can be use with internal endpoints
-if [ "$API_FQDN" != "''" ]; then
-    CONGRESS_PUB_ENDPOINT=$(openstack endpoint list --service policy --interface public -c ID -f value)
-    openstack endpoint delete $CONGRESS_PUB_ENDPOINT
-    CONGRESS_NEW_PUB_ENDPOINT=$(openstack endpoint list --service policy --interface internal -c URL -f value)
-    openstack endpoint create --region Canonical policy public $CONGRESS_NEW_PUB_ENDPOINT
-fi
-
-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
-
-
-##enable extra stuff only if testing manually
-
-#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
-
-#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
-
-## import key pair
-#openstack project create --description "Demo Tenant" demo
-#openstack user create --project demo --password demo --email demo@demo.demo demo
-
-#openstack keypair create --public-key ~/.ssh/id_rsa.pub ubuntu-keypair
-
-## 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
-# netid=`neutron net-show demo-net -c id -f value`
-# nova boot --flavor m1.small --image cirros-0.3.3-x86_64 --nic net-id=$netid --security-group default --key-name ubuntu-keypair demo-instance1
-# nova floating-ip-associate demo-instance1 10.5.15.8
+#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