From 37d881614a37c96f775b1a4e6befe6a61a2e3222 Mon Sep 17 00:00:00 2001 From: Narinder Gupta Date: Tue, 31 May 2016 10:08:44 -0500 Subject: change the location of the target to accomodate the future develop ment. Change-Id: Ia03e6fb6549a91c171670b5348ecdb4895af2bfc Signed-off-by: Narinder Gupta --- ci/nosdn/juju-deployer/ovs-nosdn-ha.yaml | 298 ++++++++++++++-------------- ci/nosdn/juju-deployer/ovs-nosdn-nonha.yaml | 226 ++++++++++----------- ci/nosdn/juju-deployer/ovs-nosdn-tip.yaml | 220 ++++++++++---------- ci/odl/juju-deployer/ovs-odl-ha.yaml | 293 +++++++++++++-------------- ci/odl/juju-deployer/ovs-odl-nonha.yaml | 227 ++++++++++----------- ci/odl/juju-deployer/ovs-odl-tip.yaml | 228 ++++++++++----------- 6 files changed, 749 insertions(+), 743 deletions(-) (limited to 'ci') diff --git a/ci/nosdn/juju-deployer/ovs-nosdn-ha.yaml b/ci/nosdn/juju-deployer/ovs-nosdn-ha.yaml index fb6b8a97..e9094fa3 100644 --- a/ci/nosdn/juju-deployer/ovs-nosdn-ha.yaml +++ b/ci/nosdn/juju-deployer/ovs-nosdn-ha.yaml @@ -1,4 +1,26 @@ # vim: set ts=2 et: +trusty-mitaka-nodes: + inherits: openstack-phase1 + overrides: + series: trusty + +trusty-mitaka: + inherits: openstack-phase2 + overrides: + #os-data-network: 10.4.8.0/21 + #ceph-cluster-network: 10.4.0.0/21 + #prefer-ipv6: true + #enable-dvr: true + #l2-population: true + #ext-port: "eth1" + region: Canonical + #source: "cloud:trusty-mitaka" + openstack-origin: "cloud:trusty-mitaka" + series: trusty + #ceph-osd-replication-count: 2 + admin-role: admin + keystone-admin-role: admin + openstack-phase1: series: trusty services: @@ -10,9 +32,137 @@ openstack-phase1: relations: - - "ntp:juju-info" - "nodes:juju-info" + openstack-phase2: inherits: openstack-phase1 + relations: + - - glance:ha + - hacluster-glance:ha + - - keystone:ha + - hacluster-keystone:ha + - - neutron-api:ha + - hacluster-neutron:ha + - - nova-cloud-controller:ha + - hacluster-nova:ha + - - openstack-dashboard:ha + - hacluster-horizon:ha + - - nova-compute:amqp + - rabbitmq-server:amqp + - - neutron-gateway:amqp + - rabbitmq-server:amqp + - - keystone:shared-db + - mysql:shared-db + - - nova-cloud-controller:identity-service + - keystone:identity-service + - - glance:identity-service + - keystone:identity-service + - - neutron-api:identity-service + - keystone:identity-service + - - neutron-openvswitch:neutron-plugin-api + - neutron-api:neutron-plugin-api + - - neutron-api:shared-db + - mysql:shared-db + - - neutron-api:amqp + - rabbitmq-server:amqp + - - neutron-gateway:neutron-plugin-api + - neutron-api:neutron-plugin-api + - - glance:shared-db + - mysql:shared-db + - - glance:amqp + - rabbitmq-server:amqp + - - nova-cloud-controller:image-service + - glance:image-service + - - nova-compute:image-service + - glance:image-service + - - nova-cloud-controller:cloud-compute + - nova-compute:cloud-compute + - - nova-cloud-controller:amqp + - rabbitmq-server:amqp + - - nova-cloud-controller:quantum-network-service + - neutron-gateway:quantum-network-service + - - nova-compute:neutron-plugin + - neutron-openvswitch:neutron-plugin + - - neutron-openvswitch:amqp + - rabbitmq-server:amqp + - - openstack-dashboard:identity-service + - keystone:identity-service + - - nova-cloud-controller:shared-db + - mysql:shared-db + - - nova-cloud-controller:neutron-api + - neutron-api:neutron-api + - - cinder:image-service + - glance:image-service + - - cinder:amqp + - rabbitmq-server:amqp + - - cinder:identity-service + - keystone:identity-service + - - 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 + - mysql:shared-db + - - ceph:client + - cinder-ceph:ceph + - - ceph:client + - glance:ceph + - - ceph-osd:mon + - ceph:osd + - - ntp:juju-info + - nova-compute:juju-info + - - ntp:juju-info + - neutron-gateway:juju-info + - - ceph-radosgw:mon + - ceph:radosgw + - - ceph-radosgw:identity-service + - keystone:identity-service + - - ceilometer:amqp + - rabbitmq-server:amqp + - - ceilometer-agent:ceilometer-service + - ceilometer:ceilometer-service + - - ceilometer:identity-service + - keystone:identity-service + - - ceilometer:identity-notifications + - keystone:identity-notifications + - - ceilometer-agent:nova-ceilometer + - nova-compute:nova-ceilometer + - - ceilometer:shared-db + - mongodb:database + - - heat:shared-db + - mysql:shared-db + - - heat:identity-service + - keystone:identity-service + - - heat:amqp + - rabbitmq-server:amqp + services: + hacluster-keystone: + charm: "local:trusty/hacluster" + options: + corosync_key: | + 'QisjNpoKHLkvyc3PEdDHP5VZjgD0kOk9t0ABPWmCELlu5AgWgnW6bJd34BVXO7VhW+3ZwNQM3W+bZ3pl28ftY4ki4N/S0KLFNia5egFgiA3AH2QXLnokS7OYXuu6GMJJ1S5mDe6P5zU+tfJe/Mebq24u7CgR0gAvohSPRdDTwdY=' + hacluster-horizon: + charm: "local:trusty/hacluster" + options: + corosync_key: | + 'aCVPHw6XYne+Hxv0WPiM3+yEfeIxs0Ly0EMKB494Rdzjf5rE52GcXqqxuvIa/nXJ4GCR+UdKk9FEwcASfYkeu3HDWUld9uTE6pOc+ibWYnybNH7VBfEHW8h9YmQKs3HD2T3wlTcS2irU4CUW7/IKNok4etYdM3iFn1K2ReSGXEI=' + hacluster-nova: + charm: "local:trusty/hacluster" + options: + corosync_key: | + 'gel86qmEze8dYKYbfqIgRpqapJpKtdYL2hxC1y5nWYBPq7EMf6V8mF01IjeUkSRs14CUDrsPpT4PWeom7EOY2fleuLx/aIuqQUfEDkhf/gvaz7BaU4hrmTCoDBK7/HvEwY+/wu4qkEeckzSRPsm9MYzqnLRshh8yjZJ70xU/mmk=' + hacluster-neutron: + charm: "local:trusty/hacluster" + options: + corosync_key: | + 'KNhb4++3jlllbnscS5D3qdzOJDsQPEeZ7zOLZJHbkKrRjX9gRCijVVOiv2JCvq03HqQ7LIufQzWGl9Za8qh0f6QmQ3XhFh/Cb/3WaYFj+tEf0zArWv+8miswmM1z4eyTSrTWBq0dTgx1z96wjBxP5HV0+1LWW+3Ei4oZWyRGeR0=' + hacluster-glance: + charm: "local:trusty/hacluster" + options: + corosync_key: | + 'el1dd8107J5mwQDPS7tEJPZrr0XFfL95+Tku/QG90W5Q5f5SP4W8TRfKvddGmZWZl2lVd1neG5WqaHa1mq/aScJpoflzVAJCvshN7Gd2AjHhLNNugeI8S90j/7wrKUhqiCAlkKaeri2xs5bB5PZ7Z9AHuNZL7SW1al8lxrKhUFI=' ceilometer: charm: "local:trusty/ceilometer" num_units: 3 @@ -183,151 +333,3 @@ openstack-phase2: charm: "local:trusty/heat" to: - "lxc:nodes=0" - hacluster-keystone: - charm: "local:trusty/hacluster" - options: - corosync_key: | - 'QisjNpoKHLkvyc3PEdDHP5VZjgD0kOk9t0ABPWmCELlu5AgWgnW6bJd34BVXO7VhW+3ZwNQM3W+bZ3pl28ftY4ki4N/S0KLFNia5egFgiA3AH2QXLnokS7OYXuu6GMJJ1S5mDe6P5zU+tfJe/Mebq24u7CgR0gAvohSPRdDTwdY=' - hacluster-horizon: - charm: "local:trusty/hacluster" - options: - corosync_key: | - 'aCVPHw6XYne+Hxv0WPiM3+yEfeIxs0Ly0EMKB494Rdzjf5rE52GcXqqxuvIa/nXJ4GCR+UdKk9FEwcASfYkeu3HDWUld9uTE6pOc+ibWYnybNH7VBfEHW8h9YmQKs3HD2T3wlTcS2irU4CUW7/IKNok4etYdM3iFn1K2ReSGXEI=' - hacluster-nova: - charm: "local:trusty/hacluster" - options: - corosync_key: | - 'gel86qmEze8dYKYbfqIgRpqapJpKtdYL2hxC1y5nWYBPq7EMf6V8mF01IjeUkSRs14CUDrsPpT4PWeom7EOY2fleuLx/aIuqQUfEDkhf/gvaz7BaU4hrmTCoDBK7/HvEwY+/wu4qkEeckzSRPsm9MYzqnLRshh8yjZJ70xU/mmk=' - hacluster-neutron: - charm: "local:trusty/hacluster" - options: - corosync_key: | - 'KNhb4++3jlllbnscS5D3qdzOJDsQPEeZ7zOLZJHbkKrRjX9gRCijVVOiv2JCvq03HqQ7LIufQzWGl9Za8qh0f6QmQ3XhFh/Cb/3WaYFj+tEf0zArWv+8miswmM1z4eyTSrTWBq0dTgx1z96wjBxP5HV0+1LWW+3Ei4oZWyRGeR0=' - hacluster-glance: - charm: "local:trusty/hacluster" - options: - corosync_key: | - 'el1dd8107J5mwQDPS7tEJPZrr0XFfL95+Tku/QG90W5Q5f5SP4W8TRfKvddGmZWZl2lVd1neG5WqaHa1mq/aScJpoflzVAJCvshN7Gd2AjHhLNNugeI8S90j/7wrKUhqiCAlkKaeri2xs5bB5PZ7Z9AHuNZL7SW1al8lxrKhUFI=' - relations: - - - glance:ha - - hacluster-glance:ha - - - keystone:ha - - hacluster-keystone:ha - - - neutron-api:ha - - hacluster-neutron:ha - - - nova-cloud-controller:ha - - hacluster-nova:ha - - - openstack-dashboard:ha - - hacluster-horizon:ha - - - nova-compute:amqp - - rabbitmq-server:amqp - - - neutron-gateway:amqp - - rabbitmq-server:amqp - - - keystone:shared-db - - mysql:shared-db - - - nova-cloud-controller:identity-service - - keystone:identity-service - - - glance:identity-service - - keystone:identity-service - - - neutron-api:identity-service - - keystone:identity-service - - - neutron-openvswitch:neutron-plugin-api - - neutron-api:neutron-plugin-api - - - neutron-api:shared-db - - mysql:shared-db - - - neutron-api:amqp - - rabbitmq-server:amqp - - - neutron-gateway:neutron-plugin-api - - neutron-api:neutron-plugin-api - - - glance:shared-db - - mysql:shared-db - - - glance:amqp - - rabbitmq-server:amqp - - - nova-cloud-controller:image-service - - glance:image-service - - - nova-compute:image-service - - glance:image-service - - - nova-cloud-controller:cloud-compute - - nova-compute:cloud-compute - - - nova-cloud-controller:amqp - - rabbitmq-server:amqp - - - nova-cloud-controller:quantum-network-service - - neutron-gateway:quantum-network-service - - - nova-compute:neutron-plugin - - neutron-openvswitch:neutron-plugin - - - neutron-openvswitch:amqp - - rabbitmq-server:amqp - - - openstack-dashboard:identity-service - - keystone:identity-service - - - nova-cloud-controller:shared-db - - mysql:shared-db - - - nova-cloud-controller:neutron-api - - neutron-api:neutron-api - - - cinder:image-service - - glance:image-service - - - cinder:amqp - - rabbitmq-server:amqp - - - cinder:identity-service - - keystone:identity-service - - - 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 - - mysql:shared-db - - - ceph:client - - cinder-ceph:ceph - - - ceph:client - - glance:ceph - - - ceph-osd:mon - - ceph:osd - - - ntp:juju-info - - nova-compute:juju-info - - - ntp:juju-info - - neutron-gateway:juju-info - - - ceph-radosgw:mon - - ceph:radosgw - - - ceph-radosgw:identity-service - - keystone:identity-service - - - ceilometer:amqp - - rabbitmq-server:amqp - - - ceilometer-agent:ceilometer-service - - ceilometer:ceilometer-service - - - ceilometer:identity-service - - keystone:identity-service - - - ceilometer:identity-notifications - - keystone:identity-notifications - - - ceilometer-agent:nova-ceilometer - - nova-compute:nova-ceilometer - - - ceilometer:shared-db - - mongodb:database - - - heat:shared-db - - mysql:shared-db - - - heat:identity-service - - keystone:identity-service - - - heat:amqp - - rabbitmq-server:amqp - -trusty-mitaka-nodes: - inherits: openstack-phase1 - overrides: - series: trusty - -trusty-mitaka: - inherits: openstack-phase2 - overrides: - #os-data-network: 10.4.8.0/21 - #ceph-cluster-network: 10.4.0.0/21 - #prefer-ipv6: true - #enable-dvr: true - #l2-population: true - #ext-port: "eth1" - region: Canonical - #source: "cloud:trusty-mitaka" - openstack-origin: "cloud:trusty-mitaka" - series: trusty - #ceph-osd-replication-count: 2 - admin-role: admin - keystone-admin-role: admin diff --git a/ci/nosdn/juju-deployer/ovs-nosdn-nonha.yaml b/ci/nosdn/juju-deployer/ovs-nosdn-nonha.yaml index ba83ab6c..06792de5 100644 --- a/ci/nosdn/juju-deployer/ovs-nosdn-nonha.yaml +++ b/ci/nosdn/juju-deployer/ovs-nosdn-nonha.yaml @@ -1,4 +1,26 @@ # vim: set ts=2 et: +trusty-mitaka-nodes: + inherits: openstack-phase1 + overrides: + series: trusty + +trusty-mitaka: + inherits: openstack-phase2 + overrides: + #os-data-network: 10.4.8.0/21 + #ceph-cluster-network: 10.4.0.0/21 + #prefer-ipv6: true + #enable-dvr: true + #l2-population: true + #ext-port: "eth1" + region: Canonical + #source: "cloud:trusty-mitaka" + openstack-origin: "cloud:trusty-mitaka" + series: trusty + ceph-osd-replication-count: 2 + admin-role: admin + keystone-admin-role: admin + openstack-phase1: series: trusty services: @@ -10,8 +32,100 @@ openstack-phase1: relations: - - "ntp:juju-info" - "nodes:juju-info" + openstack-phase2: inherits: openstack-phase1 + relations: + - - nova-compute:amqp + - rabbitmq-server:amqp + - - neutron-gateway:amqp + - rabbitmq-server:amqp + - - keystone:shared-db + - mysql:shared-db + - - nova-cloud-controller:identity-service + - keystone:identity-service + - - glance:identity-service + - keystone:identity-service + - - neutron-api:identity-service + - keystone:identity-service + - - neutron-openvswitch:neutron-plugin-api + - neutron-api:neutron-plugin-api + - - neutron-api:shared-db + - mysql:shared-db + - - neutron-api:amqp + - rabbitmq-server:amqp + - - neutron-gateway:neutron-plugin-api + - neutron-api:neutron-plugin-api + - - glance:shared-db + - mysql:shared-db + - - glance:amqp + - rabbitmq-server:amqp + - - nova-cloud-controller:image-service + - glance:image-service + - - nova-compute:image-service + - glance:image-service + - - nova-cloud-controller:cloud-compute + - nova-compute:cloud-compute + - - nova-cloud-controller:amqp + - rabbitmq-server:amqp + - - nova-cloud-controller:quantum-network-service + - neutron-gateway:quantum-network-service + - - nova-compute:neutron-plugin + - neutron-openvswitch:neutron-plugin + - - neutron-openvswitch:amqp + - rabbitmq-server:amqp + - - openstack-dashboard:identity-service + - keystone:identity-service + - - nova-cloud-controller:shared-db + - mysql:shared-db + - - nova-cloud-controller:neutron-api + - neutron-api:neutron-api + - - cinder:image-service + - glance:image-service + - - cinder:amqp + - rabbitmq-server:amqp + - - cinder:identity-service + - keystone:identity-service + - - 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 + - mysql:shared-db + - - ceph:client + - cinder-ceph:ceph + - - ceph:client + - glance:ceph + - - ceph-osd:mon + - ceph:osd + - - ntp:juju-info + - nova-compute:juju-info + - - ntp:juju-info + - neutron-gateway:juju-info + - - ceph-radosgw:mon + - ceph:radosgw + - - ceph-radosgw:identity-service + - keystone:identity-service + - - ceilometer:amqp + - rabbitmq-server:amqp + - - ceilometer-agent:ceilometer-service + - ceilometer:ceilometer-service + - - ceilometer:identity-service + - keystone:identity-service + - - ceilometer:identity-notifications + - keystone:identity-notifications + - - ceilometer-agent:nova-ceilometer + - nova-compute:nova-ceilometer + - - ceilometer:shared-db + - mongodb:database + - - heat:shared-db + - mysql:shared-db + - - heat:identity-service + - keystone:identity-service + - - heat:amqp + - rabbitmq-server:amqp services: ceilometer: charm: "local:trusty/ceilometer" @@ -141,115 +255,3 @@ openstack-phase2: charm: "local:trusty/heat" to: - "lxc:nodes=0" - relations: - - - nova-compute:amqp - - rabbitmq-server:amqp - - - neutron-gateway:amqp - - rabbitmq-server:amqp - - - keystone:shared-db - - mysql:shared-db - - - nova-cloud-controller:identity-service - - keystone:identity-service - - - glance:identity-service - - keystone:identity-service - - - neutron-api:identity-service - - keystone:identity-service - - - neutron-openvswitch:neutron-plugin-api - - neutron-api:neutron-plugin-api - - - neutron-api:shared-db - - mysql:shared-db - - - neutron-api:amqp - - rabbitmq-server:amqp - - - neutron-gateway:neutron-plugin-api - - neutron-api:neutron-plugin-api - - - glance:shared-db - - mysql:shared-db - - - glance:amqp - - rabbitmq-server:amqp - - - nova-cloud-controller:image-service - - glance:image-service - - - nova-compute:image-service - - glance:image-service - - - nova-cloud-controller:cloud-compute - - nova-compute:cloud-compute - - - nova-cloud-controller:amqp - - rabbitmq-server:amqp - - - nova-cloud-controller:quantum-network-service - - neutron-gateway:quantum-network-service - - - nova-compute:neutron-plugin - - neutron-openvswitch:neutron-plugin - - - neutron-openvswitch:amqp - - rabbitmq-server:amqp - - - openstack-dashboard:identity-service - - keystone:identity-service - - - nova-cloud-controller:shared-db - - mysql:shared-db - - - nova-cloud-controller:neutron-api - - neutron-api:neutron-api - - - cinder:image-service - - glance:image-service - - - cinder:amqp - - rabbitmq-server:amqp - - - cinder:identity-service - - keystone:identity-service - - - 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 - - mysql:shared-db - - - ceph:client - - cinder-ceph:ceph - - - ceph:client - - glance:ceph - - - ceph-osd:mon - - ceph:osd - - - ntp:juju-info - - nova-compute:juju-info - - - ntp:juju-info - - neutron-gateway:juju-info - - - ceph-radosgw:mon - - ceph:radosgw - - - ceph-radosgw:identity-service - - keystone:identity-service - - - ceilometer:amqp - - rabbitmq-server:amqp - - - ceilometer-agent:ceilometer-service - - ceilometer:ceilometer-service - - - ceilometer:identity-service - - keystone:identity-service - - - ceilometer:identity-notifications - - keystone:identity-notifications - - - ceilometer-agent:nova-ceilometer - - nova-compute:nova-ceilometer - - - ceilometer:shared-db - - mongodb:database - - - heat:shared-db - - mysql:shared-db - - - heat:identity-service - - keystone:identity-service - - - heat:amqp - - rabbitmq-server:amqp -trusty-mitaka-nodes: - inherits: openstack-phase1 - overrides: - series: trusty - -trusty-mitaka: - inherits: openstack-phase2 - overrides: - #os-data-network: 10.4.8.0/21 - #ceph-cluster-network: 10.4.0.0/21 - #prefer-ipv6: true - #enable-dvr: true - #l2-population: true - #ext-port: "eth1" - region: Canonical - #source: "cloud:trusty-mitaka" - openstack-origin: "cloud:trusty-mitaka" - series: trusty - ceph-osd-replication-count: 2 - admin-role: admin - keystone-admin-role: admin diff --git a/ci/nosdn/juju-deployer/ovs-nosdn-tip.yaml b/ci/nosdn/juju-deployer/ovs-nosdn-tip.yaml index 15ee33ec..3661b862 100644 --- a/ci/nosdn/juju-deployer/ovs-nosdn-tip.yaml +++ b/ci/nosdn/juju-deployer/ovs-nosdn-tip.yaml @@ -1,4 +1,26 @@ # vim: set ts=2 et: +trusty-mitaka-nodes: + inherits: openstack-phase1 + overrides: + series: trusty + +trusty-mitaka: + inherits: openstack-phase2 + overrides: + #os-data-network: 10.4.8.0/21 + #ceph-cluster-network: 10.4.0.0/21 + #prefer-ipv6: true + #enable-dvr: true + #l2-population: true + #ext-port: "eth1" + region: Canonical + #source: "cloud:trusty-mitaka" + openstack-origin: "cloud:trusty-mitaka" + series: trusty + ceph-osd-replication-count: 2 + admin-role: admin + keystone-admin-role: admin + openstack-phase1: series: trusty services: @@ -10,8 +32,96 @@ openstack-phase1: relations: - - "ntp:juju-info" - "nodes:juju-info" + openstack-phase2: inherits: openstack-phase1 + relations: + - - neutron-openvswitch:neutron-plugin-api + - neutron-api:neutron-plugin-api + - - nova-compute:neutron-plugin + - neutron-openvswitch:neutron-plugin + - - neutron-openvswitch:amqp + - rabbitmq-server:amqp + - - "keystone:shared-db" + - "mysql:shared-db" + - - "nova-cloud-controller:shared-db" + - "mysql:shared-db" + - - "nova-cloud-controller:amqp" + - "rabbitmq-server:amqp" + - - "nova-cloud-controller:image-service" + - "glance:image-service" + - - "nova-cloud-controller:identity-service" + - "keystone:identity-service" + - - "nova-cloud-controller:cloud-compute" + - "nova-compute:cloud-compute" + - - "nova-compute:amqp" + - "rabbitmq-server:amqp" + - - "nova-compute:image-service" + - "glance:image-service" + - - "glance:shared-db" + - "mysql:shared-db" + - - "glance:identity-service" + - "keystone:identity-service" + - - "glance:amqp" + - "rabbitmq-server:amqp" + - - "openstack-dashboard:identity-service" + - "keystone:identity-service" + - - "neutron-api:shared-db" + - "mysql:shared-db" + - - "neutron-api:amqp" + - "rabbitmq-server:amqp" + - - "nova-cloud-controller:neutron-api" + - "neutron-api:neutron-api" + - - "neutron-api:identity-service" + - "keystone:identity-service" + - - "neutron-gateway:amqp" + - "rabbitmq-server:amqp" + - - "neutron-gateway:neutron-plugin-api" + - "neutron-api:neutron-plugin-api" + - - "nova-cloud-controller:quantum-network-service" + - "neutron-gateway:quantum-network-service" + - - "ceilometer:amqp" + - "rabbitmq-server:amqp" + - - "ceilometer-agent:ceilometer-service" + - "ceilometer:ceilometer-service" + - - "ceilometer:identity-service" + - "keystone:identity-service" + - - "ceilometer:identity-notifications" + - "keystone:identity-notifications" + - - "ceilometer-agent:nova-ceilometer" + - "nova-compute:nova-ceilometer" + - - "ceilometer:shared-db" + - "mongodb:database" + - - "heat:shared-db" + - "mysql:shared-db" + - - "heat:identity-service" + - "keystone:identity-service" + - - "heat:amqp" + - "rabbitmq-server:amqp" + - - "cinder:image-service" + - "glance:image-service" + - - "cinder:amqp" + - "rabbitmq-server:amqp" + - - "cinder:identity-service" + - "keystone:identity-service" + - - "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" + - "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" services: mysql: charm: "local:trusty/percona-cluster" @@ -147,113 +257,3 @@ openstack-phase2: #default-socket-memory: 1024 #defualt-socket-cores: 1 #dpdk-driver: uio_pci_generic - relations: - - - neutron-openvswitch:neutron-plugin-api - - neutron-api:neutron-plugin-api - - - nova-compute:neutron-plugin - - neutron-openvswitch:neutron-plugin - - - neutron-openvswitch:amqp - - rabbitmq-server:amqp - - - "keystone:shared-db" - - "mysql:shared-db" - - - "nova-cloud-controller:shared-db" - - "mysql:shared-db" - - - "nova-cloud-controller:amqp" - - "rabbitmq-server:amqp" - - - "nova-cloud-controller:image-service" - - "glance:image-service" - - - "nova-cloud-controller:identity-service" - - "keystone:identity-service" - - - "nova-cloud-controller:cloud-compute" - - "nova-compute:cloud-compute" - - - "nova-compute:amqp" - - "rabbitmq-server:amqp" - - - "nova-compute:image-service" - - "glance:image-service" - - - "glance:shared-db" - - "mysql:shared-db" - - - "glance:identity-service" - - "keystone:identity-service" - - - "glance:amqp" - - "rabbitmq-server:amqp" - - - "openstack-dashboard:identity-service" - - "keystone:identity-service" - - - "neutron-api:shared-db" - - "mysql:shared-db" - - - "neutron-api:amqp" - - "rabbitmq-server:amqp" - - - "nova-cloud-controller:neutron-api" - - "neutron-api:neutron-api" - - - "neutron-api:identity-service" - - "keystone:identity-service" - - - "neutron-gateway:amqp" - - "rabbitmq-server:amqp" - - - "neutron-gateway:neutron-plugin-api" - - "neutron-api:neutron-plugin-api" - - - "nova-cloud-controller:quantum-network-service" - - "neutron-gateway:quantum-network-service" - - - "ceilometer:amqp" - - "rabbitmq-server:amqp" - - - "ceilometer-agent:ceilometer-service" - - "ceilometer:ceilometer-service" - - - "ceilometer:identity-service" - - "keystone:identity-service" - - - "ceilometer:identity-notifications" - - "keystone:identity-notifications" - - - "ceilometer-agent:nova-ceilometer" - - "nova-compute:nova-ceilometer" - - - "ceilometer:shared-db" - - "mongodb:database" - - - "heat:shared-db" - - "mysql:shared-db" - - - "heat:identity-service" - - "keystone:identity-service" - - - "heat:amqp" - - "rabbitmq-server:amqp" - - - "cinder:image-service" - - "glance:image-service" - - - "cinder:amqp" - - "rabbitmq-server:amqp" - - - "cinder:identity-service" - - "keystone:identity-service" - - - "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" - - "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" - -trusty-mitaka-nodes: - inherits: openstack-phase1 - overrides: - series: trusty - -trusty-mitaka: - inherits: openstack-phase2 - overrides: - #os-data-network: 10.4.8.0/21 - #ceph-cluster-network: 10.4.0.0/21 - #prefer-ipv6: true - #enable-dvr: true - #l2-population: true - #ext-port: "eth1" - region: Canonical - #source: "cloud:trusty-mitaka" - openstack-origin: "cloud:trusty-mitaka" - series: trusty - ceph-osd-replication-count: 2 - admin-role: admin - keystone-admin-role: admin - diff --git a/ci/odl/juju-deployer/ovs-odl-ha.yaml b/ci/odl/juju-deployer/ovs-odl-ha.yaml index bb07b732..decb1cb7 100644 --- a/ci/odl/juju-deployer/ovs-odl-ha.yaml +++ b/ci/odl/juju-deployer/ovs-odl-ha.yaml @@ -1,4 +1,27 @@ # vim: set ts=2 et: +trusty-mitaka-nodes: + inherits: openstack-phase1 + overrides: + series: trusty + +trusty-mitaka: + inherits: openstack-phase2 + overrides: +# cluster_count: 3 + #os-data-network: 10.4.8.0/21 + #ceph-cluster-network: 10.4.0.0/21 + #prefer-ipv6: true + #enable-dvr: true + #l2-population: true + #ext-port: "eth1" + region: Canonical + #source: "cloud:trusty-mitaka" + openstack-origin: "cloud:trusty-mitaka" + series: trusty + #ceph-osd-replication-count: 2 + admin-role: admin + keystone-admin-role: admin + openstack-phase1: series: trusty services: @@ -10,23 +33,119 @@ openstack-phase1: relations: - - "ntp:juju-info" - "nodes:juju-info" + openstack-phase2: inherits: openstack-phase1 + relations: + - - "glance:ha" + - "hacluster-glance:ha" + - - "keystone:ha" + - "hacluster-keystone:ha" + - - "neutron-api:ha" + - "hacluster-neutron:ha" + - - "nova-cloud-controller:ha" + - "hacluster-nova:ha" + - - "openstack-dashboard:ha" + - "hacluster-horizon:ha" + - - "ceilometer:ha" + - "hacluster-ceilometer:ha" + - - "cinder:ha" + - "hacluster-cinder:ha" + - - "heat:ha" + - "hacluster-heat:ha" +# - - "ceph-radosgw:ha" +# - "hacluster-ceph-radosgw:ha" + - - "neutron-api:neutron-plugin-api-subordinate" + - "neutron-api-odl:neutron-plugin-api-subordinate" + - - "nova-compute:neutron-plugin" + - "openvswitch-odl:neutron-plugin" + - - "neutron-gateway" + - "openvswitch-odl" + - - "openvswitch-odl:ovsdb-manager" + - "odl-controller:ovsdb-manager" + - - "neutron-api-odl:odl-controller" + - "odl-controller:controller-api" + - - "keystone:shared-db" + - "percona-cluster:shared-db" + - - "nova-cloud-controller:shared-db" + - "percona-cluster:shared-db" + - - "nova-cloud-controller:amqp" + - "rabbitmq-server:amqp" + - - "nova-cloud-controller:image-service" + - "glance:image-service" + - - "nova-cloud-controller:identity-service" + - "keystone:identity-service" + - - "nova-cloud-controller:cloud-compute" + - "nova-compute:cloud-compute" + - - "nova-compute:amqp" + - "rabbitmq-server:amqp" + - - "nova-compute:image-service" + - "glance:image-service" + - - "glance:shared-db" + - "percona-cluster:shared-db" + - - "glance:identity-service" + - "keystone:identity-service" + - - "glance:amqp" + - "rabbitmq-server:amqp" + - - "openstack-dashboard:identity-service" + - "keystone:identity-service" + - - "neutron-api:shared-db" + - "percona-cluster:shared-db" + - - "neutron-api:amqp" + - "rabbitmq-server:amqp" + - - "nova-cloud-controller:neutron-api" + - "neutron-api:neutron-api" + - - "neutron-api:identity-service" + - "keystone:identity-service" + - - "neutron-gateway:amqp" + - "rabbitmq-server:amqp" + - - "neutron-gateway:neutron-plugin-api" + - "neutron-api:neutron-plugin-api" + - - "nova-cloud-controller:quantum-network-service" + - "neutron-gateway:quantum-network-service" + - - "ceilometer:amqp" + - "rabbitmq-server:amqp" + - - "ceilometer-agent:ceilometer-service" + - "ceilometer:ceilometer-service" + - - "ceilometer:identity-service" + - "keystone:identity-service" + - - "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:identity-service" + - "keystone:identity-service" + - - "heat:amqp" + - "rabbitmq-server:amqp" + - - "cinder:image-service" + - "glance:image-service" + - - "cinder:amqp" + - "rabbitmq-server:amqp" + - - "cinder:identity-service" + - "keystone:identity-service" + - - "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" + - - "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" services: - percona-cluster: - charm: "local:trusty/percona-cluster" - num_units: 3 - options: - dataset-size: 2G - lp1366997-workaround: true - max-connections: 10000 - root-password: 293rhc395m - sst-password: 127rc14t51 - vip: 10.4.1.15 - to: - - "lxc:nodes=0" - - "lxc:nodes=1" - - "lxc:nodes=2" hacluster-keystone: charm: "local:trusty/hacluster" options: @@ -72,6 +191,20 @@ openstack-phase2: # options: # corosync_key: | # 'tk8U/FkH1+dNsvj6IU0C8AST7i/9ylIoCD8kWpPjB+UE2AYR7tkgkjnc4m5dzIYPYTceY7Hnb9xLJ0nlcQLYYFBRAJOg3drNTcVrfh63y9g9La1J1r51YSbOqXq1Q6RUhxP4OQBtDGE6/4NtZwuRPvPGLcI2ENiVm78l8JFkXRw=' + percona-cluster: + charm: "local:trusty/percona-cluster" + num_units: 3 + options: + dataset-size: 2G + lp1366997-workaround: true + max-connections: 10000 + root-password: 293rhc395m + sst-password: 127rc14t51 + vip: 10.4.1.15 + to: + - "lxc:nodes=0" + - "lxc:nodes=1" + - "lxc:nodes=2" ceilometer: charm: "local:trusty/ceilometer" num_units: 3 @@ -259,135 +392,3 @@ openstack-phase2: security-groups: True openvswitch-odl: charm: local:trusty/openvswitch-odl - relations: - - - "glance:ha" - - "hacluster-glance:ha" - - - "keystone:ha" - - "hacluster-keystone:ha" - - - "neutron-api:ha" - - "hacluster-neutron:ha" - - - "nova-cloud-controller:ha" - - "hacluster-nova:ha" - - - "openstack-dashboard:ha" - - "hacluster-horizon:ha" - - - "ceilometer:ha" - - "hacluster-ceilometer:ha" - - - "cinder:ha" - - "hacluster-cinder:ha" - - - "heat:ha" - - "hacluster-heat:ha" -# - - "ceph-radosgw:ha" -# - "hacluster-ceph-radosgw:ha" - - - "neutron-api:neutron-plugin-api-subordinate" - - "neutron-api-odl:neutron-plugin-api-subordinate" - - - "nova-compute:neutron-plugin" - - "openvswitch-odl:neutron-plugin" - - - "neutron-gateway" - - "openvswitch-odl" - - - "openvswitch-odl:ovsdb-manager" - - "odl-controller:ovsdb-manager" - - - "neutron-api-odl:odl-controller" - - "odl-controller:controller-api" - - - "keystone:shared-db" - - "percona-cluster:shared-db" - - - "nova-cloud-controller:shared-db" - - "percona-cluster:shared-db" - - - "nova-cloud-controller:amqp" - - "rabbitmq-server:amqp" - - - "nova-cloud-controller:image-service" - - "glance:image-service" - - - "nova-cloud-controller:identity-service" - - "keystone:identity-service" - - - "nova-cloud-controller:cloud-compute" - - "nova-compute:cloud-compute" - - - "nova-compute:amqp" - - "rabbitmq-server:amqp" - - - "nova-compute:image-service" - - "glance:image-service" - - - "glance:shared-db" - - "percona-cluster:shared-db" - - - "glance:identity-service" - - "keystone:identity-service" - - - "glance:amqp" - - "rabbitmq-server:amqp" - - - "openstack-dashboard:identity-service" - - "keystone:identity-service" - - - "neutron-api:shared-db" - - "percona-cluster:shared-db" - - - "neutron-api:amqp" - - "rabbitmq-server:amqp" - - - "nova-cloud-controller:neutron-api" - - "neutron-api:neutron-api" - - - "neutron-api:identity-service" - - "keystone:identity-service" - - - "neutron-gateway:amqp" - - "rabbitmq-server:amqp" - - - "neutron-gateway:neutron-plugin-api" - - "neutron-api:neutron-plugin-api" - - - "nova-cloud-controller:quantum-network-service" - - "neutron-gateway:quantum-network-service" - - - "ceilometer:amqp" - - "rabbitmq-server:amqp" - - - "ceilometer-agent:ceilometer-service" - - "ceilometer:ceilometer-service" - - - "ceilometer:identity-service" - - "keystone:identity-service" - - - "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:identity-service" - - "keystone:identity-service" - - - "heat:amqp" - - "rabbitmq-server:amqp" - - - "cinder:image-service" - - "glance:image-service" - - - "cinder:amqp" - - "rabbitmq-server:amqp" - - - "cinder:identity-service" - - "keystone:identity-service" - - - "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" - - - "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" - -trusty-mitaka-nodes: - inherits: openstack-phase1 - overrides: - series: trusty - -trusty-mitaka: - inherits: openstack-phase2 - overrides: -# cluster_count: 3 - #os-data-network: 10.4.8.0/21 - #ceph-cluster-network: 10.4.0.0/21 - #prefer-ipv6: true - #enable-dvr: true - #l2-population: true - #ext-port: "eth1" - region: Canonical - #source: "cloud:trusty-mitaka" - openstack-origin: "cloud:trusty-mitaka" - series: trusty - #ceph-osd-replication-count: 2 - admin-role: admin - keystone-admin-role: admin diff --git a/ci/odl/juju-deployer/ovs-odl-nonha.yaml b/ci/odl/juju-deployer/ovs-odl-nonha.yaml index 3a5d4c02..60c30a95 100644 --- a/ci/odl/juju-deployer/ovs-odl-nonha.yaml +++ b/ci/odl/juju-deployer/ovs-odl-nonha.yaml @@ -1,4 +1,26 @@ # vim: set ts=2 et: +trusty-mitaka-nodes: + inherits: openstack-phase1 + overrides: + series: trusty + +trusty-mitaka: + inherits: openstack-phase2 + overrides: + #os-data-network: 10.4.8.0/21 + #ceph-cluster-network: 10.4.0.0/21 + #prefer-ipv6: true + #enable-dvr: true + #l2-population: true + #ext-port: "eth1" + region: Canonical + #source: "cloud:trusty-mitaka" + openstack-origin: "cloud:trusty-mitaka" + series: trusty + ceph-osd-replication-count: 2 + admin-role: admin + keystone-admin-role: admin + openstack-phase1: series: trusty services: @@ -10,8 +32,100 @@ openstack-phase1: relations: - - "ntp:juju-info" - "nodes:juju-info" + openstack-phase2: inherits: openstack-phase1 + relations: + - - "neutron-api:neutron-plugin-api-subordinate" + - "neutron-api-odl:neutron-plugin-api-subordinate" + - - "nova-compute:neutron-plugin" + - "openvswitch-odl:neutron-plugin" + - - "neutron-gateway" + - "openvswitch-odl" + - - "openvswitch-odl:ovsdb-manager" + - "odl-controller:ovsdb-manager" + - - "neutron-api-odl:odl-controller" + - "odl-controller:controller-api" + - - "keystone:shared-db" + - "mysql:shared-db" + - - "nova-cloud-controller:shared-db" + - "mysql:shared-db" + - - "nova-cloud-controller:amqp" + - "rabbitmq-server:amqp" + - - "nova-cloud-controller:image-service" + - "glance:image-service" + - - "nova-cloud-controller:identity-service" + - "keystone:identity-service" + - - "nova-cloud-controller:cloud-compute" + - "nova-compute:cloud-compute" + - - "nova-compute:amqp" + - "rabbitmq-server:amqp" + - - "nova-compute:image-service" + - "glance:image-service" + - - "glance:shared-db" + - "mysql:shared-db" + - - "glance:identity-service" + - "keystone:identity-service" + - - "glance:amqp" + - "rabbitmq-server:amqp" + - - "openstack-dashboard:identity-service" + - "keystone:identity-service" + - - "neutron-api:shared-db" + - "mysql:shared-db" + - - "neutron-api:amqp" + - "rabbitmq-server:amqp" + - - "nova-cloud-controller:neutron-api" + - "neutron-api:neutron-api" + - - "neutron-api:identity-service" + - "keystone:identity-service" + - - "neutron-gateway:amqp" + - "rabbitmq-server:amqp" + - - "neutron-gateway:neutron-plugin-api" + - "neutron-api:neutron-plugin-api" + - - "nova-cloud-controller:quantum-network-service" + - "neutron-gateway:quantum-network-service" + - - "ceilometer:amqp" + - "rabbitmq-server:amqp" + - - "ceilometer-agent:ceilometer-service" + - "ceilometer:ceilometer-service" + - - "ceilometer:identity-service" + - "keystone:identity-service" + - - "ceilometer:identity-notifications" + - "keystone:identity-notifications" + - - "ceilometer-agent:nova-ceilometer" + - "nova-compute:nova-ceilometer" + - - "ceilometer:shared-db" + - "mongodb:database" + - - "heat:shared-db" + - "mysql:shared-db" + - - "heat:identity-service" + - "keystone:identity-service" + - - "heat:amqp" + - "rabbitmq-server:amqp" + - - "cinder:image-service" + - "glance:image-service" + - - "cinder:amqp" + - "rabbitmq-server:amqp" + - - "cinder:identity-service" + - "keystone:identity-service" + - - "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" + - "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" services: mysql: charm: "local:trusty/percona-cluster" @@ -148,116 +262,3 @@ openstack-phase2: security-groups: True openvswitch-odl: charm: local:trusty/openvswitch-odl - relations: - - - "neutron-api:neutron-plugin-api-subordinate" - - "neutron-api-odl:neutron-plugin-api-subordinate" - - - "nova-compute:neutron-plugin" - - "openvswitch-odl:neutron-plugin" - - - "neutron-gateway" - - "openvswitch-odl" - - - "openvswitch-odl:ovsdb-manager" - - "odl-controller:ovsdb-manager" - - - "neutron-api-odl:odl-controller" - - "odl-controller:controller-api" - - - "keystone:shared-db" - - "mysql:shared-db" - - - "nova-cloud-controller:shared-db" - - "mysql:shared-db" - - - "nova-cloud-controller:amqp" - - "rabbitmq-server:amqp" - - - "nova-cloud-controller:image-service" - - "glance:image-service" - - - "nova-cloud-controller:identity-service" - - "keystone:identity-service" - - - "nova-cloud-controller:cloud-compute" - - "nova-compute:cloud-compute" - - - "nova-compute:amqp" - - "rabbitmq-server:amqp" - - - "nova-compute:image-service" - - "glance:image-service" - - - "glance:shared-db" - - "mysql:shared-db" - - - "glance:identity-service" - - "keystone:identity-service" - - - "glance:amqp" - - "rabbitmq-server:amqp" - - - "openstack-dashboard:identity-service" - - "keystone:identity-service" - - - "neutron-api:shared-db" - - "mysql:shared-db" - - - "neutron-api:amqp" - - "rabbitmq-server:amqp" - - - "nova-cloud-controller:neutron-api" - - "neutron-api:neutron-api" - - - "neutron-api:identity-service" - - "keystone:identity-service" - - - "neutron-gateway:amqp" - - "rabbitmq-server:amqp" - - - "neutron-gateway:neutron-plugin-api" - - "neutron-api:neutron-plugin-api" - - - "nova-cloud-controller:quantum-network-service" - - "neutron-gateway:quantum-network-service" - - - "ceilometer:amqp" - - "rabbitmq-server:amqp" - - - "ceilometer-agent:ceilometer-service" - - "ceilometer:ceilometer-service" - - - "ceilometer:identity-service" - - "keystone:identity-service" - - - "ceilometer:identity-notifications" - - "keystone:identity-notifications" - - - "ceilometer-agent:nova-ceilometer" - - "nova-compute:nova-ceilometer" - - - "ceilometer:shared-db" - - "mongodb:database" - - - "heat:shared-db" - - "mysql:shared-db" - - - "heat:identity-service" - - "keystone:identity-service" - - - "heat:amqp" - - "rabbitmq-server:amqp" - - - "cinder:image-service" - - "glance:image-service" - - - "cinder:amqp" - - "rabbitmq-server:amqp" - - - "cinder:identity-service" - - "keystone:identity-service" - - - "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" - - "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" - -trusty-mitaka-nodes: - inherits: openstack-phase1 - overrides: - series: trusty - -trusty-mitaka: - inherits: openstack-phase2 - overrides: - #os-data-network: 10.4.8.0/21 - #ceph-cluster-network: 10.4.0.0/21 - #prefer-ipv6: true - #enable-dvr: true - #l2-population: true - #ext-port: "eth1" - region: Canonical - #source: "cloud:trusty-mitaka" - openstack-origin: "cloud:trusty-mitaka" - series: trusty - ceph-osd-replication-count: 2 - admin-role: admin - keystone-admin-role: admin diff --git a/ci/odl/juju-deployer/ovs-odl-tip.yaml b/ci/odl/juju-deployer/ovs-odl-tip.yaml index e4129315..f3a5d43c 100644 --- a/ci/odl/juju-deployer/ovs-odl-tip.yaml +++ b/ci/odl/juju-deployer/ovs-odl-tip.yaml @@ -1,4 +1,26 @@ # vim: set ts=2 et: +trusty-mitaka-nodes: + inherits: openstack-phase1 + overrides: + series: trusty + +trusty-mitaka: + inherits: openstack-phase2 + overrides: + #os-data-network: 10.4.8.0/21 + #ceph-cluster-network: 10.4.0.0/21 + #prefer-ipv6: true + #enable-dvr: true + #l2-population: true + #ext-port: "eth1" + region: Canonical + #source: "cloud:trusty-mitaka" + openstack-origin: "cloud:trusty-mitaka" + series: trusty + ceph-osd-replication-count: 2 + admin-role: admin + keystone-admin-role: admin + openstack-phase1: series: trusty services: @@ -12,8 +34,100 @@ openstack-phase1: - "nodes:juju-info" - - "ntp:juju-info" - "nodes:juju-info" + openstack-phase2: inherits: openstack-phase1 + relations: + - - "neutron-api:neutron-plugin-api-subordinate" + - "neutron-api-odl:neutron-plugin-api-subordinate" + - - "nova-compute:neutron-plugin" + - "openvswitch-odl:neutron-plugin" + - - "neutron-gateway" + - "openvswitch-odl" + - - "openvswitch-odl:ovsdb-manager" + - "odl-controller:ovsdb-manager" + - - "neutron-api-odl:odl-controller" + - "odl-controller:controller-api" + - - "keystone:shared-db" + - "mysql:shared-db" + - - "nova-cloud-controller:shared-db" + - "mysql:shared-db" + - - "nova-cloud-controller:amqp" + - "rabbitmq-server:amqp" + - - "nova-cloud-controller:image-service" + - "glance:image-service" + - - "nova-cloud-controller:identity-service" + - "keystone:identity-service" + - - "nova-cloud-controller:cloud-compute" + - "nova-compute:cloud-compute" + - - "nova-compute:amqp" + - "rabbitmq-server:amqp" + - - "nova-compute:image-service" + - "glance:image-service" + - - "glance:shared-db" + - "mysql:shared-db" + - - "glance:identity-service" + - "keystone:identity-service" + - - "glance:amqp" + - "rabbitmq-server:amqp" + - - "openstack-dashboard:identity-service" + - "keystone:identity-service" + - - "neutron-api:shared-db" + - "mysql:shared-db" + - - "neutron-api:amqp" + - "rabbitmq-server:amqp" + - - "nova-cloud-controller:neutron-api" + - "neutron-api:neutron-api" + - - "neutron-api:identity-service" + - "keystone:identity-service" + - - "neutron-gateway:amqp" + - "rabbitmq-server:amqp" + - - "neutron-gateway:neutron-plugin-api" + - "neutron-api:neutron-plugin-api" + - - "nova-cloud-controller:quantum-network-service" + - "neutron-gateway:quantum-network-service" + - - "ceilometer:amqp" + - "rabbitmq-server:amqp" + - - "ceilometer-agent:ceilometer-service" + - "ceilometer:ceilometer-service" + - - "ceilometer:identity-service" + - "keystone:identity-service" + - - "ceilometer:identity-notifications" + - "keystone:identity-notifications" + - - "ceilometer-agent:nova-ceilometer" + - "nova-compute:nova-ceilometer" + - - "ceilometer:shared-db" + - "mongodb:database" + - - "heat:shared-db" + - "mysql:shared-db" + - - "heat:identity-service" + - "keystone:identity-service" + - - "heat:amqp" + - "rabbitmq-server:amqp" + - - "cinder:image-service" + - "glance:image-service" + - - "cinder:amqp" + - "rabbitmq-server:amqp" + - - "cinder:identity-service" + - "keystone:identity-service" + - - "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" + - "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" services: mysql: charm: "local:trusty/percona-cluster" @@ -156,117 +270,3 @@ openstack-phase2: security-groups: True openvswitch-odl: charm: local:trusty/openvswitch-odl - relations: - - - "neutron-api:neutron-plugin-api-subordinate" - - "neutron-api-odl:neutron-plugin-api-subordinate" - - - "nova-compute:neutron-plugin" - - "openvswitch-odl:neutron-plugin" - - - "neutron-gateway" - - "openvswitch-odl" - - - "openvswitch-odl:ovsdb-manager" - - "odl-controller:ovsdb-manager" - - - "neutron-api-odl:odl-controller" - - "odl-controller:controller-api" - - - "keystone:shared-db" - - "mysql:shared-db" - - - "nova-cloud-controller:shared-db" - - "mysql:shared-db" - - - "nova-cloud-controller:amqp" - - "rabbitmq-server:amqp" - - - "nova-cloud-controller:image-service" - - "glance:image-service" - - - "nova-cloud-controller:identity-service" - - "keystone:identity-service" - - - "nova-cloud-controller:cloud-compute" - - "nova-compute:cloud-compute" - - - "nova-compute:amqp" - - "rabbitmq-server:amqp" - - - "nova-compute:image-service" - - "glance:image-service" - - - "glance:shared-db" - - "mysql:shared-db" - - - "glance:identity-service" - - "keystone:identity-service" - - - "glance:amqp" - - "rabbitmq-server:amqp" - - - "openstack-dashboard:identity-service" - - "keystone:identity-service" - - - "neutron-api:shared-db" - - "mysql:shared-db" - - - "neutron-api:amqp" - - "rabbitmq-server:amqp" - - - "nova-cloud-controller:neutron-api" - - "neutron-api:neutron-api" - - - "neutron-api:identity-service" - - "keystone:identity-service" - - - "neutron-gateway:amqp" - - "rabbitmq-server:amqp" - - - "neutron-gateway:neutron-plugin-api" - - "neutron-api:neutron-plugin-api" - - - "nova-cloud-controller:quantum-network-service" - - "neutron-gateway:quantum-network-service" - - - "ceilometer:amqp" - - "rabbitmq-server:amqp" - - - "ceilometer-agent:ceilometer-service" - - "ceilometer:ceilometer-service" - - - "ceilometer:identity-service" - - "keystone:identity-service" - - - "ceilometer:identity-notifications" - - "keystone:identity-notifications" - - - "ceilometer-agent:nova-ceilometer" - - "nova-compute:nova-ceilometer" - - - "ceilometer:shared-db" - - "mongodb:database" - - - "heat:shared-db" - - "mysql:shared-db" - - - "heat:identity-service" - - "keystone:identity-service" - - - "heat:amqp" - - "rabbitmq-server:amqp" - - - "cinder:image-service" - - "glance:image-service" - - - "cinder:amqp" - - "rabbitmq-server:amqp" - - - "cinder:identity-service" - - "keystone:identity-service" - - - "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" - - "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" - -trusty-mitaka-nodes: - inherits: openstack-phase1 - overrides: - series: trusty - -trusty-mitaka: - inherits: openstack-phase2 - overrides: - #os-data-network: 10.4.8.0/21 - #ceph-cluster-network: 10.4.0.0/21 - #prefer-ipv6: true - #enable-dvr: true - #l2-population: true - #ext-port: "eth1" - region: Canonical - #source: "cloud:trusty-mitaka" - openstack-origin: "cloud:trusty-mitaka" - series: trusty - ceph-osd-replication-count: 2 - admin-role: admin - keystone-admin-role: admin - -- cgit 1.2.3-korg