summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorNarinder Gupta <narinder.gupta@canonical.com>2016-06-30 17:04:04 -0500
committerNarinder Gupta <narinder.gupta@canonical.com>2016-06-30 17:09:47 -0500
commit1f67ee4bac259f5997ee570eec3060f24e05d56f (patch)
treeaacef5d6135c005ec147a9ba55ad79b4c7732247
parent8af52f45681275997204080f1cac854b255f2bcc (diff)
modified to make use of the bundle generated.
Change-Id: I1854658a93dbb3cbd1a7c41d19d7a76645ede85c Signed-off-by: Narinder Gupta <narinder.gupta@canonical.com>
-rwxr-xr-xci/01-deploybundle.sh14
-rw-r--r--ci/bundle_tpl/phase2-overrides.yaml4
-rw-r--r--ci/deploy.py1
-rw-r--r--ci/genBundle.py2
4 files changed, 17 insertions, 4 deletions
diff --git a/ci/01-deploybundle.sh b/ci/01-deploybundle.sh
index 08f539b5..bf16ce7c 100755
--- a/ci/01-deploybundle.sh
+++ b/ci/01-deploybundle.sh
@@ -89,9 +89,14 @@ case "$3" in
esac
# lets put the if seperateor as "," as this will save me from world.
+fea=""
IFS=","
-
for feature in $5; do
+ if [ "$fea" == "" ]; then
+ fea=$feature
+ else
+ fea=$fea"_"$feature
+ fi
case "$feature" in
'ipv6' )
sed -i -- 's/#prefer-ipv6: true/prefer-ipv6: true/g' ./bundles.yaml
@@ -139,6 +144,13 @@ case "$6" in
;;
esac
+var=os-$4-$fea-$1
+if [ "$4" == "nosdn" ]; then
+ python genBundle.py -l deployconfig.yaml -s $var > bundles.yaml
+elif [ "$4" == "odl" ]; then
+ python genBundle.py -l deployconfig.yaml -s $var > bundles.yaml
+fi
+
echo "... Deployment Started ...."
juju-deployer -vW -d -t 3600 -c bundles.yaml $6-"$2"-nodes
check_status
diff --git a/ci/bundle_tpl/phase2-overrides.yaml b/ci/bundle_tpl/phase2-overrides.yaml
index c2b8ff9a..80bfffc6 100644
--- a/ci/bundle_tpl/phase2-overrides.yaml
+++ b/ci/bundle_tpl/phase2-overrides.yaml
@@ -1,10 +1,10 @@
{% if opnfv.spaces_dict.data is defined %}
- os-data-network: {{ opnfv.dataNetwork }}
+ os-data-network: {{ opnfv.spaces_dict.data.cidr }}
{% endif %}
{% if opnfv.spaces_dict.storage is defined %}
#ceph-cluster-network: {{ opnfv.spaces_dict.storage.cidr }}
{% endif %}
-{% if os.network.ipv6 == 'true' %}
+{% if os.network.ipv6 %}
prefer-ipv6: {{ os.network.ipv6 }}
{% endif %}
{% if os.network.dvr %}
diff --git a/ci/deploy.py b/ci/deploy.py
index 08861612..a7ee952f 100644
--- a/ci/deploy.py
+++ b/ci/deploy.py
@@ -242,6 +242,7 @@ opnfvlabcfg["opnfv"]["ext_port"]=labcfg["lab"]["racks"][0]["ext-port"]
opnfvlabcfg["opnfv"]["units"]=len(labcfg["lab"]["racks"][0]["nodes"])
opnfvlabcfg["opnfv"]["admin_password"]="openstack"
opnfvlabcfg["opnfv"]["storage"]=labcfg["opnfv"]["storage"]
+opnfvlabcfg["opnfv"]["spaces"]=labcfg["opnfv"]["spaces"]
with open('deployment.yaml', 'wa') as opnfvf:
yaml.dump(opnfvcfg, opnfvf, default_flow_style=False)
diff --git a/ci/genBundle.py b/ci/genBundle.py
index 85af5da2..cb61f5aa 100644
--- a/ci/genBundle.py
+++ b/ci/genBundle.py
@@ -130,7 +130,7 @@ config['os']['network']['controller'] = sdn
# Change features
if 'lxd' in features:
config['os']['lxd'] = True
-if 'drv' in features:
+if 'dvr' in features:
config['os']['network']['dvr'] = True
if 'ipv6' in features:
config['os']['network']['ipv6'] = True