Aded rescue for users whos primary tenant is non existant

2012-12-11 21:12:57 -08:00 · 2012-12-11 21:12:57 -08:00 · f6921199b5
commit f6921199b5
parent 9295b14e45
1 changed files with 6 additions and 1 deletions
--- a/lib/puppet/provider/keystone_user/keystone.rb
+++ b/lib/puppet/provider/keystone_user/keystone.rb
@ -128,7 +128,12 @@ Puppet::Type.type(:keystone_user).provide(
        if tenantId.nil? or tenantId == 'None' or tenantId.empty?
          tenant = 'None'
        else
-          tenant = get_keystone_object('tenant', tenantId, 'name')
+          # this prevents is from failing if tenant no longer exists
+          begin
+            tenant = get_keystone_object('tenant', tenantId, 'name')
+          rescue
+            tenant = 'None'
+          end
        end
        password = 'nil'
        hash[user[1]] = {