simplify fail gnochi+ceilometer check

chungg · chungg · commit 2944bd3758dd · 2016-12-20T16:14:06.000Z
for some reason existing logic fails on my machine. seems similar
to just have conditions part of conditional branch.

Change-Id: Ia73d0d423698b521df9912c2c3411c7c39b6c0fa
diff --git a/devstack/settings b/devstack/settings
@@ -60,8 +60,8 @@ function _ceilometer_check_for_gnocchi {
         for plugin in ${plugins//,/ }; do
             if [ "$plugin" == 'gnocchi' ]; then
                 seen_gnocchi=True
-            elif [ "$plugin" == 'ceilometer' ]; then
-                [[ "$seen_gnocchi" == 'False' ]] && die $LINENO "gnocchi must be enabled before ceilometer!"
+            elif [ "$plugin" == 'ceilometer' ] && [ "$seen_gnocchi" == 'False' ]; then
+                die $LINENO "gnocchi must be enabled before ceilometer!"
             fi
         done
     fi
