summaryrefslogtreecommitdiffstats
path: root/build/instack.sh
diff options
context:
space:
mode:
authorMichael Chapman <michapma@redhat.com>2016-01-20 00:54:52 -0500
committerMichael Chapman <woppin@gmail.com>2016-01-21 16:21:56 +1100
commit4a6d9adfc7f6ea5938b21055acbd059856aaebf2 (patch)
tree49cc5586f23d4f69b89dc49171bc1f43389de21d /build/instack.sh
parent00f0590f04797aeb429234863dd384fa5317b609 (diff)
Aodh
Add support for Aodh. Current packaged module is out of date and the module is very young, so it is pulled from git on liberty branch. Change-Id: Iff72c8b63970021e212bb9d78f9a805d108f0bcf
Diffstat (limited to 'build/instack.sh')
-rwxr-xr-xbuild/instack.sh24
1 files changed, 24 insertions, 0 deletions
diff --git a/build/instack.sh b/build/instack.sh
index 80cfa473..e0d71d51 100755
--- a/build/instack.sh
+++ b/build/instack.sh
@@ -242,11 +242,16 @@ pushd stack
# make a copy of the cached overcloud-full image
cp overcloud-full.qcow2 overcloud-full-odl.qcow2
+#install aodh on overcloud
+AODH_PKG="openstack-aodh-api,openstack-aodh-common,openstack-aodh-compat,openstack-aodh-evaluator,openstack-aodh-expirer"
+AODH_PKG+=",openstack-aodh-listener,openstack-aodh-notifier"
+
# remove unnecessary packages and install necessary packages
LIBGUESTFS_BACKEND=direct virt-customize --run-command "yum remove -y openstack-neutron-openvswitch" \
--install https://dl.fedoraproject.org/pub/epel/epel-release-latest-7.noarch.rpm \
--upload /etc/yum.repos.d/opendaylight.repo:/etc/yum.repos.d/opendaylight.repo \
--install opendaylight,python-networking-odl,ceph \
+ --install $AODH_PKG \
-a overcloud-full-odl.qcow2
## WORK AROUND
@@ -265,6 +270,7 @@ LIBGUESTFS_BACKEND=direct virt-customize --upload puppet-opendaylight.tar.gz:/et
LIBGUESTFS_BACKEND=direct virt-customize --upload ../opnfv-tripleo-heat-templates.patch:/tmp \
--run-command "cd /usr/share/openstack-tripleo-heat-templates/ && patch -Np1 < /tmp/opnfv-tripleo-heat-templates.patch" \
-a instack.qcow2
+
LIBGUESTFS_BACKEND=direct virt-customize --upload ../opendaylight-puppet-neutron.patch:/tmp \
--run-command "cd /etc/puppet/modules/neutron && patch -Np1 < /tmp/opendaylight-puppet-neutron.patch" \
-a overcloud-full-odl.qcow2
@@ -276,6 +282,24 @@ LIBGUESTFS_BACKEND=direct virt-customize --upload ../puppet-cinder-quota-fix.pat
--run-command "cd /etc/puppet/modules/cinder && patch -Np1 < /tmp/puppet-cinder-quota-fix.patch" \
-a overcloud-full-odl.qcow2
# END REMOVE ME AFTER Brahmaputra
+
+## END WORK AROUND
+popd
+
+## WORK AROUND
+## Current package of puppet-aodh is old
+
+pushd stack
+rm -rf aodh
+git clone https://github.com/openstack/puppet-aodh aodh
+pushd aodh
+git checkout stable/liberty
+popd
+
+tar -czf puppet-aodh.tar.gz aodh
+LIBGUESTFS_BACKEND=direct virt-customize --upload puppet-aodh.tar.gz:/etc/puppet/modules/ \
+ --run-command "cd /etc/puppet/modules/ && rm -rf aodh && tar xzf puppet-aodh.tar.gz" \
+ -a overcloud-full-odl.qcow2
## END WORK AROUND
popd