From: Thanh Ha <thanh.ha@linuxfoundation.org>
Date: Mon, 24 Jul 2017 22:10:08 +0000 (-0400)
Subject: Remove unnecessary openstack configuration file
X-Git-Tag: v0.5.2~1
X-Git-Url: https://gerrit.linuxfoundation.org/infra/gitweb?a=commitdiff_plain;h=91d975d5c426a08e82d8a6bbe1e298fa82f2b7b5;p=releng%2Fglobal-jjb.git

Remove unnecessary openstack configuration file

The packer jobs do not use openstack so do not require a clouds.yaml
file.

Change-Id: Iaccaa906980eb077676a3dc4b9100a91ec65f8c0
Signed-off-by: Thanh Ha <thanh.ha@linuxfoundation.org>
---

diff --git a/README.md b/README.md
index dbbf0d99..bc6fcc71 100644
--- a/README.md
+++ b/README.md
@@ -181,7 +181,6 @@ ci-management.yaml:
     project: ci-management
     project-name: ci-management
     branch: master
-    os-cloud-file-id: 'ci-managed-file-id'
     build-node: centos7-basebuild-2c-1g
 
     platforms:
@@ -208,8 +207,6 @@ Required parameters:
 **project**: is the project repo as defined in source control.
 **project-name**: is a custom name to call the job in Jenkins.
 **build-node**: is the name of the builder to use when building (Jenkins label).
-**os-cloud-file-id**: is the name of the managed file-id, which contains
-credentials required for packer to spin up build nodes on the cloud provider.
 **platforms**: is a list of supported platforms.
 **templates**: is a list of supported templates.
 
diff --git a/jjb/lf-macros.yaml b/jjb/lf-macros.yaml
index d0f596b4..20a5c6b8 100644
--- a/jjb/lf-macros.yaml
+++ b/jjb/lf-macros.yaml
@@ -76,10 +76,8 @@
     builders:
       - config-file-provider:
           files:
-            - file-id: '{os-cloud-file-id}'
-              target: '$HOME/.config/openstack/clouds.yaml'
-            - file-id: 'packer-cloud-env'
-              variable: 'CLOUDENV'
+            - file-id: packer-cloud-env
+              variable: CLOUDENV
       - inject:
           properties-content: |
               PACKER_PLATFORM={platform}
diff --git a/shell/packer-clear-credentials.sh b/shell/packer-clear-credentials.sh
index 099f5591..093b16b4 100644
--- a/shell/packer-clear-credentials.sh
+++ b/shell/packer-clear-credentials.sh
@@ -10,8 +10,6 @@
 ##############################################################################
 echo "---> packer-clear-credentials.sh"
 
-#!/bin/bash
 set +e  # DO NOT cause build failure if any of the rm calls fail.
 rm "$CLOUDENV"
-rm "$HOME/.config/openstack/clouds.yaml"
 exit 0