summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorNarinder Gupta <narinder.gupta@canonical.com>2017-08-09 21:04:04 -0500
committerNarinder Gupta <narinder.gupta@canonical.com>2017-08-09 21:04:04 -0500
commita6e2934c295ce89eccd14d42f6fa9af654b45cb0 (patch)
tree1cdc99b7a3c32dd0210925df642f31d3447515ec
parent89fe6869c63bfe43df92055e9d3a91bd65f3a8f8 (diff)
modified to correct deployment
Change-Id: I6942d254d7fe105f6ccaa1ddf0090e9d832e4f35 Signed-off-by: Narinder Gupta <narinder.gupta@canonical.com>
-rwxr-xr-xci/02-deploybundle.sh2
-rw-r--r--labconfig/lenovo/pod1/labconfig.yaml8
2 files changed, 5 insertions, 5 deletions
diff --git a/ci/02-deploybundle.sh b/ci/02-deploybundle.sh
index be11a1f0..3ef038a1 100755
--- a/ci/02-deploybundle.sh
+++ b/ci/02-deploybundle.sh
@@ -133,7 +133,7 @@ if [[ "$opnfvmodel" = "openstack" ]]; then
#update source if trusty is target distribution
var=os-$opnfvsdn-$fea-$opnfvtype"-"$opnfvdistro"_"$openstack
- if [ "$osdomname" != "None" ]; then
+ if ([ $osdomname ] && [ $osdomname != "null" ] && [ $osdomname != "None"]); then
var=$var"_"publicapi
fi
else
diff --git a/labconfig/lenovo/pod1/labconfig.yaml b/labconfig/lenovo/pod1/labconfig.yaml
index ba56362a..a29282da 100644
--- a/labconfig/lenovo/pod1/labconfig.yaml
+++ b/labconfig/lenovo/pod1/labconfig.yaml
@@ -39,10 +39,10 @@ lab:
nics:
- ifname: intf100
spaces: [admin]
- mac: ["24:8a:07:3f:95:b6"]
+ mac: ["24:8a:07:3f:84:c4"]
- ifname: intf101
spaces: [floating]
- mac: ["24:8a:07:3f:95:b7"]
+ mac: ["24:8a:07:3f:84:c5"]
power:
type: ipmi
address: 192.0.5.127
@@ -78,8 +78,8 @@ lab:
address: 192.0.5.129
user: USERID
pass: PASSW0RD
- floating-ip-range: 172.21.159.6,172.21.159.100,172.21.159.1,172.21.159.0/24
- ext-port: "br-intf101"
+ floating-ip-range: 172.21.159.6,172.21.159.100,172.21.159.5,172.21.159.0/24
+ ext-port: "intf101"
dns: 8.8.8.8
osdomainname:
opnfv: