# 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 `
}
configOpenrc() {
-if [ "$API_FQDN" != "''" ]; then
+if [ "$API_FQDN" != "None" ]; then
cat <<-EOF
export OS_USERNAME=$1
export OS_PASSWORD=$2
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']")
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
. ./cloud/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
+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 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
fi
# 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 RegionOne policy public $CONGRESS_NEW_PUB_ENDPOINT
-fi
-
openstack congress datasource create nova "nova" \
--config username=$OS_USERNAME \
--config tenant_name=$OS_TENANT_NAME \
--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
-
Code Review / joid.git / blobdiff