Revert "Update auth params in Nova Hypervisor-Ironic"
This seems to break Ironic gate with n-cpu not starting
any more.
This reverts commit c527ded91bef5d4c56cbdb2402a4d68015364b37.
Change-Id: Idfb01448e8ecf53fbd2e1df61c8f08f3107981ac
Closes-Bug: #1579683
diff --git a/lib/nova_plugins/hypervisor-ironic b/lib/nova_plugins/hypervisor-ironic
index 7224fe3..43e7797 100644
--- a/lib/nova_plugins/hypervisor-ironic
+++ b/lib/nova_plugins/hypervisor-ironic
@@ -45,12 +45,10 @@
iniset $NOVA_CONF DEFAULT ram_allocation_ratio 1.0
iniset $NOVA_CONF DEFAULT reserved_host_memory_mb 0
# ironic section
- iniset $NOVA_CONF ironic username admin
- iniset $NOVA_CONF ironic password $ADMIN_PASSWORD
- iniset $NOVA_CONF ironic auth_url $KEYSTONE_AUTH_URI/v3
- iniset $NOVA_CONF ironic project_domain_id default
- iniset $NOVA_CONF ironic user_domain_id default
- iniset $NOVA_CONF ironic project_name demo
+ iniset $NOVA_CONF ironic admin_username admin
+ iniset $NOVA_CONF ironic admin_password $ADMIN_PASSWORD
+ iniset $NOVA_CONF ironic admin_url $KEYSTONE_AUTH_URI/v2.0
+ iniset $NOVA_CONF ironic admin_tenant_name demo
iniset $NOVA_CONF ironic api_endpoint $IRONIC_SERVICE_PROTOCOL://$IRONIC_HOSTPORT/v1
}