summaryrefslogtreecommitdiffstats
path: root/ci
diff options
context:
space:
mode:
authorNarinder Gupta <narinder.gupta@canonical.com>2016-06-06 15:19:31 -0500
committerNarinder Gupta <narinder.gupta@canonical.com>2016-06-07 01:10:42 -0500
commitaca4784eacb9b27e8640b90af3edbebea96aa39f (patch)
tree5680843411f98ffb6a97d2b2940cf0b8bb4293a5 /ci
parentcb56a154c5bd3817af14eaddfb7b45b76b6dc30a (diff)
added the labconfig file for att virpod1. Remove the mac
as it gateway br-ex was not configured with MAC. Change-Id: I32769c8d03dded073889a08d364c7bd3936880d3 Signed-off-by: Narinder Gupta <narinder.gupta@canonical.com>
Diffstat (limited to 'ci')
-rwxr-xr-xci/01-deploybundle.sh11
-rwxr-xr-xci/02-maasdeploy.sh6
-rwxr-xr-xci/deploy.sh4
-rw-r--r--ci/maas/att/virpod1/deployment.yaml126
-rw-r--r--ci/nosdn/juju-deployer/ovs-nosdn-ha.yaml1
-rw-r--r--ci/nosdn/juju-deployer/ovs-nosdn-nonha.yaml1
-rw-r--r--ci/nosdn/juju-deployer/ovs-nosdn-tip.yaml1
-rw-r--r--ci/odl/juju-deployer/ovs-odl-ha.yaml1
-rw-r--r--ci/odl/juju-deployer/ovs-odl-nonha.yaml1
-rw-r--r--ci/odl/juju-deployer/ovs-odl-tip.yaml1
-rwxr-xr-xci/openstack.sh10
11 files changed, 17 insertions, 146 deletions
diff --git a/ci/01-deploybundle.sh b/ci/01-deploybundle.sh
index 7aceab34..660db5bd 100755
--- a/ci/01-deploybundle.sh
+++ b/ci/01-deploybundle.sh
@@ -41,7 +41,9 @@ if [ -e ~/.juju/deployment.yaml ]; then
sed --i "s@#ext-port: \"eth1\"@ext-port: \"$extport\"@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
+ if [ -z "$datanet" ]
+ sed --i "s@#os-data-network: 10.4.8.0/21@os-data-network: $datanet@g" ./bundles.yaml
+ fi
admnet=`grep "admNetwork" deployconfig.yaml | cut -d ' ' -f 4 | sed -e 's/ //'`
sed --i "s@10.4.1.1@$admnet@g" ./bundles.yaml
@@ -52,12 +54,6 @@ if [ -e ~/.juju/deployment.yaml ]; then
fi
case "$3" in
- 'attvirpod1' )
- # As per your lab vip address list be deafult uses 10.4.1.11 - 10.4.1.20
- sed -i -- 's/10.4.1.1/192.168.10.1/g' ./bundles.yaml
- # Choose the external port to go out from gateway to use.
- sed -i -- 's/#ext-port: "eth1"/ext-port: "eth1"/g' ./bundles.yaml
- ;;
'cengnlynxpod1' )
# Chose the hard drive(s) to use for CEPH OSD
sed -i -- 's|osd-devices: /srv|osd-devices: /dev/sdb|g' ./bundles.yaml
@@ -134,4 +130,3 @@ esac
echo "... Deployment Started ...."
juju-deployer -vW -d -t 3600 -c bundles.yaml $6-"$2"-nodes
juju-deployer -vW -d -t 7200 -r 5 -c bundles.yaml $6-"$2"
-
diff --git a/ci/02-maasdeploy.sh b/ci/02-maasdeploy.sh
index e7f9e8dc..839d29f4 100755
--- a/ci/02-maasdeploy.sh
+++ b/ci/02-maasdeploy.sh
@@ -67,7 +67,9 @@ else
python deploy.py
;;
'attvirpod1' )
- cp maas/att/virpod1/deployment.yaml ./deployment.yaml
+ cp ../labconfig/att/virpod1/labconfig.yaml ./
+ #to be removed later once converted for all labs.
+ python deploy.py
;;
'juniperpod1' )
cp maas/juniper/pod1/deployment.yaml ./deployment.yaml
@@ -269,7 +271,7 @@ case "$labname" in
enableautomode eth3 AUTO "192.168.12.0/24" || true
;;
'attvirpod1' )
- enableautomodebyname eth1 AUTO "192.168.10.0/24" control || true
+ enableautomode eth1 AUTO "192.168.10.0/24" || true
;;
'juniperpod1' )
;;
diff --git a/ci/deploy.sh b/ci/deploy.sh
index a698ad1d..31d435b4 100755
--- a/ci/deploy.sh
+++ b/ci/deploy.sh
@@ -189,6 +189,10 @@ echo "...... deployment started ......"
#deploy_dep
deploy
check_status
+
+#create the basic dayta for verification of stack.
+./openstack.sh
+
echo "...... deployment finished ......."
echo "...... creating OpenRc file for consuming by various user ......."
diff --git a/ci/maas/att/virpod1/deployment.yaml b/ci/maas/att/virpod1/deployment.yaml
deleted file mode 100644
index f03031fe..00000000
--- a/ci/maas/att/virpod1/deployment.yaml
+++ /dev/null
@@ -1,126 +0,0 @@
-# This file defines the deployment for the MAAS environment which is to be
-# deployed and automated.
-demo-maas:
- maas:
- # Defines the general setup for the MAAS environment, including the
- # username and password for the host as well as the MAAS server.
- user: ubuntu
- password: ubuntu
-
- # Contains the virtual machine parameters for creating the MAAS virtual
- # server. Here you can configure the name of the virsh domain, the
- # parameters for how the network is attached.
- name: opnfv-maas-att
- interfaces: ['bridge=brAdm,model=virtio']
- memory: 4096
- vcpus: 2
- arch: amd64
- pool: default
- disk_size: 160G
-
- # Apt http proxy setting(s)
- apt_http_proxy:
-
- apt_sources:
- - ppa:maas/stable
- - ppa:juju/stable
-
- # Virsh power settings
- # Specifies the uri and keys to use for virsh power control of the
- # juju virtual machine. If the uri is omitted, the value for the
- # --remote is used. If no power settings are desired, then do not
- # supply the virsh block.
- virsh:
- rsa_priv_key: /home/ubuntu/.ssh/id_rsa
- rsa_pub_key: /home/ubuntu/.ssh/id_rsa.pub
- uri: qemu+ssh://ubuntu@192.168.10.2/system
-
- # Defines the IP Address that the configuration script will use to
- # to access the MAAS controller via SSH.
- ip_address: 192.168.10.3
-
- # 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
- # the upstream MAAS documentation:
- # - http://maas.ubuntu.com/docs/api.html#maas-server
- settings:
- main_archive: http://us.archive.ubuntu.com/ubuntu
- upstream_dns: 8.8.8.8
- maas_name: attvirpod1
- # kernel_opts: "console=tty0 console=ttyS1,115200n8"
- # ntp_server: ntp.ubuntu.com
-
- # This section is used to define the networking parameters for when
- # the node first comes up. It is fed into the meta-data cloud-init
- # configuration and is used to configure the networking piece of the
- # service. The contents of this section are written directly to the
- # /etc/network/interfaces file.
- #
- # Please note, this is slightly different than the
- # node-group-interfaces section below. This will configure the
- # machine's networking params, and the node-group-interfaces will
- # configure the maas node-group interfaces which is used for
- # controlling the dhcp, dns, etc.
- network_config: |
- auto lo
- iface lo inet loopback
-
- auto eth0
- iface eth0 inet static
- address 192.168.10.3
- netmask 255.255.255.0
- network 192.168.10.0
- broadcast 192.168.10.255
- gateway 192.168.10.1
- dns-nameservers 8.8.8.8 127.0.0.1
-
- # The node-group-interfaces section is used to configure the MAAS
- # network interfaces. Basic configuration is supported, such as which
- # device should be bound, the range of IP addresses, etc.
- # Note: this may contain the special identifiers:
- # ${maas_net} - the first 3 octets of the ipv4 address
- # ${maas_ip} - the ip address of the MAAS controller
- node_group_ifaces:
- - device: eth0
- ip: 192.168.10.3
- subnet_mask: 255.255.255.0
- broadcast_ip: 192.168.10.255
- router_ip: 192.168.10.1
- static_range:
- low: 192.168.10.20
- high: 192.168.10.100
- dynamic_range:
- low: 192.168.10.101
- high: 192.168.10.200
-
- # Defines the physical nodes which are added to the MAAS cluster
- # controller upon startup of the node.
- nodes:
- - name: node1-control
- tags: control
- architecture: amd64/generic
- mac_addresses:
- - "<controller1-mac>"
- power:
- type: ether_wake
- mac_address: <controller1-mac>
-
- - name: node2-compute
- tags: compute
- architecture: amd64/generic
- mac_addresses:
- - "<compute1-mac>"
- power:
- type: ether_wake
- mac_address: <compute1-mac>
-
- # Contains the virtual machine parameters for creating the Juju bootstrap
- # node virtual machine
- juju-bootstrap:
- name: bootstrap
- interfaces: ['bridge=brAdm,model=virtio']
- memory: 4096
- vcpus: 2
- arch: amd64
- pool: default
- disk_size: 120G
diff --git a/ci/nosdn/juju-deployer/ovs-nosdn-ha.yaml b/ci/nosdn/juju-deployer/ovs-nosdn-ha.yaml
index 5329f72b..856fc9d7 100644
--- a/ci/nosdn/juju-deployer/ovs-nosdn-ha.yaml
+++ b/ci/nosdn/juju-deployer/ovs-nosdn-ha.yaml
@@ -12,7 +12,6 @@ trusty-mitaka:
#prefer-ipv6: true
#enable-dvr: true
#l2-population: true
- #ext-port: "eth1"
region: Canonical
#source: "cloud:trusty-mitaka"
openstack-origin: "cloud:trusty-mitaka"
diff --git a/ci/nosdn/juju-deployer/ovs-nosdn-nonha.yaml b/ci/nosdn/juju-deployer/ovs-nosdn-nonha.yaml
index fa2a24be..3601d2c5 100644
--- a/ci/nosdn/juju-deployer/ovs-nosdn-nonha.yaml
+++ b/ci/nosdn/juju-deployer/ovs-nosdn-nonha.yaml
@@ -12,7 +12,6 @@ trusty-mitaka:
#prefer-ipv6: true
#enable-dvr: true
#l2-population: true
- #ext-port: "eth1"
region: Canonical
#source: "cloud:trusty-mitaka"
openstack-origin: "cloud:trusty-mitaka"
diff --git a/ci/nosdn/juju-deployer/ovs-nosdn-tip.yaml b/ci/nosdn/juju-deployer/ovs-nosdn-tip.yaml
index 03e24ca1..6ae2fc20 100644
--- a/ci/nosdn/juju-deployer/ovs-nosdn-tip.yaml
+++ b/ci/nosdn/juju-deployer/ovs-nosdn-tip.yaml
@@ -12,7 +12,6 @@ trusty-mitaka:
#prefer-ipv6: true
#enable-dvr: true
#l2-population: true
- #ext-port: "eth1"
region: Canonical
#source: "cloud:trusty-mitaka"
openstack-origin: "cloud:trusty-mitaka"
diff --git a/ci/odl/juju-deployer/ovs-odl-ha.yaml b/ci/odl/juju-deployer/ovs-odl-ha.yaml
index e33fa8ec..73a8b3f0 100644
--- a/ci/odl/juju-deployer/ovs-odl-ha.yaml
+++ b/ci/odl/juju-deployer/ovs-odl-ha.yaml
@@ -13,7 +13,6 @@ trusty-mitaka:
#prefer-ipv6: true
#enable-dvr: true
#l2-population: true
- #ext-port: "eth1"
region: Canonical
#source: "cloud:trusty-mitaka"
openstack-origin: "cloud:trusty-mitaka"
diff --git a/ci/odl/juju-deployer/ovs-odl-nonha.yaml b/ci/odl/juju-deployer/ovs-odl-nonha.yaml
index ae3be75e..4c52b991 100644
--- a/ci/odl/juju-deployer/ovs-odl-nonha.yaml
+++ b/ci/odl/juju-deployer/ovs-odl-nonha.yaml
@@ -12,7 +12,6 @@ trusty-mitaka:
#prefer-ipv6: true
#enable-dvr: true
#l2-population: true
- #ext-port: "eth1"
region: Canonical
#source: "cloud:trusty-mitaka"
openstack-origin: "cloud:trusty-mitaka"
diff --git a/ci/odl/juju-deployer/ovs-odl-tip.yaml b/ci/odl/juju-deployer/ovs-odl-tip.yaml
index 9034fea9..c01dad15 100644
--- a/ci/odl/juju-deployer/ovs-odl-tip.yaml
+++ b/ci/odl/juju-deployer/ovs-odl-tip.yaml
@@ -12,7 +12,6 @@ trusty-mitaka:
#prefer-ipv6: true
#enable-dvr: true
#l2-population: true
- #ext-port: "eth1"
region: Canonical
#source: "cloud:trusty-mitaka"
openstack-origin: "cloud:trusty-mitaka"
diff --git a/ci/openstack.sh b/ci/openstack.sh
index 5f9a3a4c..89194ded 100755
--- a/ci/openstack.sh
+++ b/ci/openstack.sh
@@ -1,4 +1,4 @@
-#!/bin/sh -ex
+#!/bin/bash -ex
##############################################################################
# All rights reserved. This program and the accompanying materials
@@ -63,15 +63,17 @@ keystone user-create --name demo --tenant demo --pass demo --email demo@demo.dem
nova keypair-add --pub-key ~/.ssh/id_rsa.pub ubuntu-keypair
# configure external network
-neutron net-create ext-net --router:external --provider:physical_network external --provider:network_type flat
+neutron net-create ext-net --shared --router:external --provider:physical_network external --provider:network_type flat
##
## Parse Network config
##
EXTERNAL_NETWORK=`grep floating-ip-range deployconfig.yaml | cut -d ' ' -f 4 `
+
# split EXTERNAL_NETWORK=first ip;last ip; gateway;network
-IFS=',' read -r -a EXTNET <<< "$EXTERNAL_NETWORK"
+
+EXTNET=(${EXTERNAL_NETWORK//,/ })
EXTNET_FIP=${EXTNET[0]}
EXTNET_LIP=${EXTNET[1]}
@@ -94,7 +96,7 @@ neutron router-gateway-set demo-router ext-net
# create pool of floating ips
i=0
-while [ $i -ne 10 ]; do
+while [ $i -ne 5 ]; do
neutron floatingip-create ext-net
i=$((i + 1))
done