diff options
| -rwxr-xr-x | ci/02-deploybundle.sh | 2 | ||||
| -rw-r--r-- | labconfig/lenovo/pod1/labconfig.yaml | 8 |
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: |