Merge "Also protected against OS env vars in expand-groups"

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' ')