added aodh imtegration.

Change-Id: I4a3d6c812d4610fad5ea9a79430340bcf524c931
Signed-off-by: Narinder Gupta <narinder.gupta@canonical.com>

diff --git a/ci/bundle_tpl/aodh.yaml b/ci/bundle_tpl/aodh.yaml
new file mode 100644 (file)
index 0000000..271d381
--- /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 52dfaf7..8c08c1a 100644 (file)
--- 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 afbeeb1..4cf2438 100644 (file)
--- 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 %}

diff --git a/ci/nosdn/fetch-charms.sh b/ci/nosdn/fetch-charms.sh
index 52af425..efdc7c3 100755 (executable)
--- a/ci/nosdn/fetch-charms.sh
+++ b/ci/nosdn/fetch-charms.sh
@@ -5,8 +5,8 @@ mkdir -p $distro
 
 function build {
     sudo apt-get install charm-tools -y
-    (cd $distro/charm-congress; charm build -s $distro  -obuild src)
-    mv $distro/charm-congress/build/$distro/congress $distro
+    (cd $distro/charm-$1; charm build -s $distro  -obuild src)
+    mv $distro/charm-$1/build/$distro/$1 $distro
 }
 
 # openstack
@@ -15,28 +15,30 @@ bzr branch lp:~billy-olsen/charms/xenial/mongodb/trunk $distro/mongodb
 bzr branch lp:~narindergupta/opnfv/ntp $distro/ntp
 
 git clone https://github.com/gnuoy/charm-congress.git $distro/charm-congress
-build
+build congress
+git clone -b stable/16.07 https://github.com/openstack/charm-aodh.git $distro/charm-aodh
+build aodh
 
-git clone https://github.com/openstack/charm-hacluster.git $distro/hacluster
-git clone https://github.com/openstack/charm-ceilometer.git $distro/ceilometer
-git clone https://github.com/openstack/charm-ceilometer-agent.git $distro/ceilometer-agent
-git clone https://github.com/openstack/charm-ceph-mon.git $distro/ceph
-git clone https://github.com/openstack/charm-ceph-osd.git $distro/ceph-osd
-git clone https://github.com/openstack/charm-ceph-radosgw.git $distro/ceph-radosgw
-git clone https://github.com/openstack/charm-cinder.git $distro/cinder
-git clone https://github.com/openstack/charm-cinder-ceph.git $distro/cinder-ceph
-git clone https://github.com/openstack/charm-glance.git $distro/glance
-git clone https://github.com/openstack/charm-keystone.git $distro/keystone
-git clone https://github.com/openstack/charm-percona-cluster.git $distro/percona-cluster
-git clone https://github.com/openstack/charm-neutron-api.git $distro/neutron-api
-git clone https://github.com/openstack/charm-neutron-gateway.git $distro/neutron-gateway
-git clone https://github.com/openstack/charm-neutron-openvswitch.git $distro/neutron-openvswitch
-git clone https://github.com/openstack/charm-nova-cloud-controller.git $distro/nova-cloud-controller
-git clone https://github.com/openstack/charm-nova-compute.git $distro/nova-compute
-git clone https://github.com/openstack/charm-openstack-dashboard.git $distro/openstack-dashboard
-git clone https://github.com/openstack/charm-rabbitmq-server.git $distro/rabbitmq-server
-git clone https://github.com/openstack/charm-heat.git $distro/heat
-git clone https://github.com/openstack/charm-lxd.git xenial/lxd
+git clone -b stable/16.07 https://github.com/openstack/charm-hacluster.git $distro/hacluster
+git clone -b stable/16.07 https://github.com/openstack/charm-ceilometer.git $distro/ceilometer
+git clone -b stable/16.07 https://github.com/openstack/charm-ceilometer-agent.git $distro/ceilometer-agent
+git clone -b stable/16.07 https://github.com/openstack/charm-ceph-mon.git $distro/ceph
+git clone -b stable/16.07 https://github.com/openstack/charm-ceph-osd.git $distro/ceph-osd
+git clone -b stable/16.07 https://github.com/openstack/charm-ceph-radosgw.git $distro/ceph-radosgw
+git clone -b stable/16.07 https://github.com/openstack/charm-cinder.git $distro/cinder
+git clone -b stable/16.07 https://github.com/openstack/charm-cinder-ceph.git $distro/cinder-ceph
+git clone -b stable/16.07 https://github.com/openstack/charm-glance.git $distro/glance
+git clone -b stable/16.07 https://github.com/openstack/charm-keystone.git $distro/keystone
+git clone -b stable/16.07 https://github.com/openstack/charm-percona-cluster.git $distro/percona-cluster
+git clone -b stable/16.07 https://github.com/openstack/charm-neutron-api.git $distro/neutron-api
+git clone -b stable/16.07 https://github.com/openstack/charm-neutron-gateway.git $distro/neutron-gateway
+git clone -b stable/16.07 https://github.com/openstack/charm-neutron-openvswitch.git $distro/neutron-openvswitch
+git clone -b stable/16.07 https://github.com/openstack/charm-nova-cloud-controller.git $distro/nova-cloud-controller
+git clone -b stable/16.07 https://github.com/openstack/charm-nova-compute.git $distro/nova-compute
+git clone -b stable/16.07 https://github.com/openstack/charm-openstack-dashboard.git $distro/openstack-dashboard
+git clone -b stable/16.07 https://github.com/openstack/charm-rabbitmq-server.git $distro/rabbitmq-server
+git clone -b stable/16.07 https://github.com/openstack/charm-heat.git $distro/heat
+git clone -b stable/16.07 https://github.com/openstack/charm-lxd.git xenial/lxd
 
 #charm pull cs:~openstack-charmers-next/hacluster $distro/hacluster
 #charm pull cs:~openstack-charmers-next/ceilometer $distro/ceilometer

diff --git a/ci/odl/fetch-charms.sh b/ci/odl/fetch-charms.sh
index c07a6b5..9ff1d37 100755 (executable)
--- a/ci/odl/fetch-charms.sh
+++ b/ci/odl/fetch-charms.sh
@@ -5,8 +5,8 @@ mkdir -p $distro
 
 function build {
     sudo apt-get install charm-tools -y
-    (cd $distro/charm-congress; charm build -s $distro  -obuild src)
-    mv $distro/charm-congress/build/$distro/congress $distro
+    (cd $distro/charm-$1; charm build -s $distro  -obuild src)
+    mv $distro/charm-$1/build/$distro/$1 $distro
 }
 
 # openstack
@@ -15,28 +15,30 @@ bzr branch lp:~billy-olsen/charms/xenial/mongodb/trunk $distro/mongodb
 bzr branch lp:~narindergupta/opnfv/ntp $distro/ntp
 
 git clone https://github.com/gnuoy/charm-congress.git $distro/charm-congress
-build
+build congress
+git clone -b stable/16.07 https://github.com/openstack/charm-aodh.git $distro/charm-aodh
+build aodh
 
-git clone https://github.com/openstack/charm-hacluster.git $distro/hacluster
-git clone https://github.com/openstack/charm-ceilometer.git $distro/ceilometer
-git clone https://github.com/openstack/charm-ceilometer-agent.git $distro/ceilometer-agent
-git clone https://github.com/openstack/charm-ceph-mon.git $distro/ceph
-git clone https://github.com/openstack/charm-ceph-osd.git $distro/ceph-osd
-git clone https://github.com/openstack/charm-ceph-radosgw.git $distro/ceph-radosgw
-git clone https://github.com/openstack/charm-cinder.git $distro/cinder
-git clone https://github.com/openstack/charm-cinder-ceph.git $distro/cinder-ceph
-git clone https://github.com/openstack/charm-glance.git $distro/glance
-git clone https://github.com/openstack/charm-keystone.git $distro/keystone
-git clone https://github.com/openstack/charm-percona-cluster.git $distro/percona-cluster
-git clone https://github.com/openstack/charm-neutron-api.git $distro/neutron-api
-git clone https://github.com/openstack/charm-neutron-gateway.git $distro/neutron-gateway
-git clone https://github.com/openstack/charm-neutron-openvswitch.git $distro/neutron-openvswitch
-git clone https://github.com/openstack/charm-nova-cloud-controller.git $distro/nova-cloud-controller
-git clone https://github.com/openstack/charm-nova-compute.git $distro/nova-compute
-git clone https://github.com/openstack/charm-openstack-dashboard.git $distro/openstack-dashboard
-git clone https://github.com/openstack/charm-rabbitmq-server.git $distro/rabbitmq-server
-git clone https://github.com/openstack/charm-heat.git $distro/heat
-git clone https://github.com/openstack/charm-lxd.git xenial/lxd
+git clone -b stable/16.07 https://github.com/openstack/charm-hacluster.git $distro/hacluster
+git clone -b stable/16.07 https://github.com/openstack/charm-ceilometer.git $distro/ceilometer
+git clone -b stable/16.07 https://github.com/openstack/charm-ceilometer-agent.git $distro/ceilometer-agent
+git clone -b stable/16.07 https://github.com/openstack/charm-ceph-mon.git $distro/ceph
+git clone -b stable/16.07 https://github.com/openstack/charm-ceph-osd.git $distro/ceph-osd
+git clone -b stable/16.07 https://github.com/openstack/charm-ceph-radosgw.git $distro/ceph-radosgw
+git clone -b stable/16.07 https://github.com/openstack/charm-cinder.git $distro/cinder
+git clone -b stable/16.07 https://github.com/openstack/charm-cinder-ceph.git $distro/cinder-ceph
+git clone -b stable/16.07 https://github.com/openstack/charm-glance.git $distro/glance
+git clone -b stable/16.07 https://github.com/openstack/charm-keystone.git $distro/keystone
+git clone -b stable/16.07 https://github.com/openstack/charm-percona-cluster.git $distro/percona-cluster
+git clone -b stable/16.07 https://github.com/openstack/charm-neutron-api.git $distro/neutron-api
+git clone -b stable/16.07 https://github.com/openstack/charm-neutron-gateway.git $distro/neutron-gateway
+git clone -b stable/16.07 https://github.com/openstack/charm-neutron-openvswitch.git $distro/neutron-openvswitch
+git clone -b stable/16.07 https://github.com/openstack/charm-nova-cloud-controller.git $distro/nova-cloud-controller
+git clone -b stable/16.07 https://github.com/openstack/charm-nova-compute.git $distro/nova-compute
+git clone -b stable/16.07 https://github.com/openstack/charm-openstack-dashboard.git $distro/openstack-dashboard
+git clone -b stable/16.07 https://github.com/openstack/charm-rabbitmq-server.git $distro/rabbitmq-server
+git clone -b stable/16.07 https://github.com/openstack/charm-heat.git $distro/heat
+git clone -b stable/16.07 https://github.com/openstack/charm-lxd.git xenial/lxd
 
 #charm pull cs:~openstack-charmers-next/hacluster $distro/hacluster
 #charm pull cs:~openstack-charmers-next/ceilometer $distro/ceilometer
@@ -60,6 +62,6 @@ git clone https://github.com/openstack/charm-lxd.git xenial/lxd
 #charm pull cs:~openstack-charmers-next/lxd xenial/lxd
 
 #controller specific charm
-git clone https://github.com/openstack/charm-odl-controller.git $distro/odl-controller
-git clone https://github.com/openstack/charm-neutron-api-odl.git $distro/neutron-api-odl
-git clone https://github.com/openstack/charm-openvswitch-odl.git $distro/openvswitch-odl
+git clone -b stable/16.07 https://github.com/openstack/charm-odl-controller.git $distro/odl-controller
+git clone -b stable/16.07 https://github.com/openstack/charm-neutron-api-odl.git $distro/neutron-api-odl
+git clone -b stable/16.07 https://github.com/openstack/charm-openvswitch-odl.git $distro/openvswitch-odl

diff --git a/ci/onos/fetch-charms.sh b/ci/onos/fetch-charms.sh
index a80baf5..6b1b988 100755 (executable)
--- a/ci/onos/fetch-charms.sh
+++ b/ci/onos/fetch-charms.sh
@@ -5,8 +5,8 @@ mkdir -p $distro
 
 function build {
     sudo apt-get install charm-tools -y
-    (cd $distro/charm-congress; charm build -s $distro  -obuild src)
-    mv $distro/charm-congress/build/$distro/congress $distro
+    (cd $distro/charm-$1; charm build -s $distro  -obuild src)
+    mv $distro/charm-$1/build/$distro/$1 $distro
 }
 
 # openstack
@@ -15,27 +15,29 @@ bzr branch lp:~billy-olsen/charms/xenial/mongodb/trunk $distro/mongodb
 bzr branch lp:~narindergupta/opnfv/ntp $distro/ntp
 
 git clone https://github.com/gnuoy/charm-congress.git $distro/charm-congress
-build
+build congress
+git clone -b stable/16.07 https://github.com/openstack/charm-aodh.git $distro/charm-aodh
+build aodh
 
-git clone https://github.com/openstack/charm-hacluster.git $distro/hacluster
-git clone https://github.com/openstack/charm-ceilometer.git $distro/ceilometer
-git clone https://github.com/openstack/charm-ceilometer-agent.git $distro/ceilometer-agent
-git clone https://github.com/openstack/charm-ceph-mon.git $distro/ceph
-git clone https://github.com/openstack/charm-ceph-osd.git $distro/ceph-osd
-git clone https://github.com/openstack/charm-ceph-radosgw.git $distro/ceph-radosgw
-git clone https://github.com/openstack/charm-cinder.git $distro/cinder
-git clone https://github.com/openstack/charm-cinder-ceph.git $distro/cinder-ceph
-git clone https://github.com/openstack/charm-glance.git $distro/glance
-git clone https://github.com/openstack/charm-keystone.git $distro/keystone
-git clone https://github.com/openstack/charm-percona-cluster.git $distro/percona-cluster
-git clone https://github.com/openstack/charm-neutron-api.git $distro/neutron-api
-git clone https://github.com/openstack/charm-neutron-openvswitch.git $distro/neutron-openvswitch
-git clone https://github.com/openstack/charm-nova-cloud-controller.git $distro/nova-cloud-controller
-git clone https://github.com/openstack/charm-nova-compute.git $distro/nova-compute
-git clone https://github.com/openstack/charm-openstack-dashboard.git $distro/openstack-dashboard
-git clone https://github.com/openstack/charm-rabbitmq-server.git $distro/rabbitmq-server
-git clone https://github.com/openstack/charm-heat.git $distro/heat
-git clone https://github.com/openstack/charm-lxd.git $distro/lxd
+git clone -b stable/16.07 https://github.com/openstack/charm-hacluster.git $distro/hacluster
+git clone -b stable/16.07 https://github.com/openstack/charm-ceilometer.git $distro/ceilometer
+git clone -b stable/16.07 https://github.com/openstack/charm-ceilometer-agent.git $distro/ceilometer-agent
+git clone -b stable/16.07 https://github.com/openstack/charm-ceph-mon.git $distro/ceph
+git clone -b stable/16.07 https://github.com/openstack/charm-ceph-osd.git $distro/ceph-osd
+git clone -b stable/16.07 https://github.com/openstack/charm-ceph-radosgw.git $distro/ceph-radosgw
+git clone -b stable/16.07 https://github.com/openstack/charm-cinder.git $distro/cinder
+git clone -b stable/16.07 https://github.com/openstack/charm-cinder-ceph.git $distro/cinder-ceph
+git clone -b stable/16.07 https://github.com/openstack/charm-glance.git $distro/glance
+git clone -b stable/16.07 https://github.com/openstack/charm-keystone.git $distro/keystone
+git clone -b stable/16.07 https://github.com/openstack/charm-percona-cluster.git $distro/percona-cluster
+git clone -b stable/16.07 https://github.com/openstack/charm-neutron-api.git $distro/neutron-api
+git clone -b stable/16.07 https://github.com/openstack/charm-neutron-openvswitch.git $distro/neutron-openvswitch
+git clone -b stable/16.07 https://github.com/openstack/charm-nova-cloud-controller.git $distro/nova-cloud-controller
+git clone -b stable/16.07 https://github.com/openstack/charm-nova-compute.git $distro/nova-compute
+git clone -b stable/16.07 https://github.com/openstack/charm-openstack-dashboard.git $distro/openstack-dashboard
+git clone -b stable/16.07 https://github.com/openstack/charm-rabbitmq-server.git $distro/rabbitmq-server
+git clone -b stable/16.07 https://github.com/openstack/charm-heat.git $distro/heat
+git clone -b stable/16.07 https://github.com/openstack/charm-lxd.git $distro/lxd
 
 #charm pull cs:~openstack-charmers-next/hacluster $distro/hacluster
 #charm pull cs:~openstack-charmers-next/ceilometer $distro/ceilometer

diff --git a/ci/opencontrail/fetch-charms.sh b/ci/opencontrail/fetch-charms.sh
index 9ccf100..66efc40 100755 (executable)
--- a/ci/opencontrail/fetch-charms.sh
+++ b/ci/opencontrail/fetch-charms.sh
@@ -6,37 +6,38 @@ mkdir -p $distro
 
 function build {
     sudo apt-get install charm-tools -y
-    (cd $distro/charm-congress; charm build -s $distro  -obuild src)
-    mv $distro/charm-congress/build/$distro/congress $distro
+    (cd $distro/charm-$1; charm build -s $distro  -obuild src)
+    mv $distro/charm-$1/build/$distro/$1 $distro
 }
 
 # openstack
 bzr branch lp:~narindergupta/charms/trusty/promise/trunk $distro/promise
 bzr branch lp:~billy-olsen/charms/xenial/mongodb/trunk $distro/mongodb
 bzr branch lp:~narindergupta/opnfv/ntp $distro/ntp
-bzr branch lp:~opnfv-team/charms/trusty/haproxy/trunk $distro/haproxy
 
 git clone https://github.com/gnuoy/charm-congress.git $distro/charm-congress
-build
+build congress
+git clone -b stable/16.07 https://github.com/openstack/charm-aodh.git $distro/charm-aodh
+build aodh
 
-git clone https://github.com/openstack/charm-hacluster.git $distro/hacluster
-git clone https://github.com/openstack/charm-ceilometer.git $distro/ceilometer
-git clone https://github.com/openstack/charm-ceilometer-agent.git $distro/ceilometer-agent
-git clone https://github.com/openstack/charm-ceph-mon.git $distro/ceph
-git clone https://github.com/openstack/charm-ceph-osd.git $distro/ceph-osd
-git clone https://github.com/openstack/charm-ceph-radosgw.git $distro/ceph-radosgw
-git clone https://github.com/openstack/charm-cinder.git $distro/cinder
-git clone https://github.com/openstack/charm-cinder-ceph.git $distro/cinder-ceph
-git clone https://github.com/openstack/charm-glance.git $distro/glance
-git clone https://github.com/openstack/charm-keystone.git $distro/keystone
-git clone https://github.com/openstack/charm-percona-cluster.git $distro/percona-cluster
-git clone https://github.com/openstack/charm-neutron-gateway.git $distro/neutron-gateway
-git clone https://github.com/openstack/charm-neutron-openvswitch.git $distro/neutron-openvswitch
-git clone https://github.com/openstack/charm-nova-cloud-controller.git $distro/nova-cloud-controller
-git clone https://github.com/openstack/charm-nova-compute.git $distro/nova-compute
-git clone https://github.com/openstack/charm-openstack-dashboard.git $distro/openstack-dashboard
-git clone https://github.com/openstack/charm-rabbitmq-server.git $distro/rabbitmq-server
-git clone https://github.com/openstack/charm-heat.git $distro/heat
+git clone -b stable/16.07 https://github.com/openstack/charm-hacluster.git $distro/hacluster
+git clone -b stable/16.07 https://github.com/openstack/charm-ceilometer.git $distro/ceilometer
+git clone -b stable/16.07 https://github.com/openstack/charm-ceilometer-agent.git $distro/ceilometer-agent
+git clone -b stable/16.07 https://github.com/openstack/charm-ceph-mon.git $distro/ceph
+git clone -b stable/16.07 https://github.com/openstack/charm-ceph-osd.git $distro/ceph-osd
+git clone -b stable/16.07 https://github.com/openstack/charm-ceph-radosgw.git $distro/ceph-radosgw
+git clone -b stable/16.07 https://github.com/openstack/charm-cinder.git $distro/cinder
+git clone -b stable/16.07 https://github.com/openstack/charm-cinder-ceph.git $distro/cinder-ceph
+git clone -b stable/16.07 https://github.com/openstack/charm-glance.git $distro/glance
+git clone -b stable/16.07 https://github.com/openstack/charm-keystone.git $distro/keystone
+git clone -b stable/16.07 https://github.com/openstack/charm-percona-cluster.git $distro/percona-cluster
+git clone -b stable/16.07 https://github.com/openstack/charm-neutron-gateway.git $distro/neutron-gateway
+git clone -b stable/16.07 https://github.com/openstack/charm-neutron-openvswitch.git $distro/neutron-openvswitch
+git clone -b stable/16.07 https://github.com/openstack/charm-nova-cloud-controller.git $distro/nova-cloud-controller
+git clone -b stable/16.07 https://github.com/openstack/charm-nova-compute.git $distro/nova-compute
+git clone -b stable/16.07 https://github.com/openstack/charm-openstack-dashboard.git $distro/openstack-dashboard
+git clone -b stable/16.07 https://github.com/openstack/charm-rabbitmq-server.git $distro/rabbitmq-server
+git clone -b stable/16.07 https://github.com/openstack/charm-heat.git $distro/heat
 
 #charm pull cs:~openstack-charmers-next/hacluster $distro/hacluster
 #charm pull cs:~openstack-charmers-next/ceilometer $distro/ceilometer