From 0a9c1e59fc86b67e29281e5fb612f8374bb448ff Mon Sep 17 00:00:00 2001
From: "Denis V. Meltsaykin" <dmeltsaykin@mirantis.com>
Date: Fri, 17 Jun 2016 15:12:29 +0300
Subject: [PATCH] [jenkins] added an access rule

As starting from 9.0 the access to the Fuel node with SSH is
restricted to the PXE/Admin network only, it is necessary to
add an access rule after the Fuel node bootstrap. This will
let everyone to access Fuel from everywhere. Also updated
the jenkins job configuration.

Change-Id: Ic829b6bdd2c963ca8033450b1483e9050ba28f92
---
 jenkins/build_cluster/build_cluster.py |  1 +
 jenkins/build_cluster/config.xml       | 11 ++++++++---
 2 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/jenkins/build_cluster/build_cluster.py b/jenkins/build_cluster/build_cluster.py
index 841eb32..b8dfb6b 100755
--- a/jenkins/build_cluster/build_cluster.py
+++ b/jenkins/build_cluster/build_cluster.py
@@ -524,6 +524,7 @@ def configure_nailgun():
         "{usr}@{admip}".format(usr=cfg["FUEL_SSH_USERNAME"],
                                admip=str(cfg["ADMIN_SUBNET"].ip + 2)),
         "sed -i -e'/^ListenAddress.*$/d' /etc/ssh/sshd_config ; service sshd reload;"
+        "iptables -I INPUT -p tcp -m tcp --dport 22 -j ACCEPT;"
         "/usr/bin/fuel env -c --name {name} --release {release} {ha} {network};"
         "/usr/bin/fuel settings --env-id 1 --download;"
         "/usr/bin/fuel network --env-id 1 -d; {sed}"
diff --git a/jenkins/build_cluster/config.xml b/jenkins/build_cluster/config.xml
index 8e9eca8..2731ecd 100644
--- a/jenkins/build_cluster/config.xml
+++ b/jenkins/build_cluster/config.xml
@@ -4,6 +4,9 @@
   <description>When choosing parameters please remember that srv## slaves have 32G of RAM and 12 CPUs, while cz7377 has 256G RAM and 12 CPUs.</description>
   <keepDependencies>false</keepDependencies>
   <properties>
+    <org.bstick12.jenkinsci.plugins.leastload.LeastLoadDisabledProperty plugin="leastload@1.0.3">
+      <leastLoadDisabled>false</leastLoadDisabled>
+    </org.bstick12.jenkinsci.plugins.leastload.LeastLoadDisabledProperty>
     <hudson.model.ParametersDefinitionProperty>
       <parameterDefinitions>
         <hudson.model.StringParameterDefinition>
@@ -58,6 +61,7 @@
             <a class="string-array">
               <string>neutron_vlan</string>
               <string>neutron_gre</string>
+              <string>neutron_tun</string>
               <string>nova</string>
             </a>
           </choices>
@@ -85,7 +89,7 @@
         <org.jvnet.jenkins.plugins.nodelabelparameter.LabelParameterDefinition plugin="nodelabelparameter@1.5.1">
           <name>Label of Slave</name>
           <description>You can choose where to deploy your cluster by typing exact slave label here.</description>
-          <defaultValue>build-slave-1 || build-slave-2 || build-slave-3 || build-slave-4 || build-slave-5</defaultValue>
+          <defaultValue>build-slave</defaultValue>
           <allNodesMatchingLabel>false</allNodesMatchingLabel>
           <triggerIfResult>allCases</triggerIfResult>
           <nodeEligibility class="org.jvnet.jenkins.plugins.nodelabelparameter.node.AllNodeEligibility"/>
@@ -98,13 +102,14 @@
     </com.sonyericsson.rebuild.RebuildSettings>
   </properties>
   <scm class="hudson.scm.NullSCM"/>
-  <assignedNode>build-slave-1 || build-slave-2 || build-slave-3 || build-slave-4 || build-slave-5</assignedNode>
+  <assignedNode>build-slave</assignedNode>
   <canRoam>false</canRoam>
   <disabled>false</disabled>
   <blockBuildWhenDownstreamBuilding>false</blockBuildWhenDownstreamBuilding>
   <blockBuildWhenUpstreamBuilding>false</blockBuildWhenUpstreamBuilding>
   <triggers/>
   <concurrentBuild>true</concurrentBuild>
+  <customWorkspace>DEPLOY_CLUSTER</customWorkspace>
   <builders>
     <hudson.tasks.Shell>
       <command>set -x
@@ -145,7 +150,7 @@ python build_cluster.py --destroy
   <buildWrappers>
     <hudson.plugins.timestamper.TimestamperBuildWrapper plugin="timestamper@1.6"/>
     <hudson.plugins.ansicolor.AnsiColorBuildWrapper plugin="ansicolor@0.4.1">
-      <colorMapName>css</colorMapName>
+      <colorMapName>xterm</colorMapName>
     </hudson.plugins.ansicolor.AnsiColorBuildWrapper>
     <org.jenkinsci.plugins.buildnamesetter.BuildNameSetter plugin="build-name-setter@1.5.1">
       <template>${BUILD_USER_ID}-${BUILD_NUMBER}-${PERSONAL_TAG}</template>
-- 
2.45.2