diff options
| author |   Narinder Gupta <narinder.gupta@canonical.com> | 2016-06-10 14:21:15 -0500 |
|---|---|---|
| committer | Narinder Gupta <narinder.gupta@canonical.com> | 2016-06-10 15:30:15 -0500 |
| commit | 8f24bb1e13e300a54e168d0dc9897a25f105190b (patch) | |
| tree | 1a15f41a33d77747a91be3e3644d982717b4f3ba /ci | |
| parent | cb535c9b589a4dc847e7d78ff9da5ff093c4742c (diff) | |
uses vip in case exist.
Change-Id: I7799a987d669d4b75bfc7b1b692183a1eb26e738
Signed-off-by: Narinder Gupta <narinder.gupta@canonical.com>
Diffstat (limited to 'ci')
| -rwxr-xr-x | ci/deploy.sh | 2 | ||||
| -rwxr-xr-x | ci/openstack.sh | 16 |
2 files changed, 11 insertions, 7 deletions
diff --git a/ci/deploy.sh b/ci/deploy.sh index b81673c3..b91e761c 100755 --- a/ci/deploy.sh +++ b/ci/deploy.sh @@ -156,7 +156,7 @@ check_status echo "...... deployment finished ......." if [ "$opnfvsdn" == "onos" ]; then - ./openstack.sh "$opnfvlab" + ./openstack.sh "$opnfvsdn" check_status else #create the basic data for verification of stack. diff --git a/ci/openstack.sh b/ci/openstack.sh index 55062092..75bf1156 100755 --- a/ci/openstack.sh +++ b/ci/openstack.sh @@ -51,7 +51,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 +82,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 +107,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 |