diff options
author | 2015-11-17 17:29:28 +0000 | |
---|---|---|
committer | 2015-11-17 17:29:28 +0000 | |
commit | 0f043db2729e89b32674b1e0480a620c5c681e65 (patch) | |
tree | 3393f1ea164a4c504b20dc33edfd35f65885127a /ci/odl/juju-deployer/ovs-odl.yaml | |
parent | 642e52148ced6858a22c7810bf0124af4bf30a12 (diff) | |
parent | 750dbf7f4631d025a1e6786489f80f702f47c89b (diff) |
Merge "modified the HA bundle to reflect the correct services. Author: Narinder Gupta <narinder.gupta@canonical.com>"
Diffstat (limited to 'ci/odl/juju-deployer/ovs-odl.yaml')
-rw-r--r-- | ci/odl/juju-deployer/ovs-odl.yaml | 64 |
1 files changed, 64 insertions, 0 deletions
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: |