From 6635edf1ab2858d2a8b058450aecad6a9d9c5d88 Mon Sep 17 00:00:00 2001 From: Narinder Gupta Date: Fri, 10 Jun 2016 08:09:50 -0500 Subject: [PATCH] modfied to include the congress charm which is part of OPNFV bundle now. Change-Id: Ifd91c3af7985cbc0ea5e4f4c08bbcdcec8ea3ba9 Signed-off-by: Narinder Gupta --- ci/nosdn/juju-deployer/ovs-nosdn-ha.yaml | 12 +++++++++ ci/nosdn/juju-deployer/ovs-nosdn-nonha.yaml | 2 +- ci/nosdn/juju-deployer/ovs-nosdn-tip.yaml | 12 +++++++++ ci/odl/juju-deployer/ovs-odl-ha.yaml | 12 +++++++++ ci/odl/juju-deployer/ovs-odl-nonha.yaml | 14 +++++++++- ci/odl/juju-deployer/ovs-odl-tip.yaml | 12 +++++++++ ci/onos/juju-deployer/ovs-onos-ha.yaml | 27 +++++++++++++------ ci/onos/juju-deployer/ovs-onos-nonha.yaml | 12 +++++++++ ci/onos/juju-deployer/ovs-onos-tip.yaml | 13 ++++++++- .../juju-deployer/ovs-opencontrail-ha.yaml | 31 +++++++++++++++------- .../juju-deployer/ovs-opencontrail-nonha.yaml | 12 +++++++++ .../juju-deployer/ovs-opencontrail-tip.yaml | 12 +++++++++ 12 files changed, 150 insertions(+), 21 deletions(-) diff --git a/ci/nosdn/juju-deployer/ovs-nosdn-ha.yaml b/ci/nosdn/juju-deployer/ovs-nosdn-ha.yaml index 662f190d..9eed91f3 100644 --- a/ci/nosdn/juju-deployer/ovs-nosdn-ha.yaml +++ b/ci/nosdn/juju-deployer/ovs-nosdn-ha.yaml @@ -137,6 +137,12 @@ openstack-phase2: - rabbitmq-server:amqp #- - nova-compute:lxd #- lxd:lxd + - - congress:shared-db + - mysql:shared-db + - - congress:identity-service + - keystone:identity-service + - - congress:amqp + - rabbitmq-server:amqp services: hacluster-keystone: @@ -336,3 +342,9 @@ openstack-phase2: charm: "local:trusty/heat" to: - "lxc:nodes=0" + congress: + charm: local:trusty/congress + options: + source-branch: stable/mitaka + to: + - "lxc:nodes=0" diff --git a/ci/nosdn/juju-deployer/ovs-nosdn-nonha.yaml b/ci/nosdn/juju-deployer/ovs-nosdn-nonha.yaml index db7474e8..48f69c17 100644 --- a/ci/nosdn/juju-deployer/ovs-nosdn-nonha.yaml +++ b/ci/nosdn/juju-deployer/ovs-nosdn-nonha.yaml @@ -266,6 +266,6 @@ openstack-phase2: congress: charm: local:trusty/congress options: - source-branch: stable/liberty + source-branch: stable/mitaka to: - "lxc:nodes=1" diff --git a/ci/nosdn/juju-deployer/ovs-nosdn-tip.yaml b/ci/nosdn/juju-deployer/ovs-nosdn-tip.yaml index 6ae2fc20..320b29e9 100644 --- a/ci/nosdn/juju-deployer/ovs-nosdn-tip.yaml +++ b/ci/nosdn/juju-deployer/ovs-nosdn-tip.yaml @@ -123,6 +123,12 @@ openstack-phase2: - "keystone:identity-service" #- - nova-compute:lxd #- lxd:lxd + - - congress:shared-db + - mysql:shared-db + - - congress:identity-service + - keystone:identity-service + - - congress:amqp + - rabbitmq-server:amqp services: mysql: charm: "local:trusty/percona-cluster" @@ -259,3 +265,9 @@ openstack-phase2: #default-socket-memory: 1024 #defualt-socket-cores: 1 #dpdk-driver: uio_pci_generic + congress: + charm: local:trusty/congress + options: + source-branch: stable/mitaka + to: + - "lxc:nodes=1" diff --git a/ci/odl/juju-deployer/ovs-odl-ha.yaml b/ci/odl/juju-deployer/ovs-odl-ha.yaml index 39864ffd..be59ff6d 100644 --- a/ci/odl/juju-deployer/ovs-odl-ha.yaml +++ b/ci/odl/juju-deployer/ovs-odl-ha.yaml @@ -145,6 +145,12 @@ openstack-phase2: - "keystone:identity-service" #- - nova-compute:lxd #- lxd:lxd + - - congress:shared-db + - mysql:shared-db + - - congress:identity-service + - keystone:identity-service + - - congress:amqp + - rabbitmq-server:amqp services: hacluster-keystone: charm: "local:trusty/hacluster" @@ -393,3 +399,9 @@ openstack-phase2: security-groups: True openvswitch-odl: charm: local:trusty/openvswitch-odl + congress: + charm: local:trusty/congress + options: + source-branch: stable/mitaka + to: + - "lxc:nodes=0" diff --git a/ci/odl/juju-deployer/ovs-odl-nonha.yaml b/ci/odl/juju-deployer/ovs-odl-nonha.yaml index fc9e9edd..d4ca6019 100644 --- a/ci/odl/juju-deployer/ovs-odl-nonha.yaml +++ b/ci/odl/juju-deployer/ovs-odl-nonha.yaml @@ -127,6 +127,12 @@ openstack-phase2: - "keystone:identity-service" #- - nova-compute:lxd #- lxd:lxd + - - congress:shared-db + - mysql:shared-db + - - congress:identity-service + - keystone:identity-service + - - congress:amqp + - rabbitmq-server:amqp services: mysql: charm: "local:trusty/percona-cluster" @@ -257,7 +263,7 @@ openstack-phase2: opnfv-promise: branch: lp:~narindergupta/charms/trusty/promise/trunk to: - - "lxc:nodes=1" + - "lxc:nodes=0" neutron-api-odl: charm: local:trusty/neutron-api-odl options: @@ -265,3 +271,9 @@ openstack-phase2: security-groups: True openvswitch-odl: charm: local:trusty/openvswitch-odl + congress: + charm: local:trusty/congress + options: + source-branch: stable/mitaka + to: + - "lxc:nodes=1" diff --git a/ci/odl/juju-deployer/ovs-odl-tip.yaml b/ci/odl/juju-deployer/ovs-odl-tip.yaml index ed34e932..67d2b239 100644 --- a/ci/odl/juju-deployer/ovs-odl-tip.yaml +++ b/ci/odl/juju-deployer/ovs-odl-tip.yaml @@ -129,6 +129,12 @@ openstack-phase2: - "keystone:identity-service" #- - nova-compute:lxd #- lxd:lxd + - - congress:shared-db + - mysql:shared-db + - - congress:identity-service + - keystone:identity-service + - - congress:amqp + - rabbitmq-server:amqp services: mysql: charm: "local:trusty/percona-cluster" @@ -273,3 +279,9 @@ openstack-phase2: security-groups: True openvswitch-odl: charm: local:trusty/openvswitch-odl + congress: + charm: local:trusty/congress + options: + source-branch: stable/mitaka + to: + - "lxc:nodes=0" diff --git a/ci/onos/juju-deployer/ovs-onos-ha.yaml b/ci/onos/juju-deployer/ovs-onos-ha.yaml index 0d7a2b9f..0f8bfa80 100644 --- a/ci/onos/juju-deployer/ovs-onos-ha.yaml +++ b/ci/onos/juju-deployer/ovs-onos-ha.yaml @@ -58,9 +58,9 @@ openstack-phase2: - - "neutron-api-onos:onos-controller" - "onos-controller:controller-api" - - "keystone:shared-db" - - "percona-cluster:shared-db" + - "mysql:shared-db" - - "nova-cloud-controller:shared-db" - - "percona-cluster:shared-db" + - "mysql:shared-db" - - "nova-cloud-controller:amqp" - "rabbitmq-server:amqp" - - "nova-cloud-controller:image-service" @@ -74,7 +74,7 @@ openstack-phase2: - - "nova-compute:image-service" - "glance:image-service" - - "glance:shared-db" - - "percona-cluster:shared-db" + - "mysql:shared-db" - - "glance:identity-service" - "keystone:identity-service" - - "glance:amqp" @@ -82,7 +82,7 @@ openstack-phase2: - - "openstack-dashboard:identity-service" - "keystone:identity-service" - - "neutron-api:shared-db" - - "percona-cluster:shared-db" + - "mysql:shared-db" - - "neutron-api:amqp" - "rabbitmq-server:amqp" - - "nova-cloud-controller:neutron-api" @@ -108,7 +108,7 @@ openstack-phase2: - - "ceilometer:shared-db" - "mongodb:database" - - "heat:shared-db" - - "percona-cluster:shared-db" + - "mysql:shared-db" - - "heat:identity-service" - "keystone:identity-service" - - "heat:amqp" @@ -126,7 +126,7 @@ openstack-phase2: - - "ceph:client" - "nova-compute:ceph" - - "cinder:shared-db" - - "percona-cluster:shared-db" + - "mysql:shared-db" - - "ceph:client" - "cinder-ceph:ceph" - - "ceph:client" @@ -139,7 +139,12 @@ openstack-phase2: - "keystone:identity-service" #- - nova-compute:lxd #- lxd:lxd - + - - congress:shared-db + - mysql:shared-db + - - congress:identity-service + - keystone:identity-service + - - congress:amqp + - rabbitmq-server:amqp services: hacluster-keystone: charm: "local:trusty/hacluster" @@ -171,7 +176,7 @@ openstack-phase2: options: corosync_key: | 'cHkgKGJpdHMgPSA5NjApLgpQcmVzcyBrZXlzIG9uIHlvdXIga2V5Ym9hcmQgdG8gZ2VuZXJhdGUgZW50cm9weSAoYml0cyA9IDEwMDgpLgpXcml0aW5nIGNvcm9zeW5jIGtleSB0byAvZXRjL2Nvcm9zeW5jL2F1dGhrZXkuCg==' - percona-cluster: + mysql: charm: "local:trusty/percona-cluster" num_units: 3 options: @@ -355,3 +360,9 @@ openstack-phase2: security-groups: True openvswitch-onos: charm: "local:trusty/openvswitch-onos" + congress: + charm: local:trusty/congress + options: + source-branch: stable/mitaka + to: + - "lxc:nodes=0" diff --git a/ci/onos/juju-deployer/ovs-onos-nonha.yaml b/ci/onos/juju-deployer/ovs-onos-nonha.yaml index 31a7e155..1f022c5f 100644 --- a/ci/onos/juju-deployer/ovs-onos-nonha.yaml +++ b/ci/onos/juju-deployer/ovs-onos-nonha.yaml @@ -127,6 +127,12 @@ openstack-phase2: - "keystone:identity-service" #- - nova-compute:lxd #- lxd:lxd + - - congress:shared-db + - mysql:shared-db + - - congress:identity-service + - keystone:identity-service + - - congress:amqp + - rabbitmq-server:amqp services: mysql: charm: "local:trusty/percona-cluster" @@ -261,3 +267,9 @@ openstack-phase2: security-groups: True openvswitch-onos: charm: "local:trusty/openvswitch-onos" + congress: + charm: local:trusty/congress + options: + source-branch: stable/mitaka + to: + - "lxc:nodes=0" diff --git a/ci/onos/juju-deployer/ovs-onos-tip.yaml b/ci/onos/juju-deployer/ovs-onos-tip.yaml index 8b4cd6dd..e574bcc6 100644 --- a/ci/onos/juju-deployer/ovs-onos-tip.yaml +++ b/ci/onos/juju-deployer/ovs-onos-tip.yaml @@ -125,7 +125,12 @@ openstack-phase2: - "keystone:identity-service" #- - nova-compute:lxd #- lxd:lxd - + - - congress:shared-db + - mysql:shared-db + - - congress:identity-service + - keystone:identity-service + - - congress:amqp + - rabbitmq-server:amqp services: mysql: charm: "local:trusty/percona-cluster" @@ -266,3 +271,9 @@ openstack-phase2: security-groups: True openvswitch-onos: charm: "local:trusty/openvswitch-onos" + congress: + charm: local:trusty/congress + options: + source-branch: stable/mitaka + to: + - "lxc:nodes=0" diff --git a/ci/opencontrail/juju-deployer/ovs-opencontrail-ha.yaml b/ci/opencontrail/juju-deployer/ovs-opencontrail-ha.yaml index 99936e76..7ea0576b 100644 --- a/ci/opencontrail/juju-deployer/ovs-opencontrail-ha.yaml +++ b/ci/opencontrail/juju-deployer/ovs-opencontrail-ha.yaml @@ -40,7 +40,7 @@ openstack-phase1: openstack-phase2: inherits: openstack-phase1 services: - percona-cluster: + mysql: branch: "lp:~openstack-charmers/charms/trusty/percona-cluster/next" num_units: 3 options: @@ -227,7 +227,13 @@ openstack-phase2: branch: lp:~narindergupta/charms/trusty/promise/trunk num_units: 1 to: - - "lxc:nodes-api=2" + - "lxc:nodes-api=0" + congress: + charm: local:trusty/congress + options: + source-branch: stable/mitaka + to: + - "lxc:nodes-api=0" relations: - [ "glance:ha", "hacluster-glance:ha" ] - [ "keystone:ha", "hacluster-keystone:ha" ] @@ -235,19 +241,19 @@ openstack-phase2: - [ "nova-cloud-controller:ha", "hacluster-nova:ha" ] - [ "openstack-dashboard:ha", "hacluster-horizon:ha" ] - [ "ceilometer:ha", "hacluster-ceilometer:ha" ] - - [ keystone, percona-cluster ] - - [ nova-cloud-controller, percona-cluster ] + - [ keystone, mysql ] + - [ nova-cloud-controller, mysql ] - [ nova-cloud-controller, rabbitmq-server ] - [ nova-cloud-controller, glance ] - [ nova-cloud-controller, keystone ] - [ nova-compute, nova-cloud-controller ] - - [ "nova-compute:shared-db", "percona-cluster:shared-db" ] + - [ "nova-compute:shared-db", "mysql:shared-db" ] - [ "nova-compute:amqp", "rabbitmq-server:amqp" ] - [ nova-compute, glance ] - - [ glance, percona-cluster ] + - [ glance, mysql ] - [ glance, keystone ] - [ openstack-dashboard, keystone ] - - [ neutron-api, percona-cluster ] + - [ neutron-api, mysql ] - [ neutron-api, rabbitmq-server ] - [ neutron-api, nova-cloud-controller ] - [ neutron-api, keystone ] @@ -258,7 +264,7 @@ openstack-phase2: - [ "ceilometer:identity-notifications", "keystone:identity-notifications" ] - [ "ceilometer-agent:nova-ceilometer", "nova-compute:nova-ceilometer" ] - [ "ceilometer:shared-db", "mongodb:database" ] - - [ "heat:shared-db", "percona-cluster:shared-db" ] + - [ "heat:shared-db", "mysql:shared-db" ] - [ "heat:identity-service", "keystone:identity-service" ] - [ "heat:amqp", "rabbitmq-server:amqp" ] - [ "cinder:image-service", "glance:image-service" ] @@ -267,13 +273,18 @@ openstack-phase2: - [ "cinder:cinder-volume-service", "nova-cloud-controller:cinder-volume-service" ] - [ "cinder-ceph:storage-backend", "cinder:storage-backend" ] - [ "ceph:client", "nova-compute:ceph" ] - - [ "cinder:shared-db", "percona-cluster:shared-db" ] + - [ "cinder:shared-db", "mysql:shared-db" ] - [ "ceph:client", "cinder-ceph:ceph" ] - [ "ceph:client", "glance:ceph" ] - [ "ceph-osd:mon", "ceph:osd" ] - [ "ceph-radosgw:mon", "ceph:radosgw" ] - [ "ceph-radosgw:identity-service", "keystone:identity-service" ] - + - - congress:shared-db + - mysql:shared-db + - - congress:identity-service + - keystone:identity-service + - - congress:amqp + - rabbitmq-server:amqp contrail: inherits: openstack-phase2 services: diff --git a/ci/opencontrail/juju-deployer/ovs-opencontrail-nonha.yaml b/ci/opencontrail/juju-deployer/ovs-opencontrail-nonha.yaml index 44d4bc8d..7ed715e5 100644 --- a/ci/opencontrail/juju-deployer/ovs-opencontrail-nonha.yaml +++ b/ci/opencontrail/juju-deployer/ovs-opencontrail-nonha.yaml @@ -153,6 +153,12 @@ openstack-phase2: num_units: 1 to: - "lxc:nodes-api=0" + congress: + charm: local:trusty/congress + options: + source-branch: stable/mitaka + to: + - "lxc:nodes-api=0" relations: - [ keystone, mysql ] - [ nova-cloud-controller, mysql ] @@ -192,6 +198,12 @@ openstack-phase2: - [ "ceph-osd:mon", "ceph:osd" ] - [ "ceph-radosgw:mon", "ceph:radosgw" ] - [ "ceph-radosgw:identity-service", "keystone:identity-service"] + - - congress:shared-db + - mysql:shared-db + - - congress:identity-service + - keystone:identity-service + - - congress:amqp + - rabbitmq-server:amqp contrail: inherits: openstack-phase2 services: diff --git a/ci/opencontrail/juju-deployer/ovs-opencontrail-tip.yaml b/ci/opencontrail/juju-deployer/ovs-opencontrail-tip.yaml index c792310a..401a71b9 100644 --- a/ci/opencontrail/juju-deployer/ovs-opencontrail-tip.yaml +++ b/ci/opencontrail/juju-deployer/ovs-opencontrail-tip.yaml @@ -159,6 +159,12 @@ openstack-phase2: num_units: 1 to: - "lxc:nodes-api=0" + congress: + charm: local:trusty/congress + options: + source-branch: stable/mitaka + to: + - "lxc:nodes-api=0" relations: - [ keystone, mysql ] - [ nova-cloud-controller, mysql ] @@ -195,6 +201,12 @@ openstack-phase2: - [ "cinder:shared-db", "mysql:shared-db" ] - [ "ceph:client", "cinder-ceph:ceph" ] - [ "ceph:client", "glance:ceph" ] + - - congress:shared-db + - mysql:shared-db + - - congress:identity-service + - keystone:identity-service + - - congress:amqp + - rabbitmq-server:amqp contrail: inherits: openstack-phase2 services: -- 2.16.6