Fix names of devstack slaves for sahara-ci labs

Now we are use new name for devstack slaves.

Change-Id: I4cd413ebeabd6e082c58090835198a0d0c96ede8

config/devstack/local.sh

@@ -18,7 +18,7 @@ MYSQL_CONF=/etc/mysql/my.cnf
 INTERFACE='br-ex'
 
 source $TOP_DIR/functions-common
-if [[ $(hostname -s) =~ trusty-42 ]]; then
+if [[ $(hostname -s) =~ stack-42 ]]; then
     HOST_IP='172.18.168.42'
 else
     HOST_IP='172.18.168.43'

config/devstack/localrc

@@ -35,7 +35,7 @@ VOLUME_BACKING_FILE_SIZE=100000M
 KEYSTONE_TOKEN_FORMAT=UUID
 
 FIXED_NETWORK_SIZE=256
-if [[ $(hostname -s) =~ trusty-42 ]]; then
+if [[ $(hostname -s) =~ stack-42 ]]; then
   FLOATING_RANGE=172.18.169.0/26
   PUBLIC_NETWORK_GATEWAY=172.18.169.1
 else

config/nodepool/config/sahara.yaml

@@ -11,13 +11,13 @@ gearman-servers:
   - host: 127.0.0.1
 
 labels:
-  - name:  trusty-42
+  - name:  stack-42
-    image: trusty-42
+    image: stack-42
     min-ready: 3
     providers:
       - name: cilab-1
-  - name:  trusty-43
+  - name:  stack-43
-    image: trusty-43
+    image: stack-43
     min-ready: 3
     providers:
       - name: cilab-2
@@ -35,7 +35,7 @@ providers:
     networks:
       - net-id: 'LAB_42_PRIVATE_NETWORK_ID'
     images:
-      - name: trusty-42
+      - name: stack-42
         base-image: 'ubuntu-14.04'
         min-ram: 2048
         private-key: '/etc/nodepool/id_dsa'
@@ -52,7 +52,7 @@ providers:
     networks:
       - net-id: 'LAB_43_PRIVATE_NETWORK_ID'
     images:
-      - name: trusty-43
+      - name: stack-43
         base-image: 'ubuntu-14.04'
         min-ram: 2048
         private-key: '/etc/nodepool/id_dsa'

config/nodepool/scripts/prepare_node.sh

@@ -71,7 +71,7 @@ sudo mkdir /home/jenkins/.ssh
 sudo chown -R jenkins:jenkins /home/jenkins
 
 # create simple openrc file
-if [[ "$HOSTNAME" =~ trusty-42 ]]; then
+if [[ "$HOSTNAME" =~ stack-42 ]]; then
    OPENSTACK_HOST="172.18.168.42"
    HOST="c1"
 else

jenkins_job_builder/diskimage.yaml

@@ -11,7 +11,7 @@
       - sahara-logs
       - console-log
       - trigger-cleanup
-    node: trusty-42 || trusty-43
+    node: stack-42 || stack-43
 
 - job-template:
     name: 'dib-{plugin}-{os}'
@@ -26,7 +26,7 @@
       - sahara-logs
       - console-log
       - trigger-cleanup
-    node: trusty-42 || trusty-43
+    node: stack-42 || stack-43
 
 - project:
     name: sahara-image-elements

jenkins_job_builder/sahara.yaml

@@ -11,7 +11,7 @@
       - sahara-logs
       - console-log
       - trigger-cleanup
-    node: trusty-42 || trusty-43
+    node: stack-42 || stack-43
 
 - job-template:
     name: '{pipeline}-{project_name}-{plugin}-{os}-aio'
@@ -26,7 +26,7 @@
       - sahara-logs
       - console-log
       - trigger-cleanup
-    node: trusty-42 || trusty-43
+    node: stack-42 || stack-43
 
 - job-template:
     name: '{pipeline}-sahara_tests-{plugin}-{os}-{release}'
@@ -41,7 +41,7 @@
       - sahara-logs
       - console-log
       - trigger-cleanup
-    node: trusty-42 || trusty-43
+    node: stack-42 || stack-43
 
 - project:
     name: sahara
@@ -167,7 +167,7 @@
                   \n<p>Please use this repository to make changes: <a href=\"https://git.openstack.org/openstack/sahara-ci-config\">https://git.openstack.org/openstack/sahara-ci-config</a></b>\
                  \n<p>This job runs pep8 check using trunk version of hacking"
     disabled: false
-    node: trusty-42 || trusty-43
+    node: stack-42 || stack-43
     builders:
     - gerrit-git-prep
     - ci-config-prep

slave-scripts/integration-cleanup.sh

@@ -9,7 +9,7 @@ job_type=$(echo $PREV_JOB | awk -F '-' '{ print $1 }')
 export os_username=$os_username
 export os_password=$os_password
 export os_tenant_name=$os_tenant_name
-if [[ "$HOST_NAME" =~ trusty-42 ]]; then
+if [[ "$HOST_NAME" =~ stack-42 ]]; then
     export os_auth_url="http://$OPENSTACK_HOST_LAB_42:5000/v2.0"
     export os_image_endpoint="http://$OPENSTACK_HOST_LAB_42:8004/v1/$LAB_42_TENANT_ID"
     host="c1"