summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rwxr-xr-xci/01-deploybundle.sh6
-rwxr-xr-xci/maas/orange/pod2/deployment.yaml4
-rwxr-xr-xci/odl/01-deploybundle.sh6
-rwxr-xr-xci/opencontrail/01-deploybundle.sh6
4 files changed, 20 insertions, 2 deletions
diff --git a/ci/01-deploybundle.sh b/ci/01-deploybundle.sh
index 42f1a3cd..9de9aa22 100755
--- a/ci/01-deploybundle.sh
+++ b/ci/01-deploybundle.sh
@@ -18,6 +18,12 @@ case "$1" in
;;
esac
+case "$3" in
+ 'orangepod2' )
+ sed -i -- 's/10.4.1.1/192.168.2.2/g' ./bundles.yaml
+ ;;
+esac
+
echo "... Deployment Started ...."
#case openstack kilo with odl
diff --git a/ci/maas/orange/pod2/deployment.yaml b/ci/maas/orange/pod2/deployment.yaml
index 99fa7267..8543a9d0 100755
--- a/ci/maas/orange/pod2/deployment.yaml
+++ b/ci/maas/orange/pod2/deployment.yaml
@@ -99,11 +99,11 @@ demo-maas:
broadcast_ip: 192.168.2.255
router_ip: 192.168.2.4
static_range:
- low: 192.168.2.30
+ low: 192.168.2.50
high: 192.168.2.150
dynamic_range:
low: 192.168.2.151
- high: 192.168.2.254
+ high: 192.168.2.200
# Defines the physical nodes which are added to the MAAS cluster
# controller upon startup of the node.
diff --git a/ci/odl/01-deploybundle.sh b/ci/odl/01-deploybundle.sh
index 42f1a3cd..9de9aa22 100755
--- a/ci/odl/01-deploybundle.sh
+++ b/ci/odl/01-deploybundle.sh
@@ -18,6 +18,12 @@ case "$1" in
;;
esac
+case "$3" in
+ 'orangepod2' )
+ sed -i -- 's/10.4.1.1/192.168.2.2/g' ./bundles.yaml
+ ;;
+esac
+
echo "... Deployment Started ...."
#case openstack kilo with odl
diff --git a/ci/opencontrail/01-deploybundle.sh b/ci/opencontrail/01-deploybundle.sh
index da53f419..d008b984 100755
--- a/ci/opencontrail/01-deploybundle.sh
+++ b/ci/opencontrail/01-deploybundle.sh
@@ -19,6 +19,12 @@ case "$1" in
;;
esac
+case "$3" in
+ 'orangepod2' )
+ sed -i -- 's/10.4.1.1/192.168.2.2/g' ./bundles.yaml
+ ;;
+esac
+
echo "... Deployment Started ...."
juju-deployer -d -r 13 -c bundles.yaml trusty-"$2"-contrail