|
19 | 19 | puts "\nUser #{new_resource.user} was created with ID #{user_id}" |
20 | 20 | else |
21 | 21 | user_id = shell.stdout.match id_regex |
| 22 | + if user_id.empty? || user_id.nil? |
| 23 | + raise "ID could not be found. Check Keystone and retry." |
| 24 | + end |
22 | 25 | puts "\nUser #{new_resource.user} already exists with ID #{user_id}" |
23 | 26 | end |
24 | 27 | end |
25 | 28 |
|
26 | 29 |
|
27 | 30 |
|
28 | 31 | action :create_tenant do |
29 | | - service_env = { 'SERVICE_TOKEN' => new_resource.keystone_service_pass, |
30 | | - 'SERVICE_ENDPOINT' => 'http://localhost:35357/v2.0' } |
31 | | - |
32 | 32 | find = Mixlib::ShellOut.new('keystone', 'tenant-get', |
33 | 33 | new_resource.tenant, |
34 | 34 | :environment => new_resource.env) |
|
52 | 52 |
|
53 | 53 |
|
54 | 54 | action :create_role do |
55 | | - service_env = { 'SERVICE_TOKEN' => new_resource.keystone_service_pass, |
56 | | - 'SERVICE_ENDPOINT' => 'http://localhost:35357/v2.0' } |
57 | | - |
58 | 55 | find = Mixlib::ShellOut.new('keystone', 'role-get', |
59 | 56 | new_resource.role, |
60 | 57 | :environment => new_resource.env) |
|
78 | 75 |
|
79 | 76 |
|
80 | 77 | action :user_role_add do |
81 | | - service_env = { 'SERVICE_TOKEN' => new_resource.keystone_service_pass, |
82 | | - 'SERVICE_ENDPOINT' => 'http://localhost:35357/v2.0' } |
83 | | - |
84 | 78 | user_id = nil |
85 | 79 | tenant_id = nil |
86 | 80 | role_id = nil |
|
138 | 132 |
|
139 | 133 |
|
140 | 134 | action :create_service do |
141 | | - service_env = { 'SERVICE_TOKEN' => new_resource.keystone_service_pass, |
142 | | - 'SERVICE_ENDPOINT' => 'http://localhost:35357/v2.0' } |
143 | | - |
144 | 135 | find = Mixlib::ShellOut.new('keystone', 'service-get', |
145 | 136 | new_resource.name, |
146 | 137 | :environment => new_resource.env) |
|
166 | 157 |
|
167 | 158 |
|
168 | 159 | action :create_endpoint do |
169 | | - service_env = { 'SERVICE_TOKEN' => new_resource.keystone_service_pass, |
170 | | - 'SERVICE_ENDPOINT' => 'http://localhost:35357/v2.0' } |
171 | | - |
172 | 160 | find = Mixlib::ShellOut.new('keystone', 'service-get', |
173 | 161 | new_resource.service_type, |
174 | 162 | :environment => new_resource.env) |
|
0 commit comments