aboutsummaryrefslogtreecommitdiff
path: root/docker
diff options
context:
space:
mode:
authorSteven Dake <stdake@cisco.com>2015-05-28 10:13:35 -0700
committerSteven Dake <stdake@cisco.com>2015-06-08 11:01:50 -0700
commit58c1a04c49b6779895ec5d518362243ab88f51a2 (patch)
treef4152843611af58e2df8c3cbc02b7b1858f04108 /docker
parent1d299dfe9abb26852da238597a903a1a4e44f290 (diff)
downloadkolla-58c1a04c49b6779895ec5d518362243ab88f51a2.tar.gz
kolla-58c1a04c49b6779895ec5d518362243ab88f51a2.zip
Make config-dhcp-agent.sh bashate compliant
Change-Id: I91ede62a58cd224b7b93f4652174c09c387386d6 Partially-Implements: blueprint bashate gate
Diffstat (limited to 'docker')
-rwxr-xr-xdocker/centos/binary/neutron/neutron-agents/config-scripts/config-dhcp-agent.sh62
1 files changed, 31 insertions, 31 deletions
diff --git a/docker/centos/binary/neutron/neutron-agents/config-scripts/config-dhcp-agent.sh b/docker/centos/binary/neutron/neutron-agents/config-scripts/config-dhcp-agent.sh
index 1295d9c57..db71678b1 100755
--- a/docker/centos/binary/neutron/neutron-agents/config-scripts/config-dhcp-agent.sh
+++ b/docker/centos/binary/neutron/neutron-agents/config-scripts/config-dhcp-agent.sh
@@ -26,53 +26,53 @@ neutron_conf=/etc/neutron/neutron.conf
# https://www.rdoproject.org/forum/discussion/567/packstack-allinone-grizzly-cirros-image-cannot-get-a-dhcp-address-when-a-centos-image-can/p1
/usr/sbin/iptables -A POSTROUTING -t mangle -p udp --dport bootpc \
- -j CHECKSUM --checksum-fill
+ -j CHECKSUM --checksum-fill
if [[ ${MECHANISM_DRIVERS} =~ linuxbridge ]]; then
- interface_driver="neutron.agent.linux.interface.BridgeInterfaceDriver"
+ interface_driver="neutron.agent.linux.interface.BridgeInterfaceDriver"
elif [[ ${MECHANISM_DRIVERS} == "openvswitch" ]]; then
- interface_driver="neutron.agent.linux.interface.OVSInterfaceDriver"
+ interface_driver="neutron.agent.linux.interface.OVSInterfaceDriver"
fi
# Logging
crudini --set $neutron_conf \
- DEFAULT \
- log_file \
- "${NEUTRON_DHCP_AGENT_LOG_FILE}"
+ DEFAULT \
+ log_file \
+ "${NEUTRON_DHCP_AGENT_LOG_FILE}"
# Configure dhcp_agent.ini
crudini --set $cfg \
- DEFAULT \
- verbose \
- "${VERBOSE_LOGGING}"
+ DEFAULT \
+ verbose \
+ "${VERBOSE_LOGGING}"
crudini --set $cfg \
- DEFAULT \
- debug \
- "${DEBUG_LOGGING}"
+ DEFAULT \
+ debug \
+ "${DEBUG_LOGGING}"
crudini --set $cfg \
- DEFAULT \
- interface_driver \
- "$interface_driver"
+ DEFAULT \
+ interface_driver \
+ "$interface_driver"
crudini --set $cfg \
- DEFAULT \
- dhcp_driver \
- "${DHCP_DRIVER}"
+ DEFAULT \
+ dhcp_driver \
+ "${DHCP_DRIVER}"
crudini --set $cfg \
- DEFAULT \
- use_namespaces \
- "${USE_NAMESPACES}"
+ DEFAULT \
+ use_namespaces \
+ "${USE_NAMESPACES}"
crudini --set $cfg \
- DEFAULT \
- delete_namespaces \
- "${DELETE_NAMESPACES}"
+ DEFAULT \
+ delete_namespaces \
+ "${DELETE_NAMESPACES}"
crudini --set $cfg \
- DEFAULT \
- dnsmasq_config_file \
- "${DNSMASQ_CONFIG_FILE}"
+ DEFAULT \
+ dnsmasq_config_file \
+ "${DNSMASQ_CONFIG_FILE}"
crudini --set $cfg \
- DEFAULT \
- root_helper \
- "${ROOT_HELPER}"
+ DEFAULT \
+ root_helper \
+ "${ROOT_HELPER}"
cat > ${DNSMASQ_CONFIG_FILE} <<EOF
dhcp-option-force=26,1450
@@ -81,7 +81,7 @@ EOF
# Remove any existing qdhcp namespaces
ip netns list | grep qdhcp | while read -r line ; do
- ip netns delete $line
+ ip netns delete $line
done
# Start DHCP Agent