summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rwxr-xr-xci/02-deploybundle.sh2
-rwxr-xr-xci/03-maasdeploy.sh4
-rw-r--r--ci/config_tpl/juju2/deployconfig.yaml4
-rw-r--r--labconfig/lenovo/pod1/labconfig.yaml8
4 files changed, 10 insertions, 8 deletions
diff --git a/ci/02-deploybundle.sh b/ci/02-deploybundle.sh
index 517c4e46..974d65ac 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/ci/03-maasdeploy.sh b/ci/03-maasdeploy.sh
index c92a7477..198d2484 100755
--- a/ci/03-maasdeploy.sh
+++ b/ci/03-maasdeploy.sh
@@ -96,8 +96,8 @@ python -c 'import sys, yaml, json; json.dump(yaml.load(sys.stdin), sys.stdout, i
MAAS_IP=$(grep " ip_address" deployconfig.yaml | cut -d ':' -f 2 | sed -e 's/ //')
MAAS_NAME=`grep "maas_name" deployconfig.yaml | cut -d ':' -f 2 | sed -e 's/ //'`
-API_SERVER="http://$MAAS_IP/MAAS/api/2.0"
-API_SERVERMAAS="http://$MAAS_IP/MAAS/"
+API_SERVER="http://$MAAS_IP:5240/MAAS/api/2.0"
+API_SERVERMAAS="http://$MAAS_IP:5240/MAAS/"
PROFILE=ubuntu
MY_UPSTREAM_DNS=`grep "upstream_dns" deployconfig.yaml | cut -d ':' -f 2 | sed -e 's/ //'`
SSH_KEY=`cat ~/.ssh/id_rsa.pub`
diff --git a/ci/config_tpl/juju2/deployconfig.yaml b/ci/config_tpl/juju2/deployconfig.yaml
index 844ede6f..bc2e1277 100644
--- a/ci/config_tpl/juju2/deployconfig.yaml
+++ b/ci/config_tpl/juju2/deployconfig.yaml
@@ -15,12 +15,14 @@ opnfv:
{% set netdata_prefix = opnfv.spaces_dict.data.cidr[:-4] %}
dataNetwork: {{ opnfv.spaces_dict.data.cidr }}
{% endif %}
+{% if lab.racks[0].osdomainname is defined %}
domain: {{ lab.racks[0].osdomainname }}
+ os-domain-name: {{ lab.racks[0].osdomainname }}
+{% endif %}
ext-port: {{ lab.racks[0]['ext-port'] }}
ext_port: {{ lab.racks[0]['ext-port'] }}
floating-ip-range: {{ lab.racks[0]['floating-ip-range'] }}
interface-enable: {{ lab.racks[0].ifnamelist }}
- os-domain-name: {{ lab.racks[0].osdomainname }}
{% if opnfv.spaces_dict.public is defined %}
{% set netpublic_prefix = opnfv.spaces_dict.public.cidr[:-4] %}
publicNetwork: {{ opnfv.spaces_dict.public.cidr }}
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: