From d0fe28175fb1436f4e1f0ab3d7d896fced11f45e Mon Sep 17 00:00:00 2001
From: zhangyuanyou <zhangyuanyou@huawei.com>
Date: Tue, 22 Mar 2016 14:31:33 +0800
Subject: modify script to get admin passwd and revise cidr.
Change-Id: Ia0cfafc6c95bdb477e1912f5e19402b838a8d562
---
ci/onos/juju_test_prepare.sh | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
(limited to 'ci/onos')
diff --git a/ci/onos/juju_test_prepare.sh b/ci/onos/juju_test_prepare.sh
index 96976ca9..1e3201f5 100644
--- a/ci/onos/juju_test_prepare.sh
+++ b/ci/onos/juju_test_prepare.sh
@@ -8,7 +8,7 @@
case "$1" in
'orangepod2' )
GW_IP=192.168.2.1
- CIDR=161.105.231.0/24
+ CIDR=161.105.231.0/26
COMPUTE_ETH=eth1
;;
'intelpod6' )
@@ -51,7 +51,8 @@ launch_eth() {
# create external network and subnet in openstack
create_ext_network() {
keystoneIp=$(juju status --format short | grep keystone/0 | grep -v ha | grep -Eo '([0-9]{1,3}\.){3}[0-9]{1,3}')
- configOpenrc admin openstack admin http://$keystoneIp:5000/v2.0 Canonical
+ adminPasswd=$(juju get keystone | grep admin-password -A 5 | grep value | awk '{print $2}')
+ configOpenrc admin $adminPasswd admin http://$keystoneIp:5000/v2.0 Canonical
juju scp ./admin-openrc nova-cloud-controller/0:
juju ssh nova-cloud-controller/0 "source admin-openrc;neutron net-create ext-net --shared --router:external=True;neutron subnet-create ext-net --name ext-subnet $CIDR"
}
--
cgit