summaryrefslogtreecommitdiff
path: root/devstack/lib/ironic
diff options
context:
space:
mode:
authorZuul <zuul@review.opendev.org>2019-08-24 02:20:13 +0000
committerGerrit Code Review <review@openstack.org>2019-08-24 02:20:13 +0000
commite518bebe037a52922ebe3e27e465888c7233f2a5 (patch)
treea070ef84026fa3788488ab4531b7295916d71969 /devstack/lib/ironic
parent12f5f2cfee75bd03de230a79ef4ee31f1aeb8177 (diff)
parentd693d4c06c1ba89332ef8f3f672809b3cc81f8c9 (diff)
downloadironic-e518bebe037a52922ebe3e27e465888c7233f2a5.tar.gz
Merge "Support power state change callbacks to nova using ksa_adapter"
Diffstat (limited to 'devstack/lib/ironic')
-rw-r--r--devstack/lib/ironic5
1 files changed, 4 insertions, 1 deletions
diff --git a/devstack/lib/ironic b/devstack/lib/ironic
index b0181f899..582d24c12 100644
--- a/devstack/lib/ironic
+++ b/devstack/lib/ironic
@@ -1333,6 +1333,9 @@ function configure_ironic {
fi
# NOTE(vsaienko) Add stack to libvirt group when installing without nova.
if ! is_service_enabled nova; then
+ # Disable power state change callbacks to nova.
+ iniset $IRONIC_CONF_FILE nova send_power_notifications false
+
add_user_to_group $STACK_USER $LIBVIRT_GROUP
# This is the basic set of devices allowed / required by all virtual machines.
@@ -1412,7 +1415,7 @@ function configure_ironic_conductor {
# NOTE(pas-ha) service_catalog section is used to discover
# ironic API endpoint from keystone catalog
- local client_sections="neutron swift glance inspector cinder service_catalog json_rpc"
+ local client_sections="neutron swift glance inspector cinder service_catalog json_rpc nova"
for conf_section in $client_sections; do
configure_client_for $conf_section
done