diff options
| author |   Tim Rozet <trozet@redhat.com> | 2017-08-01 20:13:54 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <gerrit@opnfv.org> | 2017-08-01 20:13:54 +0000 |
| commit | 98339f98d955bb046e9651f8c0c4f17eb2b0f79f (patch) | |
| tree | 14681adeab8bcdbd71f926064e3b0a13b56e5a12 /lib | |
| parent | d2ad6082c4499cd6b49b0963bf06fb912a6dd5ca (diff) | |
| parent | 2622e8417a9fca67fb0cac480410cf9c5912725a (diff) | |
Merge "Adds Barometer service"
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/ansible/playbooks/build_dependencies.yml | 2 | ||||
| -rwxr-xr-x | lib/overcloud-deploy-functions.sh | 7 | ||||
| -rw-r--r-- | lib/python/apex/deploy_settings.py | 3 |
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 b1845c55..e90f82c0 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'] |