summaryrefslogtreecommitdiffstats
path: root/ci
diff options
context:
space:
mode:
Diffstat (limited to 'ci')
-rwxr-xr-xci/maas/intel/pod6/deployment.yaml34
-rwxr-xr-xci/odl/01-deploybundle.sh6
-rw-r--r--ci/odl/juju-deployer/ovs-odl-ha.yaml119
-rw-r--r--ci/opencontrail/juju-deployer/contrail.yaml3
4 files changed, 102 insertions, 60 deletions
diff --git a/ci/maas/intel/pod6/deployment.yaml b/ci/maas/intel/pod6/deployment.yaml
index 37395a7b..74c1a004 100755
--- a/ci/maas/intel/pod6/deployment.yaml
+++ b/ci/maas/intel/pod6/deployment.yaml
@@ -11,7 +11,7 @@ demo-maas:
# server. Here you can configure the name of the virsh domain, the
# parameters for how the network is attached.
name: opnfv-maas-intel
- interfaces: ['bridge=br0,model=virtio']
+ interfaces: ['bridge=brAdm,model=virtio', 'bridge=brData,model=virtio', 'bridge=brPublic,model=virtio']
memory: 4096
vcpus: 2
arch: amd64
@@ -74,6 +74,16 @@ demo-maas:
gateway 10.4.0.1
dns-nameservers 10.4.0.2 127.0.0.1
+ auto eth1
+ iface eth1 inet static
+ address 10.4.9.2
+ netmask 255.255.248.0
+
+# auto eth2
+# iface eth2 inet static
+# address 10.2.66.3
+# netmask 255.255.255.0
+
#auto lo
#iface lo inet loopback
@@ -104,6 +114,26 @@ demo-maas:
dynamic_range:
low: 10.4.1.50
high: 10.4.1.254
+# - device: eth1
+# ip: 10.4.9.2
+# subnet_mask: 255.255.248.0
+# broadcast_ip: 10.4.15.255
+# static_range:
+# low: 10.4.9.20
+# high: 10.4.9.150
+# dynamic_range:
+# low: 10.4.9.151
+# high: 10.4.9.200
+# - device: eth2
+# ip: 10.2.66.3
+# subnet_mask: 255.255.255.0
+# broadcast_ip: 10.2.66.255
+# static_range:
+# low: 10.2.66.20
+# high: 10.2.66.150
+# dynamic_range:
+# low: 10.2.66.151
+# high: 10.2.66.200
# Defines the physical nodes which are added to the MAAS cluster
# controller upon startup of the node.
@@ -211,7 +241,7 @@ demo-maas:
# node virtual machine
juju-bootstrap:
name: bootstrap
- interfaces: ['bridge=br0,model=virtio']
+ interfaces: ['bridge=brAdm,model=virtio', 'bridge=brData,model=virtio', 'bridge=brPublic,model=virtio']
memory: 4096
vcpus: 2
arch: amd64
diff --git a/ci/odl/01-deploybundle.sh b/ci/odl/01-deploybundle.sh
index 82d22883..059afbcb 100755
--- a/ci/odl/01-deploybundle.sh
+++ b/ci/odl/01-deploybundle.sh
@@ -23,9 +23,11 @@ case "$3" in
;;
'intelpod6' )
sed -i -- 's/10.4.1.1/10.4.1.2/g' ./bundles.yaml
+ sed -i -- 's/#os-data-network/os-data-network/g' ./bundles.yaml
;;
'intelpod5' )
sed -i -- 's/10.4.1.1/10.4.1.2/g' ./bundles.yaml
+ sed -i -- 's/#os-data-network/os-data-network/g' ./bundles.yaml
;;
esac
@@ -35,9 +37,9 @@ case "$1" in
juju-deployer -vW -d -c bundles.yaml trusty-"$2"
;;
'ha' )
- juju-deployer -vW -d -c bundles.yaml openstack-phase1
juju-deployer -vW -d -c bundles.yaml trusty-"$2"-nodes
- juju-deployer -vW -d -c bundles.yaml openstack-phase3
+ juju run --service nodes-api 'sudo ifup eth1'
+ juju run --service nodes-coompute 'sudo ifup eth1'
juju-deployer -vW -d -c bundles.yaml trusty-"$2"
;;
'tip' )
diff --git a/ci/odl/juju-deployer/ovs-odl-ha.yaml b/ci/odl/juju-deployer/ovs-odl-ha.yaml
index e154cf9f..35372d68 100644
--- a/ci/odl/juju-deployer/ovs-odl-ha.yaml
+++ b/ci/odl/juju-deployer/ovs-odl-ha.yaml
@@ -8,7 +8,7 @@ openstack-phase1:
constraints: tags=control
nodes-compute:
branch: "lp:charms/trusty/ubuntu"
- num_units: 2
+ num_units: 1
constraints: tags=compute
"ntp":
charm: "cs:trusty/ntp"
@@ -19,7 +19,6 @@ openstack-phase1:
- "nodes-compute:juju-info"
openstack-phase2:
inherits: openstack-phase1
-# overrides:
services:
"percona-cluster":
charm: "cs:trusty/percona-cluster"
@@ -35,6 +34,31 @@ openstack-phase2:
- "lxc:nodes-api=0"
- "lxc:nodes-api=1"
- "lxc:nodes-api=2"
+ "hacluster-keystone":
+ charm: "cs:trusty/hacluster"
+ options:
+ corosync_key: |
+ 'QisjNpoKHLkvyc3PEdDHP5VZjgD0kOk9t0ABPWmCELlu5AgWgnW6bJd34BVXO7VhW+3ZwNQM3W+bZ3pl28ftY4ki4N/S0KLFNia5egFgiA3AH2QXLnokS7OYXuu6GMJJ1S5mDe6P5zU+tfJe/Mebq24u7CgR0gAvohSPRdDTwdY='
+ "hacluster-horizon":
+ charm: "cs:trusty/hacluster"
+ options:
+ corosync_key: |
+ 'aCVPHw6XYne+Hxv0WPiM3+yEfeIxs0Ly0EMKB494Rdzjf5rE52GcXqqxuvIa/nXJ4GCR+UdKk9FEwcASfYkeu3HDWUld9uTE6pOc+ibWYnybNH7VBfEHW8h9YmQKs3HD2T3wlTcS2irU4CUW7/IKNok4etYdM3iFn1K2ReSGXEI='
+ "hacluster-nova":
+ charm: "cs:trusty/hacluster"
+ options:
+ corosync_key: |
+ 'gel86qmEze8dYKYbfqIgRpqapJpKtdYL2hxC1y5nWYBPq7EMf6V8mF01IjeUkSRs14CUDrsPpT4PWeom7EOY2fleuLx/aIuqQUfEDkhf/gvaz7BaU4hrmTCoDBK7/HvEwY+/wu4qkEeckzSRPsm9MYzqnLRshh8yjZJ70xU/mmk='
+ "hacluster-neutron":
+ charm: "cs:trusty/hacluster"
+ options:
+ corosync_key: |
+ 'KNhb4++3jlllbnscS5D3qdzOJDsQPEeZ7zOLZJHbkKrRjX9gRCijVVOiv2JCvq03HqQ7LIufQzWGl9Za8qh0f6QmQ3XhFh/Cb/3WaYFj+tEf0zArWv+8miswmM1z4eyTSrTWBq0dTgx1z96wjBxP5HV0+1LWW+3Ei4oZWyRGeR0='
+ "hacluster-glance":
+ charm: "cs:trusty/hacluster"
+ options:
+ corosync_key: |
+ 'el1dd8107J5mwQDPS7tEJPZrr0XFfL95+Tku/QG90W5Q5f5SP4W8TRfKvddGmZWZl2lVd1neG5WqaHa1mq/aScJpoflzVAJCvshN7Gd2AjHhLNNugeI8S90j/7wrKUhqiCAlkKaeri2xs5bB5PZ7Z9AHuNZL7SW1al8lxrKhUFI='
"rabbitmq-server":
charm: "cs:trusty/rabbitmq-server"
num_units: 3
@@ -67,18 +91,18 @@ openstack-phase2:
- "lxc:nodes-api=1"
- "lxc:nodes-api=2"
"nova-compute":
- charm: "cs:trusty/nova-compute"
- num_units: 2
+ branch: "lp:~openstack-charmers/charms/trusty/nova-compute/next"
+ num_units: 4
options:
"enable-live-migration": true
"enable-resize": true
"migration-auth-type": ssh
to:
- "nodes-compute=0"
- - "nodes-compute=1"
-# - "nodes-api=0"
-# - "nodes-api=1"
-# - "nodes-api=2"
+# - "nodes-compute=1"
+ - "nodes-api=0"
+ - "nodes-api=1"
+ - "nodes-api=2"
"nova-cloud-controller":
charm: "cs:trusty/nova-cloud-controller"
num_units: 3
@@ -104,18 +128,22 @@ openstack-phase2:
- "lxc:nodes-api=1"
- "lxc:nodes-api=2"
neutron-gateway:
- branch: lp:~sdn-charmers/charms/trusty/neutron-gateway/ovs-odl
+ branch: lp:~narindergupta/charms/trusty/neutron-gateway/ovs-odl
+# num_units: 3
# constraints: tags=gateway
options:
# "ext-port": eth1
plugin: ovs-odl
# instance-mtu: 1400
- to: nodes-api=0
+ to:
+ - "nodes-api=0"
odl-controller:
- branch: lp:~sdn-charmers/charms/trusty/odl-controller/trunk
+ branch: lp:~narindergupta/charms/trusty/odl-controller/liberty
options:
install-url: "https://nexus.opendaylight.org/content/groups/public/org/opendaylight/integration/distribution-karaf/0.2.4-Helium-SR4/distribution-karaf-0.2.4-Helium-SR4.tar.gz"
- to: lxc:nodes-api=1
+ # to: lxc:nodes-api=1
+ to:
+ - "nodes-api=0"
"glance":
charm: "cs:trusty/glance"
num_units: 3
@@ -126,42 +154,12 @@ openstack-phase2:
- "lxc:nodes-api=1"
- "lxc:nodes-api=2"
neutron-api-odl:
- branch: lp:~openstack-charmers/charms/trusty/neutron-api-odl/vpp
+ branch: lp:~narindergupta/charms/trusty/neutron-api-odl/liberty
options:
overlay-network-type: 'vxlan gre'
security-groups: true
openvswitch-odl:
- branch: lp:~alai/charms/trusty/openvswitch-odl/trunk
-openstack-phase3:
- inherits: openstack-phase2
- overrides:
- cluster_count: 3
- services:
- "hacluster-keystone":
- charm: "cs:trusty/hacluster"
- options:
- corosync_key: |
- 'QisjNpoKHLkvyc3PEdDHP5VZjgD0kOk9t0ABPWmCELlu5AgWgnW6bJd34BVXO7VhW+3ZwNQM3W+bZ3pl28ftY4ki4N/S0KLFNia5egFgiA3AH2QXLnokS7OYXuu6GMJJ1S5mDe6P5zU+tfJe/Mebq24u7CgR0gAvohSPRdDTwdY='
- "hacluster-horizon":
- charm: "cs:trusty/hacluster"
- options:
- corosync_key: |
- 'aCVPHw6XYne+Hxv0WPiM3+yEfeIxs0Ly0EMKB494Rdzjf5rE52GcXqqxuvIa/nXJ4GCR+UdKk9FEwcASfYkeu3HDWUld9uTE6pOc+ibWYnybNH7VBfEHW8h9YmQKs3HD2T3wlTcS2irU4CUW7/IKNok4etYdM3iFn1K2ReSGXEI='
- "hacluster-nova":
- charm: "cs:trusty/hacluster"
- options:
- corosync_key: |
- 'gel86qmEze8dYKYbfqIgRpqapJpKtdYL2hxC1y5nWYBPq7EMf6V8mF01IjeUkSRs14CUDrsPpT4PWeom7EOY2fleuLx/aIuqQUfEDkhf/gvaz7BaU4hrmTCoDBK7/HvEwY+/wu4qkEeckzSRPsm9MYzqnLRshh8yjZJ70xU/mmk='
- "hacluster-neutron":
- charm: "cs:trusty/hacluster"
- options:
- corosync_key: |
- 'KNhb4++3jlllbnscS5D3qdzOJDsQPEeZ7zOLZJHbkKrRjX9gRCijVVOiv2JCvq03HqQ7LIufQzWGl9Za8qh0f6QmQ3XhFh/Cb/3WaYFj+tEf0zArWv+8miswmM1z4eyTSrTWBq0dTgx1z96wjBxP5HV0+1LWW+3Ei4oZWyRGeR0='
- "hacluster-glance":
- charm: "cs:trusty/hacluster"
- options:
- corosync_key: |
- 'el1dd8107J5mwQDPS7tEJPZrr0XFfL95+Tku/QG90W5Q5f5SP4W8TRfKvddGmZWZl2lVd1neG5WqaHa1mq/aScJpoflzVAJCvshN7Gd2AjHhLNNugeI8S90j/7wrKUhqiCAlkKaeri2xs5bB5PZ7Z9AHuNZL7SW1al8lxrKhUFI='
+ branch: lp:~openstack-charmers/charms/trusty/openvswitch-odl/trunk
relations:
- - "glance:ha"
- "hacluster-glance:ha"
@@ -173,9 +171,6 @@ openstack-phase3:
- "hacluster-nova:ha"
- - "openstack-dashboard:ha"
- "hacluster-horizon:ha"
-openstack-phase4:
- inherits: openstack-phase3
- relations:
- - "nova-compute:amqp"
- "rabbitmq-server:amqp"
- - "neutron-gateway:amqp"
@@ -227,35 +222,49 @@ openstack-phase4:
- - "neutron-api-odl:odl-controller"
- "odl-controller:controller-api"
trusty-liberty-nodes:
+ inherits: openstack-phase1
+ overrides:
+ series: trusty
+
+trusty-liberty:
inherits: openstack-phase2
overrides:
-# os-data-network: 10.6.1.0/24
+ cluster_count: 3
+ #os-data-network: 10.4.8.0/21
region: Canonical
source: "cloud:trusty-liberty"
"openstack-origin": "cloud:trusty-liberty"
series: trusty
-trusty-liberty:
- inherits: openstack-phase4
-
trusty-kilo-nodes:
+ inherits: openstack-phase1
+ overrides:
+ series: trusty
+
+trusty-kilo:
inherits: openstack-phase2
overrides:
-# os-data-network: 10.6.1.0/24
+ cluster_count: 3
+ #os-data-network: 10.4.8.0/21
region: Canonical
source: "cloud:trusty-kilo"
"openstack-origin": "cloud:trusty-kilo"
series: trusty
-trusty-kilo:
- inherits: openstack-phase4
+
+trusty-juno-nodes:
+ inherits: openstack-phase1
+ overrides:
+ series: trusty
trusty-juno:
inherits: openstack-phase2
overrides:
-# os-data-network: 10.6.1.0/24
+ cluster_count: 3
+ #os-data-network: 10.4.8.0/21
region: Canonical
source: "cloud:trusty-juno"
"openstack-origin": "cloud:trusty-juno"
series: trusty
+
diff --git a/ci/opencontrail/juju-deployer/contrail.yaml b/ci/opencontrail/juju-deployer/contrail.yaml
index 1601674f..2f1d29c0 100644
--- a/ci/opencontrail/juju-deployer/contrail.yaml
+++ b/ci/opencontrail/juju-deployer/contrail.yaml
@@ -93,9 +93,10 @@ contrail:
services:
cassandra:
branch: lp:~stub/charms/trusty/cassandra/noauthentication
+ to:
+ - "lxc:ubuntu=0"
options:
authenticator: AllowAllAuthenticator
- - "lxc:ubuntu=0"
zookeeper:
branch: lp:~charmers/charms/precise/zookeeper/trunk