summaryrefslogtreecommitdiffstats
path: root/lib
diff options
context:
space:
mode:
authorzshi <zshi@redhat.com>2017-02-27 10:36:42 +0800
committerzshi <zshi@redhat.com>2017-02-27 12:43:50 +0800
commit8823495d428e33335c6012e056278e86b34ea3c7 (patch)
treea3e374cd3f539fe2cf952607ff073dee17029cc9 /lib
parent1ef3c3600d5b1692f65a445cf9e1c2e10a46314e (diff)
Adding dovetail installation using docker container
This patch adds dovetail option to deploy settings, installs dovetail image to undercloud. Change-Id: If7a763d9f6b27655dbb1f5855f438ab11bd88a82 Signed-off-by: zshi <zshi@redhat.com>
Diffstat (limited to 'lib')
-rwxr-xr-xlib/post-install-functions.sh17
-rw-r--r--lib/python/apex/deploy_settings.py6
2 files changed, 20 insertions, 3 deletions
diff --git a/lib/post-install-functions.sh b/lib/post-install-functions.sh
index 22d7c20d..ae79ea5e 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 2a9d5a67..0d1939a4 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']