From ce6195bf406237633247a1e7de2284d489f436e1 Mon Sep 17 00:00:00 2001
From: Vladimir Khlyunev <vkhlyunev@mirantis.com>
Date: Wed, 13 Feb 2019 15:37:06 +0400
Subject: [PATCH] Post-prototype fixes

Too painful to desrcibe it... Just let it be as is.

Change-Id: If700e91198af6920e9240756351e7b2aea1f2bb9
---
 .../data/{base-heat.yml => base_heat.yml}     |  0
 ...ins-jobs.yaml => update_jenkins_jobs.yaml} |  4 ++--
 .../common/scripts/deploy_heat_stack.sh       | 22 ++++++++++---------
 ...s-cleanup.sh => update_jenkins_cleanup.sh} |  0
 ...jenkins-jobs.sh => update_jenkins_jobs.sh} |  0
 ...nkins-views.sh => update_jenkins_views.sh} |  0
 6 files changed, 14 insertions(+), 12 deletions(-)
 rename maintenance-ci/common/data/{base-heat.yml => base_heat.yml} (100%)
 rename maintenance-ci/common/jobs/{update-jenkins-jobs.yaml => update_jenkins_jobs.yaml} (92%)
 rename maintenance-ci/common/scripts/{update-jenkins-cleanup.sh => update_jenkins_cleanup.sh} (100%)
 rename maintenance-ci/common/scripts/{update-jenkins-jobs.sh => update_jenkins_jobs.sh} (100%)
 rename maintenance-ci/common/scripts/{update-jenkins-views.sh => update_jenkins_views.sh} (100%)

diff --git a/maintenance-ci/common/data/base-heat.yml b/maintenance-ci/common/data/base_heat.yml
similarity index 100%
rename from maintenance-ci/common/data/base-heat.yml
rename to maintenance-ci/common/data/base_heat.yml
diff --git a/maintenance-ci/common/jobs/update-jenkins-jobs.yaml b/maintenance-ci/common/jobs/update_jenkins_jobs.yaml
similarity index 92%
rename from maintenance-ci/common/jobs/update-jenkins-jobs.yaml
rename to maintenance-ci/common/jobs/update_jenkins_jobs.yaml
index b1bcddb..7bdd713 100644
--- a/maintenance-ci/common/jobs/update-jenkins-jobs.yaml
+++ b/maintenance-ci/common/jobs/update_jenkins_jobs.yaml
@@ -52,11 +52,11 @@
 
     builders:
     - shell:
-        !include-raw: common/scripts/update-jenkins-jobs.sh
+        !include-raw: common/scripts/update_jenkins_jobs.sh
 
     publishers:
     - post-tasks:
       - matches:
         - log-text: '.'
         escalate-status: true
-        script: !include-raw: common/scripts/update-jenkins-cleanup.sh
\ No newline at end of file
+        script: !include-raw: common/scripts/update_jenkins_cleanup.sh
\ No newline at end of file
diff --git a/maintenance-ci/common/scripts/deploy_heat_stack.sh b/maintenance-ci/common/scripts/deploy_heat_stack.sh
index 4888775..d366457 100755
--- a/maintenance-ci/common/scripts/deploy_heat_stack.sh
+++ b/maintenance-ci/common/scripts/deploy_heat_stack.sh
@@ -9,20 +9,19 @@ if [ ! -d "${OPENSTACK_CLIENTS_VENV}" ] ; then
     deactivate
 fi
 
-
-parameter_string=''
-if [ ! -z ${IMAGE_NAME} ] ; then
-  parameter_string="${parameter_string} --parameter 'image=${IMAGE_NAME}'"
+parameter_string=""
+if [ ! -z "${FLAVOR_NAME}" ] ; then
+  parameter_string="$parameter_string --parameter \"flavor=${FLAVOR_NAME}\""
 fi
-if [ ! -z ${FLAVOR_NAME} ] ; then
-  parameter_string="${parameter_string} --parameter 'flavor=${FLAVOR_NAME}'"
+if [ ! -z "${IMAGE_NAME}" ] ; then
+  parameter_string="$parameter_string --parameter \"image=${IMAGE_NAME}\""
 fi
-if [ ! -z ${JENKINS_LABELS} ] ; then
-  parameter_string="${parameter_string} --parameter 'jenkins_labels=${JENKINS_LABELS}'"
+if [ ! -z "${JENKINS_LABELS}" ] ; then
+  parameter_string="$parameter_string --parameter \"jenkins_labels=${JENKINS_LABELS}\""
 fi
 
 # MAC OS compatibility, for manual usage
-if [ $(which md5sum) ] ; then
+if command -v md5sum ; then
   md5_cmd="md5sum"
 else
   md5_cmd="md5"
@@ -30,7 +29,10 @@ fi
 
 STACK_NAME="${STACK_PREFIX:-swarm_slave}_$(date +%s | "${md5_cmd}" | head -c 4)"
 
+set +x
 source "${OPENSTACK_CLIENTS_VENV}"/bin/activate
+set -x
   source "${OPENRC_FILE?}"
-  openstack stack create -t "${HEAT_STACK_YAML}" "${STACK_NAME}"
+  echo "openstack stack create -t ${HEAT_STACK_YAML} ${parameter_string} ${STACK_NAME}" | bash -
+  openstack stack output show "${STACK_NAME}" --all
 deactivate
\ No newline at end of file
diff --git a/maintenance-ci/common/scripts/update-jenkins-cleanup.sh b/maintenance-ci/common/scripts/update_jenkins_cleanup.sh
similarity index 100%
rename from maintenance-ci/common/scripts/update-jenkins-cleanup.sh
rename to maintenance-ci/common/scripts/update_jenkins_cleanup.sh
diff --git a/maintenance-ci/common/scripts/update-jenkins-jobs.sh b/maintenance-ci/common/scripts/update_jenkins_jobs.sh
similarity index 100%
rename from maintenance-ci/common/scripts/update-jenkins-jobs.sh
rename to maintenance-ci/common/scripts/update_jenkins_jobs.sh
diff --git a/maintenance-ci/common/scripts/update-jenkins-views.sh b/maintenance-ci/common/scripts/update_jenkins_views.sh
similarity index 100%
rename from maintenance-ci/common/scripts/update-jenkins-views.sh
rename to maintenance-ci/common/scripts/update_jenkins_views.sh
-- 
2.45.2