From 46ba62b3fac2b49a03a3ac0851db47ef177f73ee Mon Sep 17 00:00:00 2001 From: Narinder Gupta Date: Thu, 14 Jan 2016 13:31:27 -0600 Subject: consolidated all sdn 01-deploybundl.sh in joid/ci/01-deploybundle.sh Change-Id: Ic76bc50721e0c1f022d1ff877bf0faef7dd6e240 --- ci/nosdn/juju-deployer/ovs-ha.yaml | 366 ---------------------------- ci/nosdn/juju-deployer/ovs-nosdn-ha.yaml | 366 ++++++++++++++++++++++++++++ ci/nosdn/juju-deployer/ovs-nosdn-nonha.yaml | 300 +++++++++++++++++++++++ ci/nosdn/juju-deployer/ovs-nosdn-tip.yaml | 276 +++++++++++++++++++++ ci/nosdn/juju-deployer/ovs-tip.yaml | 276 --------------------- ci/nosdn/juju-deployer/ovs.yaml | 300 ----------------------- 6 files changed, 942 insertions(+), 942 deletions(-) delete mode 100644 ci/nosdn/juju-deployer/ovs-ha.yaml create mode 100644 ci/nosdn/juju-deployer/ovs-nosdn-ha.yaml create mode 100644 ci/nosdn/juju-deployer/ovs-nosdn-nonha.yaml create mode 100644 ci/nosdn/juju-deployer/ovs-nosdn-tip.yaml delete mode 100644 ci/nosdn/juju-deployer/ovs-tip.yaml delete mode 100644 ci/nosdn/juju-deployer/ovs.yaml (limited to 'ci/nosdn/juju-deployer') diff --git a/ci/nosdn/juju-deployer/ovs-ha.yaml b/ci/nosdn/juju-deployer/ovs-ha.yaml deleted file mode 100644 index 6d273c89..00000000 --- a/ci/nosdn/juju-deployer/ovs-ha.yaml +++ /dev/null @@ -1,366 +0,0 @@ -# vim: set ts=2 et: -openstack-phase1: - series: trusty - services: - nodes-api: - charm: "cs:trusty/ubuntu" - num_units: 3 - constraints: tags=control - nodes-compute: - charm: "cs:trusty/ubuntu" - num_units: 2 - constraints: tags=compute - "ntp": - charm: "cs:trusty/ntp" - relations: - - - "ntp:juju-info" - - "nodes-api:juju-info" - - - "ntp:juju-info" - - "nodes-compute:juju-info" -openstack-phase2: - inherits: openstack-phase1 - services: - ceilometer: - charm: cs:trusty/ceilometer - num_units: 3 - to: - - "lxc:nodes-api=0" - - "lxc:nodes-api=1" - - "lxc:nodes-api=2" - ceilometer-agent: - charm: cs:trusty/ceilometer-agent - ceph: - charm: cs:trusty/ceph - num_units: 2 - options: - monitor-count: 1 - fsid: 5a791d94-980b-11e4-b6f6-3c970e8b1cf7 - monitor-secret: AQAi5a9UeJXUExAA+By9u+GPhl8/XiUQ4nwI3A== - osd-devices: /srv - osd-reformat: 'yes' -# ceph-cluster-network: 192.168.0.0/24 -# ceph-public-network: 192.168.0.0/24 - to: - - "nodes-compute=0" - - "nodes-compute=1" - ceph-osd: - charm: cs:trusty/ceph-osd - num_units: 3 - options: - osd-devices: /srv - osd-reformat: 'yes' - to: - - "nodes-api=0" - - "nodes-api=1" - - "nodes-api=2" - ceph-radosgw: - charm: cs:trusty/ceph-radosgw - num_units: 1 - options: - use-embedded-webserver: true - operator-roles: "Member,admin" - to: - - "lxc:nodes-api=0" - cinder: - charm: cs:trusty/cinder - num_units: 3 - options: - block-device: None - glance-api-version: 2 - ha-mcastport: 5401 - to: - - "lxc:nodes-api=1" - - "lxc:nodes-api=0" - - "lxc:nodes-api=2" - cinder-ceph: - charm: cs:trusty/cinder-ceph - num_units: 0 - glance: - charm: cs:trusty/glance - num_units: 3 - options: - ha-mcastport: 5402 - vip: 10.4.1.12 - to: - - "lxc:nodes-api=2" - - "lxc:nodes-api=0" - - "lxc:nodes-api=1" - keystone: - charm: cs:trusty/keystone - num_units: 3 - options: - admin-password: openstack - admin-token: admin - ha-mcastport: 5403 - vip: 10.4.1.13 - to: - - "lxc:nodes-api=0" - - "lxc:nodes-api=1" - - "lxc:nodes-api=2" - mongodb: - charm: cs:trusty/mongodb - num_units: 1 - to: - - "lxc:nodes-api=0" - mysql: - branch: "lp:~openstack-charmers/charms/trusty/percona-cluster/next" - num_units: 3 - options: - max-connections: 20000 - lp1366997-workaround: true - root-password: 293rhc395m - sst-password: 127rc14t51 - vip: 10.4.1.15 - to: - - "lxc:nodes-api=1" - - "lxc:nodes-api=0" - - "lxc:nodes-api=2" - neutron-api: - charm: cs:trusty/neutron-api - num_units: 3 - options: - neutron-security-groups: true - vip: 10.4.1.17 - to: - - "lxc:nodes-api=2" - - "lxc:nodes-api=0" - - "lxc:nodes-api=1" - neutron-gateway: - charm: cs:trusty/neutron-gateway - num_units: 1 - options: -# "ext-port": "eth1" - instance-mtu: 1400 - to: - - "nodes-api=0" - neutron-openvswitch: - charm: cs:trusty/neutron-openvswitch - num_units: 0 - nova-cloud-controller: - charm: cs:trusty/nova-cloud-controller - num_units: 3 - options: - network-manager: Neutron - quantum-security-groups: 'yes' - service-guard: true - vip: 10.4.1.16 - to: - - "lxc:nodes-api=0" - - "lxc:nodes-api=1" - - "lxc:nodes-api=2" - nova-compute: - charm: cs:trusty/nova-compute - num_units: 2 - options: - enable-live-migration: true - enable-resize: true - manage-neutron-plugin-legacy-mode: false - migration-auth-type: ssh - to: - - "nodes-compute=0" - - "nodes-compute=1" -# - "nodes-api=0" -# - "nodes-api=1" -# - "nodes-api=2" - openstack-dashboard: - charm: cs:trusty/openstack-dashboard - num_units: 3 - options: - secret: admin - webroot: / - vip: 10.4.1.11 - to: - - "lxc:nodes-api=1" - - "lxc:nodes-api=0" - - "lxc:nodes-api=2" - rabbitmq-server: - charm: cs:trusty/rabbitmq-server - num_units: 3 - to: - - "lxc:nodes-api=2" - - "lxc:nodes-api=0" - - "lxc:nodes-api=1" - heat: - charm: cs:trusty/heat - to: - - "lxc:nodes-api=0" - 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=' - 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-liberty-nodes: - inherits: openstack-phase1 - overrides: - series: trusty - -trusty-liberty: - inherits: openstack-phase2 - overrides: - #os-data-network: 10.4.8.0/21 - #prefer-ipv6: true - region: Canonical - source: "cloud:trusty-liberty" - "openstack-origin": "cloud:trusty-liberty" - series: trusty - ceph-osd-replication-count: 2 - admin-role: admin - keystone-admin-role: admin - -trusty-kilo-nodes: - inherits: openstack-phase1 - overrides: - series: trusty - -trusty-kilo: - inherits: openstack-phase2 - overrides: - #os-data-network: 10.4.8.0/21 - #prefer-ipv6: true - region: Canonical - source: "cloud:trusty-kilo" - "openstack-origin": "cloud:trusty-kilo" - series: trusty - ceph-osd-replication-count: 2 - admin-role: admin - keystone-admin-role: admin - -trusty-juno-nodes: - inherits: openstack-phase1 - overrides: - series: trusty - -trusty-juno: - inherits: openstack-phase2 - overrides: - #os-data-network: 10.4.8.0/21 - #prefer-ipv6: true - region: Canonical - source: "cloud:trusty-juno" - "openstack-origin": "cloud:trusty-juno" - series: trusty - ceph-osd-replication-count: 2 - admin-role: admin - keystone-admin-role: admin - diff --git a/ci/nosdn/juju-deployer/ovs-nosdn-ha.yaml b/ci/nosdn/juju-deployer/ovs-nosdn-ha.yaml new file mode 100644 index 00000000..6d273c89 --- /dev/null +++ b/ci/nosdn/juju-deployer/ovs-nosdn-ha.yaml @@ -0,0 +1,366 @@ +# vim: set ts=2 et: +openstack-phase1: + series: trusty + services: + nodes-api: + charm: "cs:trusty/ubuntu" + num_units: 3 + constraints: tags=control + nodes-compute: + charm: "cs:trusty/ubuntu" + num_units: 2 + constraints: tags=compute + "ntp": + charm: "cs:trusty/ntp" + relations: + - - "ntp:juju-info" + - "nodes-api:juju-info" + - - "ntp:juju-info" + - "nodes-compute:juju-info" +openstack-phase2: + inherits: openstack-phase1 + services: + ceilometer: + charm: cs:trusty/ceilometer + num_units: 3 + to: + - "lxc:nodes-api=0" + - "lxc:nodes-api=1" + - "lxc:nodes-api=2" + ceilometer-agent: + charm: cs:trusty/ceilometer-agent + ceph: + charm: cs:trusty/ceph + num_units: 2 + options: + monitor-count: 1 + fsid: 5a791d94-980b-11e4-b6f6-3c970e8b1cf7 + monitor-secret: AQAi5a9UeJXUExAA+By9u+GPhl8/XiUQ4nwI3A== + osd-devices: /srv + osd-reformat: 'yes' +# ceph-cluster-network: 192.168.0.0/24 +# ceph-public-network: 192.168.0.0/24 + to: + - "nodes-compute=0" + - "nodes-compute=1" + ceph-osd: + charm: cs:trusty/ceph-osd + num_units: 3 + options: + osd-devices: /srv + osd-reformat: 'yes' + to: + - "nodes-api=0" + - "nodes-api=1" + - "nodes-api=2" + ceph-radosgw: + charm: cs:trusty/ceph-radosgw + num_units: 1 + options: + use-embedded-webserver: true + operator-roles: "Member,admin" + to: + - "lxc:nodes-api=0" + cinder: + charm: cs:trusty/cinder + num_units: 3 + options: + block-device: None + glance-api-version: 2 + ha-mcastport: 5401 + to: + - "lxc:nodes-api=1" + - "lxc:nodes-api=0" + - "lxc:nodes-api=2" + cinder-ceph: + charm: cs:trusty/cinder-ceph + num_units: 0 + glance: + charm: cs:trusty/glance + num_units: 3 + options: + ha-mcastport: 5402 + vip: 10.4.1.12 + to: + - "lxc:nodes-api=2" + - "lxc:nodes-api=0" + - "lxc:nodes-api=1" + keystone: + charm: cs:trusty/keystone + num_units: 3 + options: + admin-password: openstack + admin-token: admin + ha-mcastport: 5403 + vip: 10.4.1.13 + to: + - "lxc:nodes-api=0" + - "lxc:nodes-api=1" + - "lxc:nodes-api=2" + mongodb: + charm: cs:trusty/mongodb + num_units: 1 + to: + - "lxc:nodes-api=0" + mysql: + branch: "lp:~openstack-charmers/charms/trusty/percona-cluster/next" + num_units: 3 + options: + max-connections: 20000 + lp1366997-workaround: true + root-password: 293rhc395m + sst-password: 127rc14t51 + vip: 10.4.1.15 + to: + - "lxc:nodes-api=1" + - "lxc:nodes-api=0" + - "lxc:nodes-api=2" + neutron-api: + charm: cs:trusty/neutron-api + num_units: 3 + options: + neutron-security-groups: true + vip: 10.4.1.17 + to: + - "lxc:nodes-api=2" + - "lxc:nodes-api=0" + - "lxc:nodes-api=1" + neutron-gateway: + charm: cs:trusty/neutron-gateway + num_units: 1 + options: +# "ext-port": "eth1" + instance-mtu: 1400 + to: + - "nodes-api=0" + neutron-openvswitch: + charm: cs:trusty/neutron-openvswitch + num_units: 0 + nova-cloud-controller: + charm: cs:trusty/nova-cloud-controller + num_units: 3 + options: + network-manager: Neutron + quantum-security-groups: 'yes' + service-guard: true + vip: 10.4.1.16 + to: + - "lxc:nodes-api=0" + - "lxc:nodes-api=1" + - "lxc:nodes-api=2" + nova-compute: + charm: cs:trusty/nova-compute + num_units: 2 + options: + enable-live-migration: true + enable-resize: true + manage-neutron-plugin-legacy-mode: false + migration-auth-type: ssh + to: + - "nodes-compute=0" + - "nodes-compute=1" +# - "nodes-api=0" +# - "nodes-api=1" +# - "nodes-api=2" + openstack-dashboard: + charm: cs:trusty/openstack-dashboard + num_units: 3 + options: + secret: admin + webroot: / + vip: 10.4.1.11 + to: + - "lxc:nodes-api=1" + - "lxc:nodes-api=0" + - "lxc:nodes-api=2" + rabbitmq-server: + charm: cs:trusty/rabbitmq-server + num_units: 3 + to: + - "lxc:nodes-api=2" + - "lxc:nodes-api=0" + - "lxc:nodes-api=1" + heat: + charm: cs:trusty/heat + to: + - "lxc:nodes-api=0" + 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=' + 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-liberty-nodes: + inherits: openstack-phase1 + overrides: + series: trusty + +trusty-liberty: + inherits: openstack-phase2 + overrides: + #os-data-network: 10.4.8.0/21 + #prefer-ipv6: true + region: Canonical + source: "cloud:trusty-liberty" + "openstack-origin": "cloud:trusty-liberty" + series: trusty + ceph-osd-replication-count: 2 + admin-role: admin + keystone-admin-role: admin + +trusty-kilo-nodes: + inherits: openstack-phase1 + overrides: + series: trusty + +trusty-kilo: + inherits: openstack-phase2 + overrides: + #os-data-network: 10.4.8.0/21 + #prefer-ipv6: true + region: Canonical + source: "cloud:trusty-kilo" + "openstack-origin": "cloud:trusty-kilo" + series: trusty + ceph-osd-replication-count: 2 + admin-role: admin + keystone-admin-role: admin + +trusty-juno-nodes: + inherits: openstack-phase1 + overrides: + series: trusty + +trusty-juno: + inherits: openstack-phase2 + overrides: + #os-data-network: 10.4.8.0/21 + #prefer-ipv6: true + region: Canonical + source: "cloud:trusty-juno" + "openstack-origin": "cloud:trusty-juno" + 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 new file mode 100644 index 00000000..b7d127d1 --- /dev/null +++ b/ci/nosdn/juju-deployer/ovs-nosdn-nonha.yaml @@ -0,0 +1,300 @@ +# vim: set ts=2 et: +openstack-phase1: + series: trusty + services: + nodes-api: + charm: "cs:trusty/ubuntu" + num_units: 1 + constraints: tags=control + nodes-compute: + charm: "cs:trusty/ubuntu" + num_units: 1 + constraints: tags=compute + "ntp": + charm: "cs:trusty/ntp" + relations: + - - "ntp:juju-info" + - "nodes-api:juju-info" + - - "ntp:juju-info" + - "nodes-compute:juju-info" +openstack-phase2: + inherits: openstack-phase1 + services: + ceilometer: + charm: cs:trusty/ceilometer + num_units: 1 + to: + - "lxc:nodes-api=0" + ceilometer-agent: + charm: cs:trusty/ceilometer-agent + ceph: + charm: cs:trusty/ceph + num_units: 1 + options: + monitor-count: 1 + fsid: 5a791d94-980b-11e4-b6f6-3c970e8b1cf7 + monitor-secret: AQAi5a9UeJXUExAA+By9u+GPhl8/XiUQ4nwI3A== + osd-devices: /srv + osd-reformat: 'yes' +# ceph-cluster-network: 192.168.0.0/24 +# ceph-public-network: 192.168.0.0/24 + to: + - "nodes-compute=0" + ceph-osd: + charm: cs:trusty/ceph-osd + num_units: 1 + options: + osd-devices: /srv + osd-reformat: 'yes' + to: + - "nodes-api=0" + ceph-radosgw: + charm: cs:trusty/ceph-radosgw + num_units: 1 + options: + use-embedded-webserver: true + operator-roles: "Member,admin" + to: + - "lxc:nodes-api=0" + cinder: + charm: cs:trusty/cinder + num_units: 1 + options: + block-device: None + glance-api-version: 2 + ha-mcastport: 5401 + to: + - "lxc:nodes-api=0" + cinder-ceph: + charm: cs:trusty/cinder-ceph + num_units: 0 + glance: + charm: cs:trusty/glance + num_units: 1 + options: + ha-mcastport: 5402 + to: + - "lxc:nodes-api=0" + keystone: + charm: cs:trusty/keystone + num_units: 1 + options: + admin-password: openstack + admin-token: admin + ha-mcastport: 5403 + to: + - "lxc:nodes-api=0" + mongodb: + charm: cs:trusty/mongodb + num_units: 1 + to: + - "lxc:nodes-api=0" + mysql: + branch: "lp:~openstack-charmers/charms/trusty/percona-cluster/next" + num_units: 1 + options: + max-connections: 20000 + to: + - "lxc:nodes-api=0" + neutron-api: + charm: cs:trusty/neutron-api + num_units: 1 + options: + neutron-security-groups: true + to: + - "lxc:nodes-api=0" + neutron-gateway: + charm: cs:trusty/neutron-gateway + num_units: 1 + options: + instance-mtu: 1400 +# "ext-port": "eth1" + to: + - "nodes-api=0" + neutron-openvswitch: + charm: cs:trusty/neutron-openvswitch + num_units: 0 + nova-cloud-controller: + charm: cs:trusty/nova-cloud-controller + num_units: 1 + options: + network-manager: Neutron + quantum-security-groups: 'yes' + to: + - "lxc:nodes-api=0" + nova-compute: + charm: cs:trusty/nova-compute + num_units: 1 + options: + enable-live-migration: true + enable-resize: true + manage-neutron-plugin-legacy-mode: false + migration-auth-type: ssh + to: + - "nodes-compute=0" +# - "nodes-compute=1" +# - "nodes-api=0" +# - "nodes-api=1" +# - "nodes-api=2" + openstack-dashboard: + charm: cs:trusty/openstack-dashboard + num_units: 1 + options: + secret: admin + webroot: / + to: + - "lxc:nodes-api=0" + rabbitmq-server: + charm: cs:trusty/rabbitmq-server + num_units: 1 + to: + - "lxc:nodes-api=0" + heat: + charm: cs:trusty/heat + to: + - "lxc:nodes-api=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-liberty-nodes: + inherits: openstack-phase1 + overrides: + series: trusty + +trusty-liberty: + inherits: openstack-phase2 + overrides: + #os-data-network: 10.4.8.0/21 + #prefer-ipv6: true + region: Canonical + source: "cloud:trusty-liberty" + "openstack-origin": "cloud:trusty-liberty" + series: trusty + ceph-osd-replication-count: 1 + admin-role: admin + keystone-admin-role: admin + +trusty-kilo-nodes: + inherits: openstack-phase1 + overrides: + series: trusty + +trusty-kilo: + inherits: openstack-phase2 + overrides: + #os-data-network: 10.4.8.0/21 + #prefer-ipv6: true + region: Canonical + source: "cloud:trusty-kilo" + "openstack-origin": "cloud:trusty-kilo" + series: trusty + ceph-osd-replication-count: 1 + admin-role: admin + keystone-admin-role: admin + +trusty-juno-nodes: + inherits: openstack-phase1 + overrides: + series: trusty + +trusty-juno: + inherits: openstack-phase2 + overrides: + #os-data-network: 10.4.8.0/21 + #prefer-ipv6: true + region: Canonical + source: "cloud:trusty-juno" + "openstack-origin": "cloud:trusty-juno" + series: trusty + ceph-osd-replication-count: 1 + 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 new file mode 100644 index 00000000..25001c19 --- /dev/null +++ b/ci/nosdn/juju-deployer/ovs-nosdn-tip.yaml @@ -0,0 +1,276 @@ +# vim: set ts=2 et: +openstack-phase1: + series: trusty + services: + nodes-api: + charm: "cs:trusty/ubuntu" + num_units: 1 + constraints: tags=control + nodes-compute: + charm: "cs:trusty/ubuntu" + num_units: 1 + constraints: tags=compute + "ntp": + charm: "cs:trusty/ntp" + relations: + - - "ntp:juju-info" + - "nodes-api:juju-info" + - - "ntp:juju-info" + - "nodes-compute:juju-info" +openstack-phase2: + inherits: openstack-phase1 + services: + "mysql": + charm: "cs:trusty/mysql" + num_units: 1 + options: + "dataset-size": 2G + "max-connections": 10000 + to: + - "lxc:nodes-api=0" + "ceilometer": + branch: "lp:~openstack-charmers/charms/trusty/ceilometer/next" + num_units: 1 + to: + - "lxc:nodes-api=0" + "ceilometer-agent": + branch: "lp:~openstack-charmers/charms/trusty/ceilometer-agent/next" + "mongodb": + charm: "cs:trusty/mongodb" + num_units: 1 + to: + - "lxc:nodes-api=0" + "heat": + branch: "lp:~openstack-charmers/charms/trusty/heat/next" + to: + - "lxc:nodes-api=0" + ceph: + charm: cs:trusty/ceph + num_units: 1 + options: + fsid: 5a791d94-980b-11e4-b6f6-3c970e8b1cf7 + monitor-secret: AQAi5a9UeJXUExAA+By9u+GPhl8/XiUQ4nwI3A== + osd-devices: /srv + monitor-count: 1 + osd-reformat: 'no' +# ceph-cluster-network: 192.168.0.0/24 +# ceph-public-network: 192.168.0.0/24 + to: + - "nodes-compute=0" +# - "nodes-compute=1" +# ceph-osd: +# charm: cs:trusty/ceph-osd +# num_units: 1 +# options: +# osd-devices: /dev/sdb +# osd-reformat: 'yes' +# to: +# - "lxc:nodes-api=0" +# ceph-radosgw: +# charm: cs:trusty/ceph-radosgw +# num_units: 1 +# options: +# use-embedded-webserver: true +# to: + +# - "lxc:nodes-api=0" + cinder: + charm: cs:trusty/cinder + num_units: 1 + options: + block-device: None + glance-api-version: 2 +# ha-mcastport: 5401 +# openstack-origin-git: include-file://cinder-master.yaml + to: + - "lxc:nodes-api=0" + cinder-ceph: + charm: cs:trusty/cinder-ceph + "rabbitmq-server": + branch: lp:charms/trusty/rabbitmq-server + num_units: 1 + to: + - "lxc:nodes-api=0" + "keystone": + branch: lp:charms/trusty/keystone + num_units: 1 + options: + openstack-origin-git: include-file://keystone-master.yaml + "admin-password": openstack + "admin-token": admin + to: + - "lxc:nodes-api=0" + "openstack-dashboard": + branch: lp:charms/trusty/openstack-dashboard + num_units: 1 + options: + openstack-origin-git: include-file://horizon-master.yaml + secret: admin + to: + - "lxc:nodes-api=0" + "nova-compute": + branch: lp:~openstack-charmers/charms/trusty/nova-compute/next + num_units: 1 + options: + openstack-origin-git: include-file://nova-master.yaml + "enable-live-migration": False + "manage-neutron-plugin-legacy-mode": False + to: + - "nodes-compute=0" +# - "nodes-compute=1" + "nova-cloud-controller": + branch: lp:charms/trusty/nova-cloud-controller + num_units: 1 + options: + openstack-origin-git: include-file://nova-master.yaml + "console-access-protocol": novnc + "network-manager": Neutron + "quantum-security-groups": "yes" + to: + - "lxc:nodes-api=0" + "neutron-api": + branch: lp:~openstack-charmers/charms/trusty/neutron-api/next + num_units: 1 + options: + neutron-security-groups: True + manage-neutron-plugin-legacy-mode: False + to: + - "lxc:nodes-api=0" + neutron-gateway: + branch: lp:charms/trusty/neutron-gateway + options: + openstack-origin-git: include-file://neutron-master.yaml + instance-mtu: 1400 +# "ext-port": "eth1" + to: + - "nodes-api=0" + "glance": + branch: lp:charms/trusty/glance + num_units: 1 + options: + openstack-origin-git: include-file://glance-master.yaml + to: + - "lxc:nodes-api=0" + neutron-openvswitch: + branch: lp:~openstack-charmers/charms/trusty/neutron-openvswitch/trunk + options: + openstack-origin-git: include-file://neutron-master.yaml + 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" +trusty-liberty-nodes: + inherits: openstack-phase1 + overrides: + series: trusty + +trusty-liberty: + inherits: openstack-phase2 + overrides: + #os-data-network: 10.4.8.0/21 + #prefer-ipv6: true + region: Canonical + source: "cloud:trusty-liberty" + "openstack-origin": "cloud:trusty-liberty" + series: trusty + ceph-osd-replication-count: 1 + admin-role: admin + keystone-admin-role: admin + +trusty-kilo-nodes: + inherits: openstack-phase1 + overrides: + series: trusty + +# master +trusty-kilo: + inherits: openstack-phase2 + series: trusty + overrides: + region: Canonical + #os-data-network: 10.4.8.0/21 + #prefer-ipv6: true + openstack-origin: cloud:trusty-kilo + source: cloud:trusty-kilo + series: trusty + ceph-osd-replication-count: 1 + admin-role: admin + keystone-admin-role: admin + diff --git a/ci/nosdn/juju-deployer/ovs-tip.yaml b/ci/nosdn/juju-deployer/ovs-tip.yaml deleted file mode 100644 index 25001c19..00000000 --- a/ci/nosdn/juju-deployer/ovs-tip.yaml +++ /dev/null @@ -1,276 +0,0 @@ -# vim: set ts=2 et: -openstack-phase1: - series: trusty - services: - nodes-api: - charm: "cs:trusty/ubuntu" - num_units: 1 - constraints: tags=control - nodes-compute: - charm: "cs:trusty/ubuntu" - num_units: 1 - constraints: tags=compute - "ntp": - charm: "cs:trusty/ntp" - relations: - - - "ntp:juju-info" - - "nodes-api:juju-info" - - - "ntp:juju-info" - - "nodes-compute:juju-info" -openstack-phase2: - inherits: openstack-phase1 - services: - "mysql": - charm: "cs:trusty/mysql" - num_units: 1 - options: - "dataset-size": 2G - "max-connections": 10000 - to: - - "lxc:nodes-api=0" - "ceilometer": - branch: "lp:~openstack-charmers/charms/trusty/ceilometer/next" - num_units: 1 - to: - - "lxc:nodes-api=0" - "ceilometer-agent": - branch: "lp:~openstack-charmers/charms/trusty/ceilometer-agent/next" - "mongodb": - charm: "cs:trusty/mongodb" - num_units: 1 - to: - - "lxc:nodes-api=0" - "heat": - branch: "lp:~openstack-charmers/charms/trusty/heat/next" - to: - - "lxc:nodes-api=0" - ceph: - charm: cs:trusty/ceph - num_units: 1 - options: - fsid: 5a791d94-980b-11e4-b6f6-3c970e8b1cf7 - monitor-secret: AQAi5a9UeJXUExAA+By9u+GPhl8/XiUQ4nwI3A== - osd-devices: /srv - monitor-count: 1 - osd-reformat: 'no' -# ceph-cluster-network: 192.168.0.0/24 -# ceph-public-network: 192.168.0.0/24 - to: - - "nodes-compute=0" -# - "nodes-compute=1" -# ceph-osd: -# charm: cs:trusty/ceph-osd -# num_units: 1 -# options: -# osd-devices: /dev/sdb -# osd-reformat: 'yes' -# to: -# - "lxc:nodes-api=0" -# ceph-radosgw: -# charm: cs:trusty/ceph-radosgw -# num_units: 1 -# options: -# use-embedded-webserver: true -# to: - -# - "lxc:nodes-api=0" - cinder: - charm: cs:trusty/cinder - num_units: 1 - options: - block-device: None - glance-api-version: 2 -# ha-mcastport: 5401 -# openstack-origin-git: include-file://cinder-master.yaml - to: - - "lxc:nodes-api=0" - cinder-ceph: - charm: cs:trusty/cinder-ceph - "rabbitmq-server": - branch: lp:charms/trusty/rabbitmq-server - num_units: 1 - to: - - "lxc:nodes-api=0" - "keystone": - branch: lp:charms/trusty/keystone - num_units: 1 - options: - openstack-origin-git: include-file://keystone-master.yaml - "admin-password": openstack - "admin-token": admin - to: - - "lxc:nodes-api=0" - "openstack-dashboard": - branch: lp:charms/trusty/openstack-dashboard - num_units: 1 - options: - openstack-origin-git: include-file://horizon-master.yaml - secret: admin - to: - - "lxc:nodes-api=0" - "nova-compute": - branch: lp:~openstack-charmers/charms/trusty/nova-compute/next - num_units: 1 - options: - openstack-origin-git: include-file://nova-master.yaml - "enable-live-migration": False - "manage-neutron-plugin-legacy-mode": False - to: - - "nodes-compute=0" -# - "nodes-compute=1" - "nova-cloud-controller": - branch: lp:charms/trusty/nova-cloud-controller - num_units: 1 - options: - openstack-origin-git: include-file://nova-master.yaml - "console-access-protocol": novnc - "network-manager": Neutron - "quantum-security-groups": "yes" - to: - - "lxc:nodes-api=0" - "neutron-api": - branch: lp:~openstack-charmers/charms/trusty/neutron-api/next - num_units: 1 - options: - neutron-security-groups: True - manage-neutron-plugin-legacy-mode: False - to: - - "lxc:nodes-api=0" - neutron-gateway: - branch: lp:charms/trusty/neutron-gateway - options: - openstack-origin-git: include-file://neutron-master.yaml - instance-mtu: 1400 -# "ext-port": "eth1" - to: - - "nodes-api=0" - "glance": - branch: lp:charms/trusty/glance - num_units: 1 - options: - openstack-origin-git: include-file://glance-master.yaml - to: - - "lxc:nodes-api=0" - neutron-openvswitch: - branch: lp:~openstack-charmers/charms/trusty/neutron-openvswitch/trunk - options: - openstack-origin-git: include-file://neutron-master.yaml - 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" -trusty-liberty-nodes: - inherits: openstack-phase1 - overrides: - series: trusty - -trusty-liberty: - inherits: openstack-phase2 - overrides: - #os-data-network: 10.4.8.0/21 - #prefer-ipv6: true - region: Canonical - source: "cloud:trusty-liberty" - "openstack-origin": "cloud:trusty-liberty" - series: trusty - ceph-osd-replication-count: 1 - admin-role: admin - keystone-admin-role: admin - -trusty-kilo-nodes: - inherits: openstack-phase1 - overrides: - series: trusty - -# master -trusty-kilo: - inherits: openstack-phase2 - series: trusty - overrides: - region: Canonical - #os-data-network: 10.4.8.0/21 - #prefer-ipv6: true - openstack-origin: cloud:trusty-kilo - source: cloud:trusty-kilo - series: trusty - ceph-osd-replication-count: 1 - admin-role: admin - keystone-admin-role: admin - diff --git a/ci/nosdn/juju-deployer/ovs.yaml b/ci/nosdn/juju-deployer/ovs.yaml deleted file mode 100644 index b7d127d1..00000000 --- a/ci/nosdn/juju-deployer/ovs.yaml +++ /dev/null @@ -1,300 +0,0 @@ -# vim: set ts=2 et: -openstack-phase1: - series: trusty - services: - nodes-api: - charm: "cs:trusty/ubuntu" - num_units: 1 - constraints: tags=control - nodes-compute: - charm: "cs:trusty/ubuntu" - num_units: 1 - constraints: tags=compute - "ntp": - charm: "cs:trusty/ntp" - relations: - - - "ntp:juju-info" - - "nodes-api:juju-info" - - - "ntp:juju-info" - - "nodes-compute:juju-info" -openstack-phase2: - inherits: openstack-phase1 - services: - ceilometer: - charm: cs:trusty/ceilometer - num_units: 1 - to: - - "lxc:nodes-api=0" - ceilometer-agent: - charm: cs:trusty/ceilometer-agent - ceph: - charm: cs:trusty/ceph - num_units: 1 - options: - monitor-count: 1 - fsid: 5a791d94-980b-11e4-b6f6-3c970e8b1cf7 - monitor-secret: AQAi5a9UeJXUExAA+By9u+GPhl8/XiUQ4nwI3A== - osd-devices: /srv - osd-reformat: 'yes' -# ceph-cluster-network: 192.168.0.0/24 -# ceph-public-network: 192.168.0.0/24 - to: - - "nodes-compute=0" - ceph-osd: - charm: cs:trusty/ceph-osd - num_units: 1 - options: - osd-devices: /srv - osd-reformat: 'yes' - to: - - "nodes-api=0" - ceph-radosgw: - charm: cs:trusty/ceph-radosgw - num_units: 1 - options: - use-embedded-webserver: true - operator-roles: "Member,admin" - to: - - "lxc:nodes-api=0" - cinder: - charm: cs:trusty/cinder - num_units: 1 - options: - block-device: None - glance-api-version: 2 - ha-mcastport: 5401 - to: - - "lxc:nodes-api=0" - cinder-ceph: - charm: cs:trusty/cinder-ceph - num_units: 0 - glance: - charm: cs:trusty/glance - num_units: 1 - options: - ha-mcastport: 5402 - to: - - "lxc:nodes-api=0" - keystone: - charm: cs:trusty/keystone - num_units: 1 - options: - admin-password: openstack - admin-token: admin - ha-mcastport: 5403 - to: - - "lxc:nodes-api=0" - mongodb: - charm: cs:trusty/mongodb - num_units: 1 - to: - - "lxc:nodes-api=0" - mysql: - branch: "lp:~openstack-charmers/charms/trusty/percona-cluster/next" - num_units: 1 - options: - max-connections: 20000 - to: - - "lxc:nodes-api=0" - neutron-api: - charm: cs:trusty/neutron-api - num_units: 1 - options: - neutron-security-groups: true - to: - - "lxc:nodes-api=0" - neutron-gateway: - charm: cs:trusty/neutron-gateway - num_units: 1 - options: - instance-mtu: 1400 -# "ext-port": "eth1" - to: - - "nodes-api=0" - neutron-openvswitch: - charm: cs:trusty/neutron-openvswitch - num_units: 0 - nova-cloud-controller: - charm: cs:trusty/nova-cloud-controller - num_units: 1 - options: - network-manager: Neutron - quantum-security-groups: 'yes' - to: - - "lxc:nodes-api=0" - nova-compute: - charm: cs:trusty/nova-compute - num_units: 1 - options: - enable-live-migration: true - enable-resize: true - manage-neutron-plugin-legacy-mode: false - migration-auth-type: ssh - to: - - "nodes-compute=0" -# - "nodes-compute=1" -# - "nodes-api=0" -# - "nodes-api=1" -# - "nodes-api=2" - openstack-dashboard: - charm: cs:trusty/openstack-dashboard - num_units: 1 - options: - secret: admin - webroot: / - to: - - "lxc:nodes-api=0" - rabbitmq-server: - charm: cs:trusty/rabbitmq-server - num_units: 1 - to: - - "lxc:nodes-api=0" - heat: - charm: cs:trusty/heat - to: - - "lxc:nodes-api=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-liberty-nodes: - inherits: openstack-phase1 - overrides: - series: trusty - -trusty-liberty: - inherits: openstack-phase2 - overrides: - #os-data-network: 10.4.8.0/21 - #prefer-ipv6: true - region: Canonical - source: "cloud:trusty-liberty" - "openstack-origin": "cloud:trusty-liberty" - series: trusty - ceph-osd-replication-count: 1 - admin-role: admin - keystone-admin-role: admin - -trusty-kilo-nodes: - inherits: openstack-phase1 - overrides: - series: trusty - -trusty-kilo: - inherits: openstack-phase2 - overrides: - #os-data-network: 10.4.8.0/21 - #prefer-ipv6: true - region: Canonical - source: "cloud:trusty-kilo" - "openstack-origin": "cloud:trusty-kilo" - series: trusty - ceph-osd-replication-count: 1 - admin-role: admin - keystone-admin-role: admin - -trusty-juno-nodes: - inherits: openstack-phase1 - overrides: - series: trusty - -trusty-juno: - inherits: openstack-phase2 - overrides: - #os-data-network: 10.4.8.0/21 - #prefer-ipv6: true - region: Canonical - source: "cloud:trusty-juno" - "openstack-origin": "cloud:trusty-juno" - series: trusty - ceph-osd-replication-count: 1 - admin-role: admin - keystone-admin-role: admin - -- cgit 1.2.3-korg