summaryrefslogtreecommitdiffstats
path: root/ci/bundle_tpl
diff options
context:
space:
mode:
authorNarinder Gupta <narinder.gupta@canonical.com>2016-07-28 15:08:09 -0500
committerNarinder Gupta <narinder.gupta@canonical.com>2016-07-28 15:24:26 -0500
commit64b45fd5d932cc7b58e217956b4c41db1a341420 (patch)
tree0daf57146a0ed4859497be8ac3849b6448faf268 /ci/bundle_tpl
parentaaac4ed69f4a2ab0e66221bac5553fe996ee6854 (diff)
added aodh imtegration.
Change-Id: I4a3d6c812d4610fad5ea9a79430340bcf524c931 Signed-off-by: Narinder Gupta <narinder.gupta@canonical.com>
Diffstat (limited to 'ci/bundle_tpl')
-rw-r--r--ci/bundle_tpl/aodh.yaml5
-rw-r--r--ci/bundle_tpl/bundle.yaml1
-rw-r--r--ci/bundle_tpl/relations.yaml3
3 files changed, 9 insertions, 0 deletions
diff --git a/ci/bundle_tpl/aodh.yaml b/ci/bundle_tpl/aodh.yaml
new file mode 100644
index 00000000..271d3819
--- /dev/null
+++ b/ci/bundle_tpl/aodh.yaml
@@ -0,0 +1,5 @@
+ aodh:
+ charm: "local:{{ ubuntu.release }}/aodh"
+ to:
+ - "lxc:nodes=0"
+{# Empty block to avoid bad block trim #}
diff --git a/ci/bundle_tpl/bundle.yaml b/ci/bundle_tpl/bundle.yaml
index 52dfaf79..8c08c1a2 100644
--- a/ci/bundle_tpl/bundle.yaml
+++ b/ci/bundle_tpl/bundle.yaml
@@ -34,6 +34,7 @@ openstack-phase1:
{% include 'heat.yaml' %}
{% include 'neutron-api.yaml' %}
{% include 'neutron-gateway.yaml' %}
+{% include 'aodh.yaml' %}
{% if os.network.controller == 'odl' %}
{% include 'odl.yaml' %}
{% elif os.network.controller == 'onos' %}
diff --git a/ci/bundle_tpl/relations.yaml b/ci/bundle_tpl/relations.yaml
index afbeeb11..4cf24385 100644
--- a/ci/bundle_tpl/relations.yaml
+++ b/ci/bundle_tpl/relations.yaml
@@ -41,6 +41,9 @@
- [ 'congress:shared-db', 'mysql:shared-db' ]
- [ 'congress:identity-service', 'keystone:identity-service' ]
- [ 'congress:amqp', 'rabbitmq-server:amqp' ]
+ - [ 'aodh:amqp', 'rabbitmq-server:amqp' ]
+ - [ 'aodh:shared-db', 'mysql:shared-db' ]
+ - [ 'aodh:identity-service', 'keystone:identity-service' ]
{% if os.lxd %}
- [ 'nova-compute:lxd', 'lxd:lxd' ]
{% endif %}