summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rwxr-xr-xci/01-deploybundle.sh21
-rwxr-xr-xci/02-maasdeploy.sh5
-rwxr-xr-xci/nosdn/juju-deployer/scripts/cloud-setup.sh3
-rwxr-xr-xci/odl/juju-deployer/scripts/cloud-setup.sh3
-rw-r--r--ci/onos/juju-deployer/scripts/cloud-setup.sh4
-rwxr-xr-xci/opencontrail/juju-deployer/scripts/cloud-setup.sh4
-rw-r--r--labconfig/default/deployment.yaml12
7 files changed, 36 insertions, 16 deletions
diff --git a/ci/01-deploybundle.sh b/ci/01-deploybundle.sh
index 5ab56eb6..a889b06f 100755
--- a/ci/01-deploybundle.sh
+++ b/ci/01-deploybundle.sh
@@ -33,19 +33,22 @@ esac
if [ -e ~/.juju/deployment.yaml ]; then
cp ~/.juju/deployment.yaml ./deployment.yaml
- cp ~/.juju/deployconfig.yaml ./deployconfig.yaml
- extport=`grep "ext-port" deployconfig.yaml | cut -d ' ' -f 4 | sed -e 's/ //'`
- sed --i "s@#ext-port: \"eth1\"@ext-port: \"$extport\"@g" ./bundles.yaml
+ if [ -e ~/.juju/deployment.yaml ]; then
+ cp ~/.juju/deployconfig.yaml ./deployconfig.yaml
- datanet=`grep "dataNetwork" deployconfig.yaml | cut -d ' ' -f 4 | sed -e 's/ //'`
- sed --i "s@#os-data-network: 10.4.8.0/21@os-data-network: $datanet@g" ./bundles.yaml
+ extport=`grep "ext-port" deployconfig.yaml | cut -d ' ' -f 4 | sed -e 's/ //'`
+ sed --i "s@#ext-port: \"eth1\"@ext-port: \"$extport\"@g" ./bundles.yaml
- admnet=`grep "admNetwork" deployconfig.yaml | cut -d ' ' -f 4 | sed -e 's/ //'`
- sed --i "s@10.4.1.1@$admnet@g" ./bundles.yaml
+ datanet=`grep "dataNetwork" deployconfig.yaml | cut -d ' ' -f 4 | sed -e 's/ //'`
+ sed --i "s@#os-data-network: 10.4.8.0/21@os-data-network: $datanet@g" ./bundles.yaml
- cephdisk=`grep "disk" deployconfig.yaml | cut -d ':' -f 2 | sed -e 's/ //'`
- sed --i "s@osd-devices: /srv@osd-devices: $cephdisk@g" ./bundles.yaml
+ admnet=`grep "admNetwork" deployconfig.yaml | cut -d ' ' -f 4 | sed -e 's/ //'`
+ sed --i "s@10.4.1.1@$admnet@g" ./bundles.yaml
+
+ cephdisk=`grep "disk" deployconfig.yaml | cut -d ':' -f 2 | sed -e 's/ //'`
+ sed --i "s@osd-devices: /srv@osd-devices: $cephdisk@g" ./bundles.yaml
+ fi
fi
case "$3" in
diff --git a/ci/02-maasdeploy.sh b/ci/02-maasdeploy.sh
index 4d3fdb03..e7f9e8dc 100755
--- a/ci/02-maasdeploy.sh
+++ b/ci/02-maasdeploy.sh
@@ -183,7 +183,10 @@ sed --i "s@/home/ubuntu@$HOME@g" ./deployment.yaml
sed --i "s@qemu+ssh://ubuntu@qemu+ssh://$USER@g" ./deployment.yaml
cp ./deployment.yaml ~/.juju/
-cp ./deployconfig.yaml ~/.juju/
+
+if [ -e ./deployconfig.yaml ]; then
+ cp ./deployconfig.yaml ~/.juju/
+fi
sudo maas-deployer -c deployment.yaml -d --force
diff --git a/ci/nosdn/juju-deployer/scripts/cloud-setup.sh b/ci/nosdn/juju-deployer/scripts/cloud-setup.sh
index de0dd764..8e82ef7d 100755
--- a/ci/nosdn/juju-deployer/scripts/cloud-setup.sh
+++ b/ci/nosdn/juju-deployer/scripts/cloud-setup.sh
@@ -37,3 +37,6 @@ while [ $i -ne 10 ]; do
i=$((i + 1))
done
+#http://docs.openstack.org/juno/install-guide/install/apt/content/launch-instance-neutron.html
+# nova boot --flavor m1.small --image cirros-0.3.3-x86_64 --nic net-id=b65479a4-3638-4595-9245-6e41ccd8bfd8 --security-group default --key-name ubuntu-keypair demo-instance1
+# nova floating-ip-associate demo-instance1 10.5.8.35
diff --git a/ci/odl/juju-deployer/scripts/cloud-setup.sh b/ci/odl/juju-deployer/scripts/cloud-setup.sh
index 184cecc6..a997d3de 100755
--- a/ci/odl/juju-deployer/scripts/cloud-setup.sh
+++ b/ci/odl/juju-deployer/scripts/cloud-setup.sh
@@ -37,3 +37,6 @@ while [ $i -ne 10 ]; do
i=$((i + 1))
done
+#http://docs.openstack.org/juno/install-guide/install/apt/content/launch-instance-neutron.html
+# nova boot --flavor m1.small --image cirros-0.3.3-x86_64 --nic net-id=b65479a4-3638-4595-9245-6e41ccd8bfd8 --security-group default --key-name ubuntu-keypair demo-instance1
+# nova floating-ip-associate demo-instance1 10.5.8.35
diff --git a/ci/onos/juju-deployer/scripts/cloud-setup.sh b/ci/onos/juju-deployer/scripts/cloud-setup.sh
index 184cecc6..8a912883 100644
--- a/ci/onos/juju-deployer/scripts/cloud-setup.sh
+++ b/ci/onos/juju-deployer/scripts/cloud-setup.sh
@@ -37,3 +37,7 @@ while [ $i -ne 10 ]; do
i=$((i + 1))
done
+#http://docs.openstack.org/juno/install-guide/install/apt/content/launch-instance-neutron.html
+# nova boot --flavor m1.small --image cirros-0.3.3-x86_64 --nic net-id=b65479a4-3638-4595-9245-6e41ccd8bfd8 --security-group default --key-name ubuntu-keypair demo-instance1
+# nova floating-ip-associate demo-instance1 10.5.8.35
+
diff --git a/ci/opencontrail/juju-deployer/scripts/cloud-setup.sh b/ci/opencontrail/juju-deployer/scripts/cloud-setup.sh
index 47e625c9..fab347cf 100755
--- a/ci/opencontrail/juju-deployer/scripts/cloud-setup.sh
+++ b/ci/opencontrail/juju-deployer/scripts/cloud-setup.sh
@@ -27,3 +27,7 @@ neutron security-group-rule-create --direction ingress --ethertype IPv4 --protoc
# import key pair
nova keypair-add --pub-key id_rsa.pub ubuntu-keypair
+
+#http://docs.openstack.org/juno/install-guide/install/apt/content/launch-instance-neutron.html
+# nova boot --flavor m1.small --image cirros-0.3.3-x86_64 --nic net-id=b65479a4-3638-4595-9245-6e41ccd8bfd8 --security-group default --key-name ubuntu-keypair demo-instance1
+# nova floating-ip-associate demo-instance1 10.5.8.35
diff --git a/labconfig/default/deployment.yaml b/labconfig/default/deployment.yaml
index dacd5879..29e2d2a6 100644
--- a/labconfig/default/deployment.yaml
+++ b/labconfig/default/deployment.yaml
@@ -61,7 +61,7 @@ demo-maas:
# Defines the IP Address that the configuration script will use to
# to access the MAAS controller via SSH.
- ip_address: 192.168.122.2
+ ip_address: 192.168.122.5
# This section allows the user to set a series of options on the
# MAAS server itself. The list of config options can be found in
@@ -91,7 +91,7 @@ demo-maas:
auto eth0
iface eth0 inet static
- address 192.168.122.2
+ address 192.168.122.5
netmask 255.255.255.0
network 192.168.122.0
broadcast 192.168.122.255
@@ -120,11 +120,11 @@ demo-maas:
broadcast_ip: 192.168.122.255
router_ip: 192.168.122.1
static_range:
- low: 192.168.122.101
- high: 192.168.122.200
+ low: 192.168.122.50
+ high: 192.168.122.80
dynamic_range:
- low: 192.168.122.25
- high: 192.168.122.100
+ low: 192.168.122.81
+ high: 192.168.122.250
# Physical nodes to be added to the MAAS cluster. Nodes will be
# configured, commissioned and put into the Ready state so