summaryrefslogtreecommitdiffstats
path: root/lib
diff options
context:
space:
mode:
authorjhinman1 <john.hinman@intel.com>2017-07-14 20:28:14 -0400
committerjhinman1 <john.hinman@intel.com>2017-07-31 19:39:38 -0400
commit2622e8417a9fca67fb0cac480410cf9c5912725a (patch)
tree1753756c27f75a54a83180056be0b6543ee1dc8c /lib
parent64e055560e1f3ed47805d921541d884ea79624cf (diff)
Adds Barometer service
Adds Barometer service as a deploy option to Compute nodes by specifying barometer as true in deploy settings. Barometer packages are installed only for x86_64. Adds scenarios os-nosdn-bar-ha and os-nosdn-bar-noha. Add scenarios to opnfv-apex-common.spec. Temporarily remove references to snmp packages. apex-tripleo-heat-templates: I397d2557639c87ab8afacd076a5b9fd7c056dce7 apex-puppet-tripleo: I878ff8d1e0a8b96f3380bb77f168cd5a4c3f6543 Puppet module is at: https://github.com/johnhinman/puppet-barometer. Change-Id: Ic087c2052f7849ee2cf6c63224558c2b36a8ca1f Signed-off-by: jhinman1 <john.hinman@intel.com>
Diffstat (limited to 'lib')
-rw-r--r--lib/ansible/playbooks/build_dependencies.yml2
-rwxr-xr-xlib/overcloud-deploy-functions.sh7
-rw-r--r--lib/python/apex/deploy_settings.py3
3 files changed, 9 insertions, 3 deletions
diff --git a/lib/ansible/playbooks/build_dependencies.yml b/lib/ansible/playbooks/build_dependencies.yml
index 620b1b3f..c57474a0 100644
--- a/lib/ansible/playbooks/build_dependencies.yml
+++ b/lib/ansible/playbooks/build_dependencies.yml
@@ -8,7 +8,7 @@
yum:
name: python34,python34-devel,python34-jinja2,
python34-markupsafe, python2-virtualbmc,
- libguestfs-tools,bsdtar,libvirt,
+ libguestfs-tools,bsdtar,libvirt,yum-utils,
python2-oslo-config,python2-debtcollector,
make, python-pip, python-virtualenv, python34-pip
- name: Install Virtualization group
diff --git a/lib/overcloud-deploy-functions.sh b/lib/overcloud-deploy-functions.sh
index d2ae027a..e8f19238 100755
--- a/lib/overcloud-deploy-functions.sh
+++ b/lib/overcloud-deploy-functions.sh
@@ -94,7 +94,12 @@ function overcloud_deploy {
DEPLOY_OPTIONS+=" -e /home/stack/enable_rt_kvm.yaml"
fi
- # Make sure the correct overcloud image is available
+ # Enable Barometer service
+ if [ "${deploy_options_array['barometer']}" == 'True' ]; then
+ DEPLOY_OPTIONS+=" -e /usr/share/openstack-tripleo-heat-templates/environments/enable_barometer.yaml"
+ fi
+
+# Make sure the correct overcloud image is available
if [ ! -f $IMAGES/overcloud-full-${SDN_IMAGE}.qcow2 ]; then
echo "${red} $IMAGES/overcloud-full-${SDN_IMAGE}.qcow2 is required to execute your deployment."
echo "Please install the opnfv-apex package to provide this overcloud image for deployment.${reset}"
diff --git a/lib/python/apex/deploy_settings.py b/lib/python/apex/deploy_settings.py
index 1025fcea..06185941 100644
--- a/lib/python/apex/deploy_settings.py
+++ b/lib/python/apex/deploy_settings.py
@@ -31,7 +31,8 @@ OPT_DEPLOY_SETTINGS = ['performance',
'yardstick',
'dovetail',
'odl_vpp_routing_node',
- 'odl_vpp_netvirt']
+ 'odl_vpp_netvirt',
+ 'barometer']
VALID_ROLES = ['Controller', 'Compute', 'ObjectStorage']
VALID_PERF_OPTS = ['kernel', 'nova', 'vpp', 'ovs']