diff options
| -rw-r--r-- | ci/odl/juju-deployer/ovs-odl-ha.yaml | 75 | ||||
| -rw-r--r-- | ci/odl/juju-deployer/ovs-odl-tip.yaml | 60 | ||||
| -rw-r--r-- | ci/odl/juju-deployer/ovs-odl.yaml | 64 | ||||
| -rw-r--r-- | ci/opencontrail/juju-deployer/contrail-ha.yaml | 28 |
4 files changed, 178 insertions, 49 deletions
diff --git a/ci/odl/juju-deployer/ovs-odl-ha.yaml b/ci/odl/juju-deployer/ovs-odl-ha.yaml index 54a9fb85..d2873340 100644 --- a/ci/odl/juju-deployer/ovs-odl-ha.yaml +++ b/ci/odl/juju-deployer/ovs-odl-ha.yaml @@ -59,6 +59,66 @@ openstack-phase2: options: corosync_key: | 'el1dd8107J5mwQDPS7tEJPZrr0XFfL95+Tku/QG90W5Q5f5SP4W8TRfKvddGmZWZl2lVd1neG5WqaHa1mq/aScJpoflzVAJCvshN7Gd2AjHhLNNugeI8S90j/7wrKUhqiCAlkKaeri2xs5bB5PZ7Z9AHuNZL7SW1al8lxrKhUFI=' + "hacluster-ceilometer": + charm: "cs:trusty/hacluster" + options: + corosync_key: | + 'cHkgKGJpdHMgPSA5NjApLgpQcmVzcyBrZXlzIG9uIHlvdXIga2V5Ym9hcmQgdG8gZ2VuZXJhdGUgZW50cm9weSAoYml0cyA9IDEwMDgpLgpXcml0aW5nIGNvcm9zeW5jIGtleSB0byAvZXRjL2Nvcm9zeW5jL2F1dGhrZXkuCg==' + "ceilometer": + charm: "cs:trusty/ceilometer" + num_units: 3 + options: + vip: 10.4.1.14 + to: + - "lxc:nodes-api=0" + - "lxc:nodes-api=1" + - "lxc:nodes-api=2" + "ceilometer-agent": + charm: "cs:trusty/ceilometer-agent" + "mongodb": + charm: "cs:trusty/mongodb" + num_units: 1 + 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: /dev/sdb +# osd-reformat: 'yes' +# source: cloud:trusty-kilo +# to: +# - "nodes-compute=0" +# ceph-osd: +# charm: cs:trusty/ceph-osd +# num_units: 1 +# options: +# osd-devices: /dev/sdb +# osd-reformat: 'yes' +# source: cloud:trusty-kilo +# to: +# - "lxc:nodes-api=0" +# ceph-radosgw: +# charm: cs:trusty/ceph-radosgw +# num_units: 1 +# options: +# source: cloud:trusty-kilo +# 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 +# to: +# - "lxc:nodes-api=0" +# cinder-ceph: +# charm: cs:trusty/cinder-cep "rabbitmq-server": branch: lp:charms/trusty/rabbitmq-server num_units: 3 @@ -169,6 +229,8 @@ openstack-phase2: - "hacluster-nova:ha" - - "openstack-dashboard:ha" - "hacluster-horizon:ha" + - - "ceilometer:ha" + - "hacluster-ceilometer:ha" - - "neutron-api:neutron-plugin-api-subordinate" - "neutron-api-odl:neutron-plugin-api-subordinate" - - "nova-compute:neutron-plugin" @@ -217,6 +279,19 @@ openstack-phase2: - "neutron-api:neutron-plugin-api" - - "nova-cloud-controller:quantum-network-service" - "neutron-gateway:quantum-network-service" + - - "ceilometer" + - "mongodb" + - - "ceilometer" + - "rabbitmq-server" + - - "ceilometer:identity-service" + - "keystone:identity-service" + - - "ceilometer" + - "keystone:identity-notifications" + - - "ceilometer-agent" + - "nova-compute" + - - "ceilometer:ceilometer-service" + - "ceilometer-agent:ceilometer-service" + trusty-liberty-nodes: inherits: openstack-phase1 overrides: diff --git a/ci/odl/juju-deployer/ovs-odl-tip.yaml b/ci/odl/juju-deployer/ovs-odl-tip.yaml index a5b8cfa8..bcfaac17 100644 --- a/ci/odl/juju-deployer/ovs-odl-tip.yaml +++ b/ci/odl/juju-deployer/ovs-odl-tip.yaml @@ -20,6 +20,19 @@ openstack-phase1: openstack-phase2: inherits: openstack-phase1 services: + services: + "ceilometer": + charm: "cs:trusty/ceilometer" + num_units: 1 + to: + - "lxc:nodes-api=0" + "ceilometer-agent": + charm: "cs:trusty/ceilometer-agent" + "mongodb": + charm: "cs:trusty/mongodb" + num_units: 1 + to: + - "lxc:nodes-api=0" "mysql": charm: "cs:trusty/mysql" num_units: 1 @@ -37,6 +50,7 @@ openstack-phase2: branch: lp:charms/trusty/keystone num_units: 1 options: + openstack-origin-git: include-file://keystone-master.yaml "admin-password": openstack "admin-token": admin to: @@ -45,6 +59,7 @@ openstack-phase2: 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" @@ -52,6 +67,7 @@ openstack-phase2: 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: @@ -61,6 +77,7 @@ openstack-phase2: 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" @@ -77,6 +94,7 @@ openstack-phase2: neutron-gateway: branch: lp:charms/trusty/neutron-gateway options: + openstack-origin-git: include-file://neutron-master.yaml # "ext-port": "eth1" plugin: ovs-odl instance-mtu: 1400 @@ -94,6 +112,8 @@ openstack-phase2: "glance": branch: lp:charms/trusty/glance num_units: 1 + options: + openstack-origin-git: include-file://glance-master.yaml to: - "lxc:nodes-api=0" neutron-api-odl: @@ -152,6 +172,18 @@ openstack-phase2: - "neutron-api:neutron-plugin-api" - - "nova-cloud-controller:quantum-network-service" - "neutron-gateway:quantum-network-service" + - - "ceilometer" + - "mongodb" + - - "ceilometer" + - "rabbitmq-server" + - - "ceilometer:identity-service" + - "keystone:identity-service" + - - "ceilometer" + - "keystone:identity-notifications" + - - "ceilometer-agent" + - "nova-compute" + - - "ceilometer:ceilometer-service" + - "ceilometer-agent:ceilometer-service" trusty-liberty-nodes: inherits: openstack-phase1 overrides: @@ -175,34 +207,6 @@ trusty-kilo-nodes: trusty-kilo: inherits: openstack-phase2 series: trusty - services: - keystone: - options: - openstack-origin-git: include-file://keystone-master.yaml - glance: - options: - openstack-origin-git: include-file://glance-master.yaml -# cinder: -# options: -# openstack-origin-git: include-file://cinder-master.yaml -# neutron-api: -# options: -# openstack-origin-git: include-file://neutron-master.yaml - neutron-gateway: - options: - openstack-origin-git: include-file://neutron-master.yaml -# neutron-openvswitch: -# options: -# openstack-origin-git: include-file://neutron-master.yaml - openstack-dashboard: - options: - openstack-origin-git: include-file://horizon-master.yaml - nova-compute: - options: - openstack-origin-git: include-file://nova-master.yaml - nova-cloud-controller: - options: - openstack-origin-git: include-file://nova-master.yaml overrides: region: Canonical #os-data-network: 10.4.8.0/21 diff --git a/ci/odl/juju-deployer/ovs-odl.yaml b/ci/odl/juju-deployer/ovs-odl.yaml index 1e18c1c7..ef05b276 100644 --- a/ci/odl/juju-deployer/ovs-odl.yaml +++ b/ci/odl/juju-deployer/ovs-odl.yaml @@ -20,6 +20,58 @@ openstack-phase1: 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 + mongodb: + charm: cs:trusty/mongodb + num_units: 1 + 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: /dev/sdb +# osd-reformat: 'yes' +# source: cloud:trusty-kilo +# to: +# - "nodes-compute=0" +# ceph-osd: +# charm: cs:trusty/ceph-osd +# num_units: 1 +# options: +# osd-devices: /dev/sdb +# osd-reformat: 'yes' +# source: cloud:trusty-kilo +# to: +# - "lxc:nodes-api=0" +# ceph-radosgw: +# charm: cs:trusty/ceph-radosgw +# num_units: 1 +# options: +# source: cloud:trusty-kilo +# 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 +# to: +# - "lxc:nodes-api=0" +# cinder-ceph: +# charm: cs:trusty/cinder-cep + "mysql": charm: "cs:trusty/mysql" num_units: 1 @@ -154,6 +206,18 @@ openstack-phase2: - "neutron-api:neutron-plugin-api" - - "nova-cloud-controller:quantum-network-service" - "neutron-gateway:quantum-network-service" + - - "ceilometer" + - "mongodb" + - - "ceilometer" + - "rabbitmq-server" + - - "ceilometer:identity-service" + - "keystone:identity-service" + - - "ceilometer" + - "keystone:identity-notifications" + - - "ceilometer-agent" + - "nova-compute" + - - "ceilometer:ceilometer-service" + - "ceilometer-agent:ceilometer-service" trusty-liberty-nodes: inherits: openstack-phase1 overrides: diff --git a/ci/opencontrail/juju-deployer/contrail-ha.yaml b/ci/opencontrail/juju-deployer/contrail-ha.yaml index 3da5a823..5cb99499 100644 --- a/ci/opencontrail/juju-deployer/contrail-ha.yaml +++ b/ci/opencontrail/juju-deployer/contrail-ha.yaml @@ -139,25 +139,25 @@ openstack-phase2: - [ "neutron-api:ha", "hacluster-neutron:ha" ] - [ "nova-cloud-controller:ha", "hacluster-nova:ha" ] - [ "openstack-dashboard:ha", "hacluster-horizon:ha" ] - - [ keystone, mysql ] - - [ nova-cloud-controller, mysql ] + - [ keystone, percona-cluster ] + - [ nova-cloud-controller, percona-cluster ] - [ nova-cloud-controller, rabbitmq-server ] - [ nova-cloud-controller, glance ] - [ nova-cloud-controller, keystone ] - [ nova-compute, nova-cloud-controller ] - - [ "nova-compute:shared-db", "mysql:shared-db" ] + - [ "nova-compute:shared-db", "percona-cluster:shared-db" ] - [ "nova-compute:amqp", "rabbitmq-server:amqp" ] - [ nova-compute, glance ] - - [ glance, mysql ] + - [ glance, percona-cluster ] - [ glance, keystone ] - [ openstack-dashboard, keystone ] - - [ neutron-api, mysql ] + - [ neutron-api, percona-cluster ] - [ neutron-api, rabbitmq-server ] - [ neutron-api, nova-cloud-controller ] - [ neutron-api, keystone ] - [ neutron-api, neutron-api-contrail ] contrail: - inherits: openstack + inherits: openstack-phase2 services: cassandra: branch: lp:~stub/charms/trusty/cassandra/noauthentication @@ -208,6 +208,7 @@ contrail: neutron-contrail: branch: lp:~sdn-charmers/charms/trusty/neutron-contrail/trunk haproxy: + charm: cs:trusty/haproxy num_units: 2 options: peering_mode: active-active @@ -254,11 +255,6 @@ trusty-liberty-nodes: trusty-liberty: inherits: contrail series: trusty - services: - mysql: - charm: cs:trusty/mysql - rabbitmq-server: - charm: cs:trusty/rabbitmq-server overrides: series: trusty #os-data-network: 10.4.8.0/21 @@ -274,11 +270,6 @@ trusty-kilo-nodes: trusty-kilo: inherits: contrail series: trusty - services: - mysql: - charm: cs:trusty/mysql - rabbitmq-server: - charm: cs:trusty/rabbitmq-server overrides: series: trusty #os-data-network: 10.4.8.0/21 @@ -293,11 +284,6 @@ trusty-juno-nodes: trusty-juno: inherits: contrail series: trusty - services: - mysql: - charm: cs:trusty/mysql - rabbitmq-server: - charm: cs:trusty/rabbitmq-server overrides: series: trusty #os-data-network: 10.4.8.0/21 |