Merge "template-ize _testcases in create_kibana_dashboards.py"

diff --git a/jjb/armband/armband-ci-jobs.yml b/jjb/armband/armband-ci-jobs.yml
index bffa91d..f100a46 100644 (file)
--- a/jjb/armband/armband-ci-jobs.yml
+++ b/jjb/armband/armband-ci-jobs.yml
@@ -22,22 +22,22 @@
 #        colorado
 #--------------------------------
     pod:
-        - baremetal:
+        - armband-baremetal:
             slave-label: armband-baremetal
             installer: fuel
             <<: *colorado
-        - virtual:
+        - armband-virtual:
             slave-label: armband-virtual
             installer: fuel
             <<: *colorado
 #--------------------------------
 #        master
 #--------------------------------
-        - baremetal:
+        - armband-baremetal:
             slave-label: armband-baremetal
             installer: fuel
             <<: *master
-        - virtual:
+        - armband-virtual:
             slave-label: armband-virtual
             installer: fuel
             <<: *master
@@ -63,27 +63,27 @@
     scenario:
         # HA scenarios
         - 'os-nosdn-nofeature-ha':
-            auto-trigger-name: 'armband-{installer}-{scenario}-{pod}-{stream}-trigger'
+            auto-trigger-name: '{installer}-{scenario}-{pod}-{stream}-trigger'
         - 'os-odl_l2-nofeature-ha':
-            auto-trigger-name: 'armband-{installer}-{scenario}-{pod}-{stream}-trigger'
+            auto-trigger-name: '{installer}-{scenario}-{pod}-{stream}-trigger'
         - 'os-odl_l3-nofeature-ha':
-            auto-trigger-name: 'armband-{installer}-{scenario}-{pod}-{stream}-trigger'
+            auto-trigger-name: '{installer}-{scenario}-{pod}-{stream}-trigger'
         - 'os-odl_l2-bgpvpn-ha':
-            auto-trigger-name: 'armband-{installer}-{scenario}-{pod}-{stream}-trigger'
+            auto-trigger-name: '{installer}-{scenario}-{pod}-{stream}-trigger'
 
         # NOHA scenarios
         - 'os-odl_l2-nofeature-noha':
-            auto-trigger-name: 'armband-{installer}-{scenario}-{pod}-{stream}-trigger'
+            auto-trigger-name: '{installer}-{scenario}-{pod}-{stream}-trigger'
 
     jobs:
-        - 'armband-{installer}-{scenario}-{pod}-daily-{stream}'
-        - 'armband-{installer}-deploy-{pod}-daily-{stream}'
+        - '{installer}-{scenario}-{pod}-daily-{stream}'
+        - '{installer}-deploy-{pod}-daily-{stream}'
 
 ########################
 # job templates
 ########################
 - job-template:
-    name: 'armband-{installer}-{scenario}-{pod}-daily-{stream}'
+    name: '{installer}-{scenario}-{pod}-daily-{stream}'
 
     concurrent: false
 
@@ -96,7 +96,7 @@
         - build-blocker:
             use-build-blocker: true
             blocking-jobs:
-                - 'armband-{installer}-os-.*?-{pod}-daily-.*'
+                - '{installer}-os-.*?-{pod}-daily-.*'
             block-level: 'NODE'
 
     wrappers:
@@ -120,7 +120,7 @@
 
     builders:
         - trigger-builds:
-            - project: 'armband-{installer}-deploy-{pod}-daily-{stream}'
+            - project: '{installer}-deploy-{pod}-daily-{stream}'
               current-parameters: false
               predefined-parameters:
                 DEPLOY_SCENARIO={scenario}
@@ -137,9 +137,20 @@
                 build-step-failure-threshold: 'never'
                 failure-threshold: 'never'
                 unstable-threshold: 'FAILURE'
+        - trigger-builds:
+            - project: 'yardstick-{installer}-{pod}-daily-{stream}'
+              current-parameters: false
+              predefined-parameters:
+                DEPLOY_SCENARIO={scenario}
+              block: true
+              same-node: true
+              block-thresholds:
+                build-step-failure-threshold: 'never'
+                failure-threshold: 'never'
+                unstable-threshold: 'FAILURE'
 
 - job-template:
-    name: 'armband-{installer}-deploy-{pod}-daily-{stream}'
+    name: '{installer}-deploy-{pod}-daily-{stream}'
 
     concurrent: false
 
@@ -152,8 +163,8 @@
         - build-blocker:
             use-build-blocker: true
             blocking-jobs:
-                - 'armband-{installer}-deploy-{pod}-daily-{stream}'
-                - 'armband-{installer}-deploy-generic-daily-.*'
+                - '{installer}-deploy-{pod}-daily-{stream}'
+                - '{installer}-deploy-generic-daily-.*'
             block-level: 'NODE'
 
     parameters:
@@ -215,137 +226,137 @@
 # Enea Armband CI Baremetal Triggers running against master branch
 #-----------------------------------------------------------------
 - trigger:
-    name: 'armband-fuel-os-odl_l2-nofeature-ha-baremetal-master-trigger'
+    name: 'fuel-os-odl_l2-nofeature-ha-armband-baremetal-master-trigger'
     triggers:
-        - timed: '0 3 * * 1'
+        - timed: '0 3,15 * * 1'
 - trigger:
-    name: 'armband-fuel-os-nosdn-nofeature-ha-baremetal-master-trigger'
+    name: 'fuel-os-nosdn-nofeature-ha-armband-baremetal-master-trigger'
     triggers:
-        - timed: '0 3 * * 2'
+        - timed: '0 3,15 * * 2'
 - trigger:
-    name: 'armband-fuel-os-odl_l3-nofeature-ha-baremetal-master-trigger'
+    name: 'fuel-os-odl_l3-nofeature-ha-armband-baremetal-master-trigger'
     triggers:
-        - timed: '0 3 * * 3'
+        - timed: '0 3,15 * * 3'
 - trigger:
-    name: 'armband-fuel-os-odl_l2-bgpvpn-ha-baremetal-master-trigger'
+    name: 'fuel-os-odl_l2-bgpvpn-ha-armband-baremetal-master-trigger'
     triggers:
-        - timed: '0 3 * * 4'
+        - timed: '0 3,15 * * 4'
 - trigger:
-    name: 'armband-fuel-os-odl_l2-nofeature-noha-baremetal-master-trigger'
+    name: 'fuel-os-odl_l2-nofeature-noha-armband-baremetal-master-trigger'
     triggers:
-        - timed: '0 3 * * 5'
+        - timed: '0 3,15 * * 5'
 #----------------------------------------------------------------------
 # Enea Armband CI Baremetal Triggers running against colorado branch
 #----------------------------------------------------------------------
 - trigger:
-    name: 'armband-fuel-os-odl_l2-nofeature-ha-baremetal-colorado-trigger'
+    name: 'fuel-os-odl_l2-nofeature-ha-armband-baremetal-colorado-trigger'
     triggers:
-        - timed: '0 15 * * 1'
+        - timed: '0 4,16 * * 1'
 - trigger:
-    name: 'armband-fuel-os-nosdn-nofeature-ha-baremetal-colorado-trigger'
+    name: 'fuel-os-nosdn-nofeature-ha-armband-baremetal-colorado-trigger'
     triggers:
-        - timed: '0 15 * * 2'
+        - timed: '0 4,16 * * 2'
 - trigger:
-    name: 'armband-fuel-os-odl_l3-nofeature-ha-baremetal-colorado-trigger'
+    name: 'fuel-os-odl_l3-nofeature-ha-armband-baremetal-colorado-trigger'
     triggers:
-        - timed: '0 15 * * 3'
+        - timed: '0 4,16 * * 3'
 - trigger:
-    name: 'armband-fuel-os-odl_l2-bgpvpn-ha-baremetal-colorado-trigger'
+    name: 'fuel-os-odl_l2-bgpvpn-ha-armband-baremetal-colorado-trigger'
     triggers:
-        - timed: '0 15 * * 4'
+        - timed: '0 4,16 * * 4'
 - trigger:
-    name: 'armband-fuel-os-odl_l2-nofeature-noha-baremetal-colorado-trigger'
+    name: 'fuel-os-odl_l2-nofeature-noha-armband-baremetal-colorado-trigger'
     triggers:
-        - timed: '0 15 * * 5'
+        - timed: '0 4,16 * * 5'
 #---------------------------------------------------------------
 # Enea Armband CI Virtual Triggers running against master branch
 #---------------------------------------------------------------
 - trigger:
-    name: 'armband-fuel-os-odl_l2-nofeature-ha-virtual-master-trigger'
+    name: 'fuel-os-odl_l2-nofeature-ha-armband-virtual-master-trigger'
     triggers:
         - timed: ''
 - trigger:
-    name: 'armband-fuel-os-nosdn-nofeature-ha-virtual-master-trigger'
+    name: 'fuel-os-nosdn-nofeature-ha-armband-virtual-master-trigger'
     triggers:
         - timed: ''
 - trigger:
-    name: 'armband-fuel-os-odl_l3-nofeature-ha-virtual-master-trigger'
+    name: 'fuel-os-odl_l3-nofeature-ha-armband-virtual-master-trigger'
     triggers:
         - timed: ''
 - trigger:
-    name: 'armband-fuel-os-odl_l2-bgpvpn-ha-virtual-master-trigger'
+    name: 'fuel-os-odl_l2-bgpvpn-ha-armband-virtual-master-trigger'
     triggers:
         - timed: ''
 - trigger:
-    name: 'armband-fuel-os-odl_l2-nofeature-noha-virtual-master-trigger'
+    name: 'fuel-os-odl_l2-nofeature-noha-armband-virtual-master-trigger'
     triggers:
         - timed: ''
 #--------------------------------------------------------------------
 # Enea Armband CI Virtual Triggers running against colorado branch
 #--------------------------------------------------------------------
 - trigger:
-    name: 'armband-fuel-os-odl_l2-nofeature-ha-virtual-colorado-trigger'
+    name: 'fuel-os-odl_l2-nofeature-ha-armband-virtual-colorado-trigger'
     triggers:
         - timed: ''
 - trigger:
-    name: 'armband-fuel-os-nosdn-nofeature-ha-virtual-colorado-trigger'
+    name: 'fuel-os-nosdn-nofeature-ha-armband-virtual-colorado-trigger'
     triggers:
         - timed: ''
 - trigger:
-    name: 'armband-fuel-os-odl_l3-nofeature-ha-virtual-colorado-trigger'
+    name: 'fuel-os-odl_l3-nofeature-ha-armband-virtual-colorado-trigger'
     triggers:
         - timed: ''
 - trigger:
-    name: 'armband-fuel-os-odl_l2-bgpvpn-ha-virtual-colorado-trigger'
+    name: 'fuel-os-odl_l2-bgpvpn-ha-armband-virtual-colorado-trigger'
     triggers:
         - timed: ''
 - trigger:
-    name: 'armband-fuel-os-odl_l2-nofeature-noha-virtual-colorado-trigger'
+    name: 'fuel-os-odl_l2-nofeature-noha-armband-virtual-colorado-trigger'
     triggers:
         - timed: ''
 #----------------------------------------------------------
 # Enea Armband POD 2 Triggers running against master branch
 #----------------------------------------------------------
 - trigger:
-    name: 'armband-fuel-os-odl_l2-nofeature-ha-arm-pod2-master-trigger'
+    name: 'fuel-os-odl_l2-nofeature-ha-arm-pod2-master-trigger'
     triggers:
         - timed: ''
 - trigger:
-    name: 'armband-fuel-os-nosdn-nofeature-ha-arm-pod2-master-trigger'
+    name: 'fuel-os-nosdn-nofeature-ha-arm-pod2-master-trigger'
     triggers:
         - timed: ''
 - trigger:
-    name: 'armband-fuel-os-odl_l3-nofeature-ha-arm-pod2-master-trigger'
+    name: 'fuel-os-odl_l3-nofeature-ha-arm-pod2-master-trigger'
     triggers:
         - timed: ''
 - trigger:
-    name: 'armband-fuel-os-odl_l2-bgpvpn-ha-arm-pod2-master-trigger'
+    name: 'fuel-os-odl_l2-bgpvpn-ha-arm-pod2-master-trigger'
     triggers:
         - timed: ''
 - trigger:
-    name: 'armband-fuel-os-odl_l2-nofeature-noha-arm-pod2-master-trigger'
+    name: 'fuel-os-odl_l2-nofeature-noha-arm-pod2-master-trigger'
     triggers:
         - timed: ''
 #---------------------------------------------------------------
 # Enea Armband POD 2 Triggers running against colorado branch
 #---------------------------------------------------------------
 - trigger:
-    name: 'armband-fuel-os-odl_l2-nofeature-ha-arm-pod2-colorado-trigger'
+    name: 'fuel-os-odl_l2-nofeature-ha-arm-pod2-colorado-trigger'
     triggers:
         - timed: ''
 - trigger:
-    name: 'armband-fuel-os-nosdn-nofeature-ha-arm-pod2-colorado-trigger'
+    name: 'fuel-os-nosdn-nofeature-ha-arm-pod2-colorado-trigger'
     triggers:
         - timed: ''
 - trigger:
-    name: 'armband-fuel-os-odl_l3-nofeature-ha-arm-pod2-colorado-trigger'
+    name: 'fuel-os-odl_l3-nofeature-ha-arm-pod2-colorado-trigger'
     triggers:
         - timed: ''
 - trigger:
-    name: 'armband-fuel-os-odl_l2-bgpvpn-ha-arm-pod2-colorado-trigger'
+    name: 'fuel-os-odl_l2-bgpvpn-ha-arm-pod2-colorado-trigger'
     triggers:
         - timed: ''
 - trigger:
-    name: 'armband-fuel-os-odl_l2-nofeature-noha-arm-pod2-colorado-trigger'
+    name: 'fuel-os-odl_l2-nofeature-noha-arm-pod2-colorado-trigger'
     triggers:
         - timed: ''

diff --git a/jjb/armband/armband-deploy.sh b/jjb/armband/armband-deploy.sh
index d762650..fb4c1ea 100755 (executable)
--- a/jjb/armband/armband-deploy.sh
+++ b/jjb/armband/armband-deploy.sh
@@ -52,7 +52,7 @@ if [[ $LAB_CONFIG_URL =~ ^(git|ssh):// ]]; then
     LAB_CONFIG_URL=file://${WORKSPACE}/lab-config
 
     # Source local_env if present, which contains POD-specific config
-    local_env="$LAB_CONFIG_URL/labs/$LAB_NAME/$POD_NAME/fuel/config/local_env"
+    local_env="${WORKSPACE}/lab-config/labs/$LAB_NAME/$POD_NAME/fuel/config/local_env"
     if [ -e $local_env ]; then
         echo "-- Sourcing local environment file"
         source $local_env

diff --git a/jjb/functest/functest-ci-jobs.yml b/jjb/functest/functest-ci-jobs.yml
index 3925450..0f0caba 100644 (file)
--- a/jjb/functest/functest-ci-jobs.yml
+++ b/jjb/functest/functest-ci-jobs.yml
@@ -96,6 +96,23 @@
             slave-label: '{pod}'
             installer: apex
             <<: *colorado
+# armband CI PODs
+        - armband-baremetal:
+            slave-label: armband-baremetal
+            installer: fuel
+            <<: *master
+        - armband-virtual:
+            slave-label: armband-virtual
+            installer: fuel
+            <<: *master
+        - armband-baremetal:
+            slave-label: armband-baremetal
+            installer: fuel
+            <<: *colorado
+        - armband-virtual:
+            slave-label: armband-virtual
+            installer: fuel
+            <<: *colorado
 #--------------------------------
 #        None-CI PODs
 #--------------------------------
@@ -119,7 +136,7 @@
             slave-label: '{pod}'
             installer: apex
             <<: *master
-        - arm-pod1:
+        - arm-pod2:
             slave-label: '{pod}'
             installer: fuel
             <<: *master
@@ -143,7 +160,7 @@
             slave-label: '{pod}'
             installer: fuel
             <<: *colorado
-        - arm-pod1:
+        - arm-pod2:
             slave-label: '{pod}'
             installer: fuel
             <<: *colorado
@@ -342,4 +359,4 @@
     name: functest-exit
     builders:
         - shell:
-            !include-raw: ./functest-exit.sh
\ No newline at end of file
+            !include-raw: ./functest-exit.sh

diff --git a/jjb/kvmfornfv/kvmfornfv-upload-artifact.sh b/jjb/kvmfornfv/kvmfornfv-upload-artifact.sh
index 422626e..6f8fff3 100755 (executable)
--- a/jjb/kvmfornfv/kvmfornfv-upload-artifact.sh
+++ b/jjb/kvmfornfv/kvmfornfv-upload-artifact.sh
@@ -35,6 +35,7 @@ esac
     echo "OPNFV_ARTIFACT_URL=$GS_UPLOAD_LOCATION"
     echo "OPNFV_BUILD_URL=$BUILD_URL"
 ) > $WORKSPACE/opnfv.properties
+source $WORKSPACE/opnfv.properties
 
 # upload artifacts
 gsutil cp -r $WORKSPACE/build_output/* $GS_UPLOAD_LOCATION > $WORKSPACE/gsutil.log 2>&1
@@ -45,11 +46,11 @@ gsutil -m setmeta -r \
 # upload metadata file for the artifacts built by daily job
 if [[ "$JOB_TYPE" == "daily" ]]; then
     gsutil cp $WORKSPACE/opnfv.properties $GS_UPLOAD_LOCATION/opnfv.properties > $WORKSPACE/gsutil.log 2>&1
-    gsutil cp $WORKSPACE/opnfv.properties $GS_URL/latest.properties > $WORKSPACE/gsutil.log 2>&1
+    gsutil cp $WORKSPACE/opnfv.properties gs://$GS_URL/latest.properties > $WORKSPACE/gsutil.log 2>&1
     gsutil -m setmeta -r \
         -h "Cache-Control:private, max-age=0, no-transform" \
-        $GS_UPLOAD_LOCATION/opnfv-${OPNFV_ARTIFACT_VERSION}.properties \
-        $GS_URL/latest.properties > /dev/null 2>&1
+        $GS_UPLOAD_LOCATION/opnfv.properties \
+        gs://$GS_URL/latest.properties > /dev/null 2>&1
 fi
 
 gsutil ls $GS_UPLOAD_LOCATION > /dev/null 2>&1

diff --git a/jjb/opnfv/opnfv-docker.sh b/jjb/opnfv/opnfv-docker.sh
index ef47384..07198c6 100644 (file)
--- a/jjb/opnfv/opnfv-docker.sh
+++ b/jjb/opnfv/opnfv-docker.sh
@@ -110,7 +110,12 @@ echo "Tag version to be build and pushed: $DOCKER_TAG"
 # Start the build
 echo "Building docker image: $DOCKER_REPO_NAME:$DOCKER_BRANCH_TAG"
 
-docker build --no-cache -t $DOCKER_REPO_NAME:$DOCKER_BRANCH_TAG .
+if [[ $DOCKER_REPO_NAME == *"functest"* ]]; then
+    docker build --no-cache -t $DOCKER_REPO_NAME:$DOCKER_BRANCH_TAG --build-arg BRANCH=$branch .
+else
+    docker build --no-cache -t $DOCKER_REPO_NAME:$DOCKER_BRANCH_TAG .
+fi
+
 echo "Creating tag '$DOCKER_TAG'..."
 docker tag -f $DOCKER_REPO_NAME:$DOCKER_BRANCH_TAG $DOCKER_REPO_NAME:$DOCKER_TAG
 

diff --git a/jjb/opnfv/slave-params.yml b/jjb/opnfv/slave-params.yml
index 0c8435d..c7ec6aa 100644 (file)
--- a/jjb/opnfv/slave-params.yml
+++ b/jjb/opnfv/slave-params.yml
@@ -603,24 +603,6 @@
             name: SSH_KEY
             default: /root/.ssh/id_rsa
             description: 'SSH key to use for Apex'
-- parameter:
-    name: 'arm-pod1-defaults'
-    parameters:
-        - node:
-            name: SLAVE_NAME
-            description: 'Slave name on Jenkins'
-            allowed-slaves:
-                - arm-pod1
-            default-slaves:
-                - arm-pod1
-        - string:
-            name: GIT_BASE
-            default: https://gerrit.opnfv.org/gerrit/$PROJECT
-            description: 'Git URL to use on this Jenkins Slave'
-        - string:
-            name: LAB_CONFIG_URL
-            default: ssh://git@git.enea.com/pharos/lab-config
-            description: 'Base URI to the configuration directory'
 - parameter:
     name: 'arm-pod2-defaults'
     parameters:

diff --git a/jjb/releng-macros.yaml b/jjb/releng-macros.yaml
index eb4ee52..2aa775f 100644 (file)
--- a/jjb/releng-macros.yaml
+++ b/jjb/releng-macros.yaml
@@ -209,12 +209,10 @@
             mv docs_output "$local_path"
             gsutil -m cp -r "$local_path" "gs://$gs_base"
 
-            if gsutil ls "gs://$gs_path" | grep -e 'html$' > /dev/null 2>&1 ; then
-                gsutil -m setmeta \
-                    -h "Content-Type:text/html" \
-                    -h "Cache-Control:private, max-age=0, no-transform" \
-                    "gs://$gs_path"/**.html
-            fi
+            gsutil -m setmeta \
+                -h "Content-Type:text/html" \
+                -h "Cache-Control:private, max-age=0, no-transform" \
+                "gs://$gs_path"/**.html > /dev/null 2>&1
 
             echo "Document link(s):" >> gerrit_comment.txt
             find "$local_path" | grep -e 'index.html$' -e 'pdf$' | \
@@ -245,12 +243,10 @@
             mv docs_output "$local_path"
             gsutil -m cp -r "$local_path" "gs://$GS_URL"
 
-            if gsutil ls "gs://$gs_path" | grep -e 'html$' > /dev/null 2>&1 ; then
-                gsutil -m setmeta \
-                    -h "Content-Type:text/html" \
-                    -h "Cache-Control:private, max-age=0, no-transform" \
-                    "gs://$gs_path"/**.html
-            fi
+            gsutil -m setmeta \
+                -h "Content-Type:text/html" \
+                -h "Cache-Control:private, max-age=0, no-transform" \
+                "gs://$gs_path"/**.html > /dev/null 2>&1
 
             echo "Document link(s):" >> gerrit_comment.txt
             find "$local_path" | grep -e 'index.html$' -e 'pdf$' | \

diff --git a/jjb/yardstick/yardstick-ci-jobs.yml b/jjb/yardstick/yardstick-ci-jobs.yml
index c2dbfcd..dd88a52 100644 (file)
--- a/jjb/yardstick/yardstick-ci-jobs.yml
+++ b/jjb/yardstick/yardstick-ci-jobs.yml
@@ -49,6 +49,27 @@
             installer: fuel
             auto-trigger-name: 'daily-trigger-disabled'
             <<: *colorado
+# armband CI PODs
+        - armband-baremetal:
+            slave-label: armband-baremetal
+            installer: fuel
+            auto-trigger-name: 'daily-trigger-disabled'
+            <<: *master
+        - armband-virtual:
+            slave-label: armband-virtual
+            installer: fuel
+            auto-trigger-name: 'daily-trigger-disabled'
+            <<: *master
+        - armband-baremetal:
+            slave-label: armband-baremetal
+            installer: fuel
+            auto-trigger-name: 'daily-trigger-disabled'
+            <<: *colorado
+        - armband-virtual:
+            slave-label: armband-virtual
+            installer: fuel
+            auto-trigger-name: 'daily-trigger-disabled'
+            <<: *colorado
 # joid CI PODs
         - baremetal:
             slave-label: joid-baremetal
@@ -141,7 +162,7 @@
             installer: fuel
             auto-trigger-name: 'daily-trigger-disabled'
             <<: *colorado
-        - arm-pod1:
+        - arm-pod2:
             slave-label: '{pod}'
             installer: fuel
             auto-trigger-name: 'daily-trigger-disabled'
@@ -281,6 +302,20 @@
             name: YARDSTICK_DB_BACKEND
             default: ''
             description: 'Arguments to use in order to choose the backend DB'
+- parameter:
+    name: 'yardstick-params-armband-baremetal'
+    parameters:
+        - string:
+            name: YARDSTICK_DB_BACKEND
+            default: '-i 104.197.68.199:8086'
+            description: 'Arguments to use in order to choose the backend DB'
+- parameter:
+    name: 'yardstick-params-armband-virtual'
+    parameters:
+        - string:
+            name: YARDSTICK_DB_BACKEND
+            default: ''
+            description: 'Arguments to use in order to choose the backend DB'
 - parameter:
     name: 'yardstick-params-joid-baremetal'
     parameters:
@@ -375,7 +410,7 @@
             description: 'Arguments to use in order to choose the backend DB'
 
 - parameter:
-    name: 'yardstick-params-arm-pod1'
+    name: 'yardstick-params-arm-pod2'
     parameters:
         - string:
             name: YARDSTICK_DB_BACKEND

diff --git a/prototypes/puppet-infracloud/README.md b/prototypes/puppet-infracloud/README.md
index dd9e7bb..37d575c 100644 (file)
--- a/prototypes/puppet-infracloud/README.md
+++ b/prototypes/puppet-infracloud/README.md
@@ -31,7 +31,7 @@ In jumphost, follow that steps:
 
     git clone https://gerrit.opnfv.org/gerrit/releng /opt/releng
 
-2. Create OpenStack clouds config directory:
+2. Create OpenStack clouds config directory::
 
     mkdir -p /root/.config/openstack
 
@@ -39,14 +39,23 @@ In jumphost, follow that steps:
 
     cp /opt/releng/prototypes/puppet-infracloud/creds/clouds.yaml /root/.config/openstack/
 
-4. Install openstack-client:
+4. Install python-dev package as the installation of python-openstackclient depends on it
+
+    apt-get install -y python-dev
+
+5. Install openstack-client. (version 3.2.0 is known to work)::
 
     pip install python-openstackclient
 
-5. Export the desired cloud::
+6. Update /etc/hosts and add controller00::
+
+    192.168.122.3 controller00
+    192.168.122.3 controller00.opnfvlocal controller00
+
+7. Export the desired cloud::
 
     export OS_CLOUD=opnfv
 
-6. Start using it::
+8. Start using it::
 
-    openstack server list
+    openstack service list