From 7087dbea03d82e983c1c92debb81266cf9121729 Mon Sep 17 00:00:00 2001
From: "Brad P. Crochet" <brad@redhat.com>
Date: Fri, 19 Feb 2016 09:42:52 -0500
Subject: [PATCH] Make cleanup of os-refresh-config actually work

subprocess.check_output won't expand globs without shell=True. Not
desirable to use that, so use glob module instead to expand the wildcard
and pass that to the cleanup rm.

Change-Id: I392bf8a933f7aba282b61153e88a60eebfa0f5c9
(cherry picked from commit c6f54522ff81c61c311850cf9de29458a25543de)
---
 instack_undercloud/undercloud.py | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/instack_undercloud/undercloud.py b/instack_undercloud/undercloud.py
index 2522d63bc..acc8dcf85 100644
--- a/instack_undercloud/undercloud.py
+++ b/instack_undercloud/undercloud.py
@@ -15,6 +15,7 @@
 import copy
 import errno
 import getpass
+import glob
 import hashlib
 import io
 import logging
@@ -736,7 +737,8 @@ def _copy_stackrc():
 
 
 def _clean_os_refresh_config():
-    args = ['sudo', 'rm', '-rf', '/usr/libexec/os-refresh-config/*']
+    orc_dirs = glob.glob('/usr/libexec/os-refresh-config/*')
+    args = ['sudo', 'rm', '-rf'] + orc_dirs
     _run_command(args, name='Clean os-refresh-config')