summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--config/deploy/deploy_settings.yaml3
-rwxr-xr-xlib/post-install-functions.sh17
-rw-r--r--lib/python/apex/deploy_settings.py6
3 files changed, 23 insertions, 3 deletions
diff --git a/config/deploy/deploy_settings.yaml b/config/deploy/deploy_settings.yaml
index 9d028a4..b3d3ac2 100644
--- a/config/deploy/deploy_settings.yaml
+++ b/config/deploy/deploy_settings.yaml
@@ -88,3 +88,6 @@ deploy_options:
# Set yardstick option to install yardstick
#yardstick: false
+
+ # Set dovetail option to install dovetail
+ #dovetail: false
diff --git a/lib/post-install-functions.sh b/lib/post-install-functions.sh
index 22d7c20..ae79ea5 100755
--- a/lib/post-install-functions.sh
+++ b/lib/post-install-functions.sh
@@ -213,16 +213,29 @@ EOI
overcloud_connect "compute0" "sudo sh -c 'cd /var/opt/vsperf/systems/ && ./build_base_machine.sh 2>&1 > /var/log/vsperf.log'"
fi
- # install docker and pull yardstick image
- if [[ "${deploy_options_array['yardstick']}" == 'True' ]]; then
+ # install docker
+ if [ "${deploy_options_array['yardstick']}" == 'True' ] || [ "${deploy_options_array['dovetail']}" == 'True' ]; then
ssh -T ${SSH_OPTIONS[@]} "stack@$UNDERCLOUD" <<EOI
sudo yum install docker -y
sudo systemctl start docker
sudo systemctl enable docker
+EOI
+ fi
+
+ # pull yardstick image
+ if [ "${deploy_options_array['yardstick']}" == 'True' ]; then
+ ssh -T ${SSH_OPTIONS[@]} "stack@$UNDERCLOUD" <<EOI
sudo docker pull opnfv/yardstick
EOI
fi
+ # pull dovetail image
+ if [ "${deploy_options_array['dovetail']}" == 'True' ]; then
+ ssh -T ${SSH_OPTIONS[@]} "stack@$UNDERCLOUD" <<EOI
+sudo docker pull opnfv/dovetail
+EOI
+ fi
+
# Collect deployment logs
ssh -T ${SSH_OPTIONS[@]} "stack@$UNDERCLOUD" <<EOI
mkdir -p ~/deploy_logs
diff --git a/lib/python/apex/deploy_settings.py b/lib/python/apex/deploy_settings.py
index 2a9d5a6..0d1939a 100644
--- a/lib/python/apex/deploy_settings.py
+++ b/lib/python/apex/deploy_settings.py
@@ -25,7 +25,11 @@ REQ_DEPLOY_SETTINGS = ['sdn_controller',
'ceph',
'gluon']
-OPT_DEPLOY_SETTINGS = ['performance', 'vsperf', 'ceph_device', 'yardstick']
+OPT_DEPLOY_SETTINGS = ['performance',
+ 'vsperf',
+ 'ceph_device',
+ 'yardstick',
+ 'dovetail']
VALID_ROLES = ['Controller', 'Compute', 'ObjectStorage']
VALID_PERF_OPTS = ['kernel', 'nova', 'vpp']