commit 58a3390b7d728acf38fe9493f3cc8f990a9df2e2
author Ivan Berezovskiy <iberezovskiy@mirantis.com> Fri Dec 14 16:39:24 2018 +0000
committer Gerrit Code Review <mail@domain.com> Fri Dec 14 16:39:24 2018 +0000
tree 4bcff04845787f631fb36f8ffec67ac1cb2e0e35
parent 97994a91a425b12591b56e7330d493f3aad4452d
parent 15c0ac4da1e9af4df58a6b96c8115a419bafe467

Merge "Store gpg key on salt master"

config-drive/create_config_drive.sh

diff --git a/config-drive/create_config_drive.sh b/config-drive/create_config_drive.sh
index 0b1a79f..fae1a81 100644
--- a/config-drive/create_config_drive.sh
+++ b/config-drive/create_config_drive.sh
@@ -107,14 +107,12 @@
 fi
 
 if [ "$mk_pipelines" ] ; then
-        echo "adding mk_pipelines directory $mk_pipelines"
-        mkdir $config_dir/mk_pipelines
+        echo "adding mk-pipelines directory $mk_pipelines"
         cp -r $mk_pipelines $config_dir/mk-pipelines/
 fi
 
 if [ "$pipeline_library" ] ; then
-        echo "adding pipeline_library directory $pipeline_library"
-        mkdir $config_dir/pipeline_library
+        echo "adding pipeline-library directory $pipeline_library"
         cp -r $pipeline_library $config_dir/pipeline-library/
 fi
 

config-drive/master_config.yaml

diff --git a/config-drive/master_config.yaml b/config-drive/master_config.yaml
index c3db534..4508002 100644
--- a/config-drive/master_config.yaml
+++ b/config-drive/master_config.yaml
@@ -130,7 +130,7 @@
       jport=$(salt-call --out=text pillar.get jenkins:master:http:port | awk '{print $2}')
       jport=${jport:-8081}
       wait_time=0
-      until [[ $(curl -sL -w "%{http_code}" localhost:$jport -o /dev/null) == 200 ]] || [ $wait_time -eq 15 ]; do
+      until [[ $(curl -sL -w "%{http_code}" localhost:$jport -o /dev/null) == 200 ]] || [ $wait_time -eq 20 ]; do
         sleep $(( wait_time++ ))
       done
     }