Add floating ip to jenkins slave description

Also rename heat template to more precise name

Change-Id: If3f7b69cad27323761b1d7a14c11f0e0d7588626

diff --git a/maintenance-ci/common/data/base_heat.yml b/maintenance-ci/common/data/jenkins-slave.yml
similarity index 88%
rename from maintenance-ci/common/data/base_heat.yml
rename to maintenance-ci/common/data/jenkins-slave.yml
index 17872baed02b216ca0a5dd6645430e3627570dfb..ec4d9fb7d8d960c7515a8709149d3497109017f4 100644 (file)
--- a/maintenance-ci/common/data/base_heat.yml
+++ b/maintenance-ci/common/data/jenkins-slave.yml
@@ -71,13 +71,15 @@ resources:
           template: |
             #!/bin/bash
             mkdir -p /etc/jenkins-agent/
-            echo "$FLAVOR $LABELS" > /etc/jenkins-agent/labels
+            echo "FLAVOR LABELS" > /etc/jenkins-agent/labels
             echo "127.0.0.1 $(hostname)" >> /etc/hosts
+            echo "FLOATING" > /etc/jenkins-agent/description
             wc_notify --data-binary '{"status": "SUCCESS"}'
           params:
-           $FLAVOR: {get_param: flavor}
-           $LABELS: {get_param: jenkins_labels}
+           FLAVOR: {get_param: flavor}
+           LABELS: {get_param: jenkins_labels}
            wc_notify: { get_attr: [wait_handle, curl_cli] }
+           FLOATING: { get_attr: [ floating_ip, floating_ip_address ] }
 
 
 outputs:

diff --git a/maintenance-ci/common/jobs/deploy-jenkins-swarm.yaml b/maintenance-ci/common/jobs/deploy-jenkins-swarm.yaml
index 3c1ee9fd19a25ea9fe4a1d7459139a499c6d5a18..f3fcb64d1813bd30d7a7dce06cd4173325d4d3d9 100644 (file)
--- a/maintenance-ci/common/jobs/deploy-jenkins-swarm.yaml
+++ b/maintenance-ci/common/jobs/deploy-jenkins-swarm.yaml
@@ -10,7 +10,7 @@
     - string:
         name: HEAT_STACK_YAML
         description: "Stack yaml file"
-        default: "maintenance-ci/common/data/base_heat.yml"
+        default: "maintenance-ci/common/data/jenkins-slave.yml"
     - string:
         name: STACK_PREFIX
         description: "Stack prefix"

diff --git a/maintenance-ci/common/jobs/deploy_stack.yaml b/maintenance-ci/common/jobs/deploy_stack.yaml
index a97e919717ee8f1b45b54ed847052c8788e819c6..57f57f9df0eb7f8db7447894776d18d8f7e5ca9b 100644 (file)
--- a/maintenance-ci/common/jobs/deploy_stack.yaml
+++ b/maintenance-ci/common/jobs/deploy_stack.yaml
@@ -10,7 +10,7 @@
     - string:
         name: HEAT_STACK_YAML
         description: "Stack yaml file"
-        default: "maintenance-ci/common/data/base_heat.yml"
+        default: "maintenance-ci/common/data/jenkins-slave.yml"
     - string:
         name: STACK_PREFIX
         description: "Stack prefix"