incorporate features pillar

salt/common/tools/sbin/so-common

@@ -301,6 +301,17 @@ lookup_role() {
 	echo ${pieces[1]}
 }
 
+is_feature_enabled() {
+	feature=$1
+	enabled=$(lookup_salt_value features)
+	for cur in $enabled; do
+		if [[ "$feature" == "$cur" ]]; then
+			return 0
+		fi
+	done
+	return 1
+}
+
 require_manager() {
 	if is_manager_node; then
 		echo "This is a manager, so we can proceed."

salt/soc/enabled.sls

@@ -33,11 +33,6 @@ so-soc:
       - /opt/so/conf/soc/soc_users_roles:/opt/sensoroni/rbac/users_roles:rw
       - /opt/so/conf/soc/queue:/opt/sensoroni/queue:rw
       - /opt/so/saltstack:/opt/so/saltstack:rw
-      {% if DOCKER.containers['so-soc'].custom_bind_mounts %}
-        {% for BIND in DOCKER.containers['so-soc'].custom_bind_mounts %}
-      - {{ BIND }}
-        {% endfor %}
-      {% endif %}
     - extra_hosts: {{ DOCKER_EXTRA_HOSTS }}
       {% if DOCKER.containers['so-soc'].extra_hosts %}
         {% for XTRAHOST in DOCKER.containers['so-soc'].extra_hosts %}