diff options
Diffstat (limited to 'ci/openstack.sh')
| -rwxr-xr-x | ci/openstack.sh | 19 |
1 files changed, 12 insertions, 7 deletions
diff --git a/ci/openstack.sh b/ci/openstack.sh index 55062092..1e82ff9b 100755 --- a/ci/openstack.sh +++ b/ci/openstack.sh @@ -19,6 +19,7 @@ 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 ',' ' '` fi @@ -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 } @@ -51,7 +52,10 @@ unitMachine() { # create external network and subnet in openstack create_openrc() { mkdir -m 0700 -p cloud - keystoneIp=$(unitAddress keystone 0) + 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 chmod 0600 cloud/admin-openrc @@ -79,12 +83,9 @@ glance image-create --name "cirros-0.3.3-x86_64" --file /tmp/images/cirros-0.3.3 rm -rf /tmp/images # adjust tiny image -nova flavor-delete m1.tiny -nova flavor-create m1.tiny 1 512 8 1 +#nova flavor-delete m1.tiny +#nova flavor-create m1.tiny 1 512 8 1 -# 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 # import key pair keystone tenant-create --name demo --description "Demo Tenant" @@ -107,8 +108,12 @@ else 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 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 |