Merge "Adding yardstick installation using docker container"

diff --git a/config/deploy/deploy_settings.yaml b/config/deploy/deploy_settings.yaml
index ea35ae7..9d028a4 100644 (file)
--- a/config/deploy/deploy_settings.yaml
+++ b/config/deploy/deploy_settings.yaml
@@ -85,3 +85,6 @@ deploy_options:
   #      isolcpus: 0
   #      hugepage: 2M
   #      intel_iommu: 'on'
+
+  # Set yardstick option to install yardstick
+  #yardstick: false

diff --git a/lib/post-install-functions.sh b/lib/post-install-functions.sh
index 55b4fe4..e2d9327 100755 (executable)
--- a/lib/post-install-functions.sh
+++ b/lib/post-install-functions.sh
@@ -202,6 +202,16 @@ 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
+    ssh -T ${SSH_OPTIONS[@]} "stack@$UNDERCLOUD" <<EOI
+sudo yum install docker -y
+sudo systemctl start docker
+sudo systemctl enable docker
+sudo docker pull opnfv/yardstick
+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 3133d7f..24287b8 100644 (file)
--- a/lib/python/apex/deploy_settings.py
+++ b/lib/python/apex/deploy_settings.py
@@ -24,7 +24,7 @@ REQ_DEPLOY_SETTINGS = ['sdn_controller',
                        'vpp',
                        'ceph']
 
-OPT_DEPLOY_SETTINGS = ['performance', 'vsperf', 'ceph_device']
+OPT_DEPLOY_SETTINGS = ['performance', 'vsperf', 'ceph_device', 'yardstick']
 
 VALID_ROLES = ['Controller', 'Compute', 'ObjectStorage']
 VALID_PERF_OPTS = ['kernel', 'nova', 'vpp']