From 4b8b02bc7afebb57a625930b8a406e5127713482 Mon Sep 17 00:00:00 2001
From: Monty Taylor <mordred@inaugust.com>
Date: Tue, 22 Mar 2016 19:34:17 -0500
Subject: [PATCH] Also protected against OS env vars in expand-groups

If we unset these in the script, it will protect us further.

Change-Id: Ic7370411df3742d1d76be08fda68cf701458e87c
---
 modules/openstack_project/files/puppetmaster/expand-groups.sh | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/modules/openstack_project/files/puppetmaster/expand-groups.sh b/modules/openstack_project/files/puppetmaster/expand-groups.sh
index bd860f56aa..678ce0d45c 100644
--- a/modules/openstack_project/files/puppetmaster/expand-groups.sh
+++ b/modules/openstack_project/files/puppetmaster/expand-groups.sh
@@ -20,6 +20,10 @@ trap "rm -rf $outdir" EXIT
 outfile=$outdir/generated-groups
 echo "# This file is autogenerated" > $outfile
 
+# Protect against leaky environment settings
+unset OS_CLOUD
+unset OS_REGION_NAME
+
 IFS=$'\n'
 for line in $(</etc/ansible/groups.txt); do
     name=$(echo $line | cut -f1 -d' ')