diff options
| author |   Narinder Gupta <narinder.gupta@canonical.com> | 2015-11-17 17:29:28 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <gerrit@172.30.200.206> | 2015-11-17 17:29:28 +0000 |
| commit | 0f043db2729e89b32674b1e0480a620c5c681e65 (patch) | |
| tree | 3393f1ea164a4c504b20dc33edfd35f65885127a /ci/odl/juju-deployer/ovs-odl-tip.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-tip.yaml')
| -rw-r--r-- | ci/odl/juju-deployer/ovs-odl-tip.yaml | 60 |
1 files changed, 32 insertions, 28 deletions
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 |