openstack/devstack
Code Issues Proposed changes

Remove configuration parameter EXTRA_BAREMETAL_OPTS

Browse Source 
According to the comments in stack.sh the configuration parameter
EXTRA_BAREMETAL_OPTS should be removed during the Juno cycle.

Change-Id: I8564d16e56d1f77d3afa4af9a50fbffa3da8bfe5
This commit is contained in:
Christian Berendt 2014-07-24 12:37:13 +02:00
parent dbcffa7497
commit 9e8ac9942d
2 changed files with 0 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
lib/nova_plugins/hypervisor-baremetal
View File

@ -58,12 +58,6 @@ function configure_nova_hypervisor {
sudo cp "$FILES/dnsmasq-for-baremetal-from-nova-network.conf" "$BM_DNSMASQ_CONF" sudo cp "$FILES/dnsmasq-for-baremetal-from-nova-network.conf" "$BM_DNSMASQ_CONF"
iniset $NOVA_CONF DEFAULT dnsmasq_config_file "$BM_DNSMASQ_CONF" iniset $NOVA_CONF DEFAULT dnsmasq_config_file "$BM_DNSMASQ_CONF"
fi fi
# Define extra baremetal nova conf flags by defining the array ``EXTRA_BAREMETAL_OPTS``.
for I in "${EXTRA_BAREMETAL_OPTS[@]}"; do
# Attempt to convert flags to options
iniset $NOVA_CONF baremetal ${I/=/ }
done
} }
# install_nova_hypervisor() - Install external components # install_nova_hypervisor() - Install external components

17
stack.sh
View File

@ -1422,23 +1422,6 @@ if [[ -n "$EXTRA_OPTS" ]]; then
done done
fi fi
# TODO(dtroyer): Remove EXTRA_BAREMETAL_OPTS after stable/icehouse branch is cut
if [[ -n "$EXTRA_BAREMETAL_OPTS" ]]; then
echo ""
echo_summary "WARNING: EXTRA_BAREMETAL_OPTS is used"
echo "You are using EXTRA_BAREMETAL_OPTS to pass configuration into nova.conf."
echo "Please convert that configuration in localrc to a nova.conf section in local.conf:"
echo "EXTRA_BAREMETAL_OPTS will be removed early in the Juno development cycle"
echo "
[[post-config|\$NOVA_CONF]]
[baremetal]
"
for I in "${EXTRA_BAREMETAL_OPTS[@]}"; do
# Replace the first '=' with ' ' for iniset syntax
echo ${I}
done
fi
# TODO(dtroyer): Remove Q_AGENT_EXTRA_AGENT_OPTS after stable/juno branch is cut # TODO(dtroyer): Remove Q_AGENT_EXTRA_AGENT_OPTS after stable/juno branch is cut
if [[ -n "$Q_AGENT_EXTRA_AGENT_OPTS" ]]; then if [[ -n "$Q_AGENT_EXTRA_AGENT_OPTS" ]]; then
echo "" echo ""