Fix slave names

Also fix using wrong variable in define OS system for CDH

Change-Id: Id2a342adccef22d7b922371139c5b9baea73c499

config/nodepool/sahara.yaml

@@ -16,8 +16,8 @@ labels:
     min-ready: 4
     providers:
       - name: cilab-1
-  - name:  precise-nova-network
-    image: precise-nova-network
+  - name:  precise-nova
+    image: precise-nova
     min-ready: 4
     providers:
       - name: cilab-2
@@ -60,7 +60,7 @@ providers:
     networks:
       - net-id: 'STACK_SAHARA_PRIVATE_NETWORK_ID'
     images:
-      - name: precise-nova-network
+      - name: precise-nova
         base-image: 'ubuntu-12.04'
         min-ram: 2048
         private-key: '/etc/nodepool/id_dsa'

jenkins_job_builder/diskimage.yaml

@@ -19,7 +19,7 @@
                "PREV_BUILD=$BUILD_NUMBER-$ZUUL_CHANGE-$ZUUL_PATCHSET\
                \nPREV_JOB=dib-nova-heat-hdp_2\
                \nHOST_NAME=$NODE_NAME"
-    node: 'precise-nova-network'
+    node: 'precise-nova'
 
 - job-template:
     name: 'dib-{network}-direct-{plugin}-{os}-aio'
@@ -65,7 +65,7 @@
                "PREV_BUILD=$BUILD_NUMBER-$ZUUL_CHANGE-$ZUUL_PATCHSET\
                \nPREV_JOB=dib-nova-direct-{plugin}-aio\
                \nHOST_NAME=$NODE_NAME"
-    node: 'precise-nova-network'
+    node: 'precise-nova'
 
 - job-template:
     name: 'dib-neutron-heat-{plugin}-{os}'

jenkins_job_builder/sahara.yaml

@@ -22,7 +22,7 @@
                "PREV_BUILD=$BUILD_NUMBER-$ZUUL_CHANGE-$ZUUL_PATCHSET\
                \nPREV_JOB=$JOB_NAME\
                \nHOST_NAME=$NODE_NAME"
-    node: precise-neutron || precise-nova-network
+    node: precise-neutron || precise-nova
 
 - job-template:
     name: 'gate-saharaclient-neutron-{plugin-neutron}'
@@ -74,7 +74,7 @@
                "PREV_BUILD=$BUILD_NUMBER-$ZUUL_CHANGE-$ZUUL_PATCHSET\
                \nPREV_JOB=$JOB_NAME\
                \nHOST_NAME=$NODE_NAME"
-    node: 'precise-nova-network'
+    node: 'precise-nova'
 
 - job-template:
     name: 'gate-sahara-neutron-{plugin-neutron}'
@@ -126,7 +126,7 @@
                "PREV_BUILD=$BUILD_NUMBER-$ZUUL_CHANGE-$ZUUL_PATCHSET\
                \nPREV_JOB=$JOB_NAME
                \nHOST_NAME=$NODE_NAME"
-    node: 'precise-nova-network'
+    node: 'precise-nova'
 
 - project:
     name: sahara
@@ -189,7 +189,7 @@
                  \n<p>This job runs pep8 check using trunk version of hacking"
     disabled: false
     concurrent: true
-    node: precise-neutron || precise-nova-network
+    node: precise-neutron || precise-nova
 
     builders:
     - gerrit-git-prep

slave-scripts/gate-sahara.sh

@@ -76,7 +76,7 @@ case $JOB_TYPE in
        echo "Transient detected"
        ;;
     cdh*)
-       os_version=$(echo $JOB_NAME | awk -F '_' '{ print $2}')
+       os_version=$(echo $JOB_TYPE | awk -F '_' '{ print $2}')
        if [ "$os_version" == "centos" ]; then
           CDH_IMAGE=centos_cdh_latest
           hadoop_version=2c