Revert suites optimization
diff --git a/neutron/server.sls b/neutron/server.sls
index e235d1d..94e3814 100644
--- a/neutron/server.sls
+++ b/neutron/server.sls
@@ -129,14 +129,15 @@
- dir_mode: 755
- template: jinja
-{%- if not grains.get('noservices', False) %}
neutron_db_manage:
cmd.run:
- name: neutron-db-manage --config-file /etc/neutron/neutron.conf --config-file /etc/neutron/plugins/midonet/midonet.ini upgrade head
+ {% if grains.noservices is defined %}
+ - onlyif: {% if grains.get('noservices', "True") %}"True"{% else %}False{% endif %}
+ {% endif %}
- require:
- file: /etc/neutron/neutron.conf
- file: /etc/neutron/plugins/midonet/midonet.ini
-{%- endif %}
{%- if server.version == "kilo" %}
@@ -171,8 +172,6 @@
{%- endif %}
{%- endif %}
-{%- if not grains.get('noservices', False) %}
-
neutron_server_services:
service.running:
- names: {{ server.services }}
@@ -183,8 +182,6 @@
- watch:
- file: /etc/neutron/neutron.conf
-{%- endif %}
-
{%- if grains.get('virtual_subtype', None) == "Docker" %}
neutron_entrypoint: