X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=blobdiff_plain;f=ci%2Fopenstack.sh;h=f518ee55fa441a7c84c3b183fd1b49cdcc42e93b;hb=498d246c5b7398627d929cb50274eb55cba930cf;hp=75bf11566ff95a0a64e155719e2fc9de924e14ed;hpb=8f24bb1e13e300a54e168d0dc9897a25f105190b;p=joid.git diff --git a/ci/openstack.sh b/ci/openstack.sh index 75bf1156..f518ee55 100755 --- a/ci/openstack.sh +++ b/ci/openstack.sh @@ -19,7 +19,8 @@ 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 ',' ' '` + 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 @@ -28,7 +29,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 } @@ -48,38 +49,88 @@ 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}') + 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 } 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" != "''" ]; 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" != "''" ]; 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" + + #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 -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://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 -#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 +#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 @@ -87,29 +138,74 @@ rm -rf /tmp/images # import key pair -keystone tenant-create --name demo --description "Demo Tenant" -keystone user-create --name demo --tenant demo --pass demo --email demo@demo.demo +#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 + +#Modify the flavours to fit better +#nova flavor-create FLAVOR_NAME FLAVOR_ID RAM_IN_MB ROOT_DISK_IN_GB NUMBER_OF_VCPUS +#nova flavor-delete m1.tiny > /dev/null 2>&1 +#nova flavor-delete m1.small > /dev/null 2>&1 +#nova flavor-delete m1.medium > /dev/null 2>&1 +#nova flavor-delete m1.large > /dev/null 2>&1 +#nova flavor-delete m1.xlarge > /dev/null 2>&1 +#nova flavor-create --is-public true m1.tiny auto 512 5 1 > /dev/null 2>&1 +#nova flavor-create --is-public true m1.small auto 1024 10 1 > /dev/null 2>&1 +#nova flavor-create --is-public true m1.medium auto 2048 10 2 > /dev/null 2>&1 +#nova flavor-create --is-public true m1.large auto 3072 10 2 > /dev/null 2>&1 +## need extra for windows image (15g) +#nova flavor-create --is-public true m1.xlarge auto 8096 30 4 > /dev/null 2>&1 + +echo "modifying default quotas for admin user" + +TENANT_ID=admin + +#Modify quotas for the tenant to allow large deployments +#nova quota-update --instances 400 $TENANT_ID +#nova quota-update --cores 800 $TENANT_ID +#nova quota-update --ram 404800 $TENANT_ID +#nova quota-update --security-groups 4000 $TENANT_ID +#nova quota-update --floating_ips -1 $TENANT_ID +#nova quota-update --security-group-rules -1 $TENANT_ID + +### need to find how to change quota for the project not the tenant -nova keypair-add --pub-key ~/.ssh/id_rsa.pub ubuntu-keypair +### modify default quota the same way.. +#nova quota-class-update --instances 400 $TENANT_ID +#nova quota-class-update --cores 800 $TENANT_ID +#nova quota-class-update --ram 404800 $TENANT_ID +#nova quota-class-update --security-groups 4000 $TENANT_ID +#nova quota-class-update --floating-ips -1 $TENANT_ID +#nova quota-class-update --security-group-rules -1 $TENANT_ID # configure external network ## ## 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 launch_eth - neutron net-create ext-net --shared --router:external=True - neutron subnet-create ext-net --name ext-subnet $EXTNET_NET - 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 \ + neutron subnet-create ext_net --name ext-subnet \ --allocation-pool start=$EXTNET_FIP,end=$EXTNET_LIP \ - --disable-dhcp --gateway $EXTNET_GW $EXTNET_NET + --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 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 fi @@ -121,13 +217,13 @@ neutron router-create demo-router neutron router-interface-add demo-router demo-subnet -neutron router-gateway-set demo-router ext-net +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)) + neutron floatingip-create ext_net + i=$((i + 1)) done #http://docs.openstack.org/juno/install-guide/install/apt/content/launch-instance-neutron.html