@@ -292,7 +292,7 @@ function configure_cinder {

         configure_cinder_driver

     fi

-    if [[ is_fedora && $DISTRO =~ (rhel6) ]]; then

+    if is_fedora && [[ $DISTRO =~ (rhel6) ]]; then

         # Cinder clones are slightly larger due to some extra

         # metadata.  RHEL6 will not allow auto-extending of LV's

         # without this, leading to clones giving hard-to-track disk

@@ -72,7 +72,7 @@ function _horizon_config_set {

 # cleanup_horizon() - Remove residual data files, anything left over from previous

 # runs that a clean run would need to clean up

 function cleanup_horizon {

-    if [[ is_fedora && $DISTRO =~ (rhel6) ]]; then

+    if is_fedora && [[ $DISTRO =~ (rhel6) ]]; then

         # If ``/usr/bin/node`` points into ``$DEST``

         # we installed it via ``install_nodejs``

         if [[ $(readlink -f /usr/bin/node) =~ ($DEST) ]]; then

@@ -751,7 +751,7 @@ function stop_neutron {

 # cleanup_neutron() - Remove residual data files, anything left over from previous

 # runs that a clean run would need to clean up

 function cleanup_neutron {

-    if [[ is_provider_network && is_ironic_hardware ]]; then

+    if is_provider_network && is_ironic_hardware; then

         for IP in $(ip addr show dev $OVS_PHYSICAL_BRIDGE | grep ' inet ' | awk '{print $2}'); do

             sudo ip addr del $IP dev $OVS_PHYSICAL_BRIDGE

             sudo ip addr add $IP dev $PUBLIC_INTERFACE