1 #!/usr/bin/python2.7 |
1 #!/usr/bin/python2.7 |
2 |
2 |
3 # Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved. |
3 # Copyright (c) 2015, 2016, Oracle and/or its affiliates. All rights reserved. |
4 # |
4 # |
5 # Licensed under the Apache License, Version 2.0 (the "License"); you may |
5 # Licensed under the Apache License, Version 2.0 (the "License"); you may |
6 # not use this file except in compliance with the License. You may obtain |
6 # not use this file except in compliance with the License. You may obtain |
7 # a copy of the License at |
7 # a copy of the License at |
8 # |
8 # |
31 ('keystone_authtoken', 'auth_admin_prefix'): (None, None), |
31 ('keystone_authtoken', 'auth_admin_prefix'): (None, None), |
32 ('DEFAULT', 'log_format'): (None, None), |
32 ('DEFAULT', 'log_format'): (None, None), |
33 ('DEFAULT', 'fake_rabbit'): (None, None), |
33 ('DEFAULT', 'fake_rabbit'): (None, None), |
34 } |
34 } |
35 |
35 |
36 IRONIC_CONF_EXCEPTIONS = [] |
36 IRONIC_CONF_EXCEPTIONS = [ |
|
37 ('keystone_authtoken', 'admin_tenant_name'), |
|
38 ('keystone_authtoken', 'admin_user'), |
|
39 ('keystone_authtoken', 'admin_password'), |
|
40 ('keystone_authtoken', 'signing_dir'), |
|
41 ('ai', 'server'), |
|
42 ('ai', 'username'), |
|
43 ] |
37 |
44 |
38 |
45 |
39 def start(): |
46 def start(): |
40 # pull out the current version of config/upgrade-id |
47 # pull out the current version of config/upgrade-id |
41 p = Popen(['/usr/bin/svcprop', '-p', 'config/upgrade-id', |
48 p = Popen(['/usr/bin/svcprop', '-p', 'config/upgrade-id', |