summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rwxr-xr-xci/00-maasdeploy.sh16
-rwxr-xr-xci/02-deploybundle.sh2
-rw-r--r--ci/config_tpl/bundle_tpl/neutron-gateway.yaml2
-rw-r--r--ci/config_tpl/bundle_tpl/neutron-ovs.yaml2
-rw-r--r--ci/config_tpl/deployconfig.yaml10
-rw-r--r--ci/genDeploymentConfig.py2
6 files changed, 18 insertions, 16 deletions
diff --git a/ci/00-maasdeploy.sh b/ci/00-maasdeploy.sh
index 8b8a8d44..98ca47af 100755
--- a/ci/00-maasdeploy.sh
+++ b/ci/00-maasdeploy.sh
@@ -31,14 +31,14 @@ labfile=$2
case "$labname" in
intelpod[569]|orangepod[12]|cengnpod[12] )
array=(${labname//pod/ })
- cp maas/${array[0]}/pod${array[0]}/labconfig.yaml .
- python genDeploymentConfig.py > deployment.yaml
- python genMAASConfig.py > deployconfig.yaml
+ cp ../labconfig/${array[0]}/pod${array[1]}/labconfig.yaml .
+ python genMAASConfig.py -l labconfig.yaml > deployment.yaml
+ python genDeploymentConfig.py -l labconfig.yaml > deployconfig.yaml
;;
'attvirpod1' )
- cp maas/att/virpod1/labconfig.yaml .
- python genDeploymentConfig.py > deployment.yaml
- python genMAASConfig.py > deployconfig.yaml
+ cp ../labconfig/att/virpod1/labconfig.yaml .
+ python genMAASConfig.py -l labconfig.yaml > deployment.yaml
+ python genDeploymentConfig.py -l labconfig.yaml > deployconfig.yaml
;;
'juniperpod1' )
cp maas/juniper/pod1/deployment.yaml ./deployment.yaml
@@ -56,8 +56,8 @@ case "$labname" in
if [ ! -e ./labconfig.yaml ]; then
virtinstall=1
else
- python genDeploymentConfig.py > deployment.yaml
- python genMAASConfig.py > deployconfig.yaml
+ python genMAASConfig.py -l labconfig.yaml > deployment.yaml
+ python genDeploymentConfig.py -l labconfig.yaml > deployconfig.yaml
labname=`grep "maas_name" deployment.yaml | cut -d ':' -f 2 | sed -e 's/ //'`
fi
;;
diff --git a/ci/02-deploybundle.sh b/ci/02-deploybundle.sh
index ffacef9f..12c58fc5 100755
--- a/ci/02-deploybundle.sh
+++ b/ci/02-deploybundle.sh
@@ -78,7 +78,7 @@ done
#update source if trusty is target distribution
var=os-$opnfvsdn-$fea-$opnfvtype"-"$opnfvdistro"_"$openstack
-if [ "$osdomname" != "''" ]; then
+if [ "$osdomname" != "None" ]; then
var=$var"_"publicapi
fi
diff --git a/ci/config_tpl/bundle_tpl/neutron-gateway.yaml b/ci/config_tpl/bundle_tpl/neutron-gateway.yaml
index 74743ef7..07195503 100644
--- a/ci/config_tpl/bundle_tpl/neutron-gateway.yaml
+++ b/ci/config_tpl/bundle_tpl/neutron-gateway.yaml
@@ -3,8 +3,6 @@
options:
{% if opnfv.spaces_dict.data is defined %}
os-data-network: {{ opnfv.spaces_dict.data.cidr }}
-{% else %}
- #os-data-network: {{ opnfv.spaces_dict.data.cidr }}
{% endif %}
{% if os.network.controller == 'nosdn' %}
{% if opnfv.ext_port is defined %}
diff --git a/ci/config_tpl/bundle_tpl/neutron-ovs.yaml b/ci/config_tpl/bundle_tpl/neutron-ovs.yaml
index 087783d8..6823ca86 100644
--- a/ci/config_tpl/bundle_tpl/neutron-ovs.yaml
+++ b/ci/config_tpl/bundle_tpl/neutron-ovs.yaml
@@ -3,8 +3,6 @@
options:
{% if opnfv.spaces_dict.data is defined %}
os-data-network: {{ opnfv.spaces_dict.data.cidr }}
-{% else %}
- #os-data-network: {{ opnfv.spaces_dict.data.cidr }}
{% endif %}
{% if os.network.dpdk %}
enable-dpdk: true
diff --git a/ci/config_tpl/deployconfig.yaml b/ci/config_tpl/deployconfig.yaml
index 3bc2ebc2..c190d1dd 100644
--- a/ci/config_tpl/deployconfig.yaml
+++ b/ci/config_tpl/deployconfig.yaml
@@ -4,14 +4,18 @@ opnfv:
admNetwork: {{ net_prefix }}2
admin_password: openstack
ceph-disk: {{ opnfv.storage_dict.ceph.disk }}
+{% if opnfv.spaces_dict.data is defined %}
dataNetwork: {{ opnfv.spaces_dict.data.cidr }}
+{% endif %}
domain: {{ lab.racks[0].osdomainname }}
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 }}
- publicNetwork: {{ opnfv.spaces_dict.public.cidr if 'public' in opnfv.spaces_dict else '' }}
+{% if opnfv.spaces_dict.public is defined %}
+ publicNetwork: {{ opnfv.spaces_dict.public.cidr }}
+{% endif %}
spaces:
{% for net in opnfv.spaces %}
- bridge: {{ net.bridge }}
@@ -25,7 +29,9 @@ opnfv:
- disk: {{ storage.disk }}
type: {{ storage.type }}
{% endfor %}
- storageNetwork: {{ opnfv.spaces_dict.storage.cidr if 'storage' in opnfv.spaces_dict else '' }}
+{% if opnfv.spaces_dict.storage is defined %}
+ storageNetwork: {{ opnfv.spaces_dict.storage.cidr }}
+{% endif %}
units: {{ lab.racks[0].nodes|count }}
vip:
ceilometer: {{ net_prefix }}24
diff --git a/ci/genDeploymentConfig.py b/ci/genDeploymentConfig.py
index d78c93fa..05aeb1f1 100644
--- a/ci/genDeploymentConfig.py
+++ b/ci/genDeploymentConfig.py
@@ -79,7 +79,7 @@ for node in config['lab']['racks'][0]['nodes']:
for nic in node['nics']:
if 'admin' not in nic['spaces']:
ifnamelist.add(nic['ifname'])
-config['lab']['racks'][0]['ifnamelist'] = ', '.join(ifnamelist)
+config['lab']['racks'][0]['ifnamelist'] = ','.join(ifnamelist)
#
# Transform template to deployconfig.yaml according to config