summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorZuul <zuul@review.openstack.org>2019-02-14 16:52:26 +0000
committerGerrit Code Review <review@openstack.org>2019-02-14 16:52:27 +0000
commit590a610c685d999b69421e29ec6247dc4e931c51 (patch)
tree7a28c397698aafd5f5d67ba89a3e396920e1527d
parent5728880e85175b2f1a07afa97ba13535ace44540 (diff)
parent98f96ead293abdf2d5d89f517470abfd5af79fbe (diff)
Merge "Allow processing power_off to be defined"HEADmaster
-rw-r--r--devstack/plugin.sh4
1 files changed, 3 insertions, 1 deletions
diff --git a/devstack/plugin.sh b/devstack/plugin.sh
index 68581f4..7f9b9f9 100644
--- a/devstack/plugin.sh
+++ b/devstack/plugin.sh
@@ -63,7 +63,7 @@ IRONIC_IS_HARDWARE=$(trueorfalse False IRONIC_IS_HARDWARE)
63IRONIC_INSPECTOR_NODE_NOT_FOUND_HOOK=${IRONIC_INSPECTOR_NODE_NOT_FOUND_HOOK:-""} 63IRONIC_INSPECTOR_NODE_NOT_FOUND_HOOK=${IRONIC_INSPECTOR_NODE_NOT_FOUND_HOOK:-""}
64IRONIC_INSPECTOR_OVS_PORT=${IRONIC_INSPECTOR_OVS_PORT:-brbm-inspector} 64IRONIC_INSPECTOR_OVS_PORT=${IRONIC_INSPECTOR_OVS_PORT:-brbm-inspector}
65IRONIC_INSPECTOR_EXTRA_KERNEL_CMDLINE=${IRONIC_INSPECTOR_EXTRA_KERNEL_CMDLINE:-""} 65IRONIC_INSPECTOR_EXTRA_KERNEL_CMDLINE=${IRONIC_INSPECTOR_EXTRA_KERNEL_CMDLINE:-""}
66 66IRONIC_INSPECTOR_POWER_OFF=${IRONIC_INSPECTOR_POWER_OFF:-True}
67GITDIR["python-ironic-inspector-client"]=$DEST/python-ironic-inspector-client 67GITDIR["python-ironic-inspector-client"]=$DEST/python-ironic-inspector-client
68GITREPO["python-ironic-inspector-client"]=${IRONIC_INSPECTOR_CLIENT_REPO:-${GIT_BASE}/openstack/python-ironic-inspector-client.git} 68GITREPO["python-ironic-inspector-client"]=${IRONIC_INSPECTOR_CLIENT_REPO:-${GIT_BASE}/openstack/python-ironic-inspector-client.git}
69GITBRANCH["python-ironic-inspector-client"]=${IRONIC_INSPECTOR_CLIENT_BRANCH:-master} 69GITBRANCH["python-ironic-inspector-client"]=${IRONIC_INSPECTOR_CLIENT_BRANCH:-master}
@@ -267,6 +267,8 @@ function configure_inspector {
267 inspector_iniset iptables dnsmasq_interface $IRONIC_INSPECTOR_INTERFACE 267 inspector_iniset iptables dnsmasq_interface $IRONIC_INSPECTOR_INTERFACE
268 inspector_iniset database connection `database_connection_url ironic_inspector` 268 inspector_iniset database connection `database_connection_url ironic_inspector`
269 269
270 inspector_iniset processing power_off $IRONIC_INSPECTOR_POWER_OFF
271
270 iniset_rpc_backend ironic-inspector $IRONIC_INSPECTOR_CONF_FILE 272 iniset_rpc_backend ironic-inspector $IRONIC_INSPECTOR_CONF_FILE
271 273
272 if is_service_enabled swift; then 274 if is_service_enabled swift; then