As long as nova already supports an Identity v3 auth flow when talking
to ironic (Id837d26bb21c158de0504627e488c0692aef1e24), make it use
v3 by default.
This way we don't fail in a keystone v3-only situation, for
example.
Change-Id: I028dfb52108d0630f47a53f8b420b70d4979eb55
| ... | ... |
@@ -45,11 +45,13 @@ function configure_nova_hypervisor {
|
| 45 | 45 |
iniset $NOVA_CONF DEFAULT ram_allocation_ratio 1.0 |
| 46 | 46 |
iniset $NOVA_CONF DEFAULT reserved_host_memory_mb 0 |
| 47 | 47 |
# ironic section |
| 48 |
- iniset $NOVA_CONF ironic admin_username admin |
|
| 49 |
- iniset $NOVA_CONF ironic admin_password $ADMIN_PASSWORD |
|
| 50 |
- iniset $NOVA_CONF ironic admin_url $KEYSTONE_AUTH_URI/v2.0 |
|
| 51 |
- iniset $NOVA_CONF ironic admin_tenant_name demo |
|
| 52 |
- iniset $NOVA_CONF ironic api_endpoint $IRONIC_SERVICE_PROTOCOL://$IRONIC_HOSTPORT/v1 |
|
| 48 |
+ iniset $NOVA_CONF ironic auth_type password |
|
| 49 |
+ iniset $NOVA_CONF ironic username admin |
|
| 50 |
+ iniset $NOVA_CONF ironic password $ADMIN_PASSWORD |
|
| 51 |
+ iniset $NOVA_CONF ironic auth_url $KEYSTONE_AUTH_URI/v3 |
|
| 52 |
+ iniset $NOVA_CONF ironic project_domain_id default |
|
| 53 |
+ iniset $NOVA_CONF ironic user_domain_id default |
|
| 54 |
+ iniset $NOVA_CONF ironic project_name demo |
|
| 53 | 55 |
} |
| 54 | 56 |
|
| 55 | 57 |
# install_nova_hypervisor() - Install external components |