Revert "Optimize Kitchen 'noservices' option"
This reverts commit 3519811c2c67090ce88b5533164e57f0e6ab966a.
diff --git a/opencontrail/collector.sls b/opencontrail/collector.sls
index bc166f2..4439d3c 100644
--- a/opencontrail/collector.sls
+++ b/opencontrail/collector.sls
@@ -73,25 +73,29 @@
- makedirs: True
- require:
- pkg: opencontrail_collector_packages
+{%- if not grains.get('noservices', False) %}
- require_in:
- service: opencontrail_collector_services
+{%- endif %}
/etc/contrail/supervisord_analytics.conf:
file.managed:
- source: salt://opencontrail/files/{{ collector.version }}/collector/supervisord_analytics.conf
- require:
- pkg: opencontrail_collector_packages
+{%- if not grains.get('noservices', False) %}
- require_in:
- service: opencontrail_collector_services
+{%- endif %}
{% endif %}
+{%- if not grains.get('noservices', False) %}
+
opencontrail_collector_services:
service.running:
- enable: true
- names: {{ collector.services }}
- - onlyif:
- - grains.get('noservices') == True
- watch:
- file: /etc/contrail/contrail-analytics-api.conf
- file: /etc/contrail/contrail-query-engine.conf
@@ -102,6 +106,8 @@
- file: /etc/contrail/contrail-analytics-nodemgr.conf
- file: /etc/contrail/contrail-alarm-gen.conf
+{%- endif %}
+
{%- if grains.get('virtual_subtype', None) == "Docker" %}
opencontrail_collector_entrypoint:
diff --git a/opencontrail/compute.sls b/opencontrail/compute.sls
index c2e8756..a7d67c4 100644
--- a/opencontrail/compute.sls
+++ b/opencontrail/compute.sls
@@ -21,8 +21,10 @@
- value: 8085,9090
- require:
- pkg: opencontrail_compute_packages
+ {%- if not grains.get('noservices', False)%}
- require_in:
- service: opencontrail_compute_services
+ {%- endif %}
{%- endif %}
@@ -32,8 +34,10 @@
- template: jinja
- require:
- pkg: opencontrail_compute_packages
+ {%- if not grains.get('noservices', False)%}
- watch_in:
- service: opencontrail_compute_services
+ {%- endif %}
/etc/contrail/vrouter_nodemgr_param:
file.managed:
@@ -55,8 +59,10 @@
- template: jinja
- require:
- pkg: opencontrail_compute_packages
+ {%- if not grains.get('noservices', False)%}
- watch_in:
- service: opencontrail_compute_services
+ {%- endif %}
/usr/local/bin/findns:
file.managed:
@@ -70,8 +76,10 @@
- source: salt://opencontrail/files/{{ compute.version }}/contrail-vrouter-nodemgr.ini
- require:
- pkg: opencontrail_compute_packages
+ {%- if not grains.get('noservices', False)%}
- require_in:
- service: opencontrail_compute_services
+ {%- endif %}
/etc/udev/rules.d/vhost-net.rules:
file.managed:
@@ -104,8 +112,10 @@
- require:
- pkg: opencontrail_compute_packages
- pkg: opencontrail_vrouter_package
+ {%- if not grains.get('noservices', False)%}
- require_in:
- service: opencontrail_compute_services
+ {%- endif %}
modules_dpdk:
file.append:
@@ -147,12 +157,11 @@
{%- endif %}
{%- endif %}
+{%- if not grains.get('noservices', False)%}
opencontrail_compute_services:
service.enabled:
- names: {{ compute.services }}
- - onlyif:
- - grains.get('noservices') == True
-
+{%- endif %}
{%- endif %}
diff --git a/opencontrail/config.sls b/opencontrail/config.sls
index 1c7efd2..e7e28e0 100644
--- a/opencontrail/config.sls
+++ b/opencontrail/config.sls
@@ -94,8 +94,10 @@
- template: jinja
- require:
- pkg: opencontrail_config_packages
+{%- if not grains.get('noservices', False) %}
- watch_in:
- service: opencontrail_config_services
+{%- endif %}
/etc/contrail/contrail-config-nodemgr.conf:
file.managed:
@@ -103,8 +105,10 @@
- template: jinja
- require:
- pkg: opencontrail_config_packages
+{%- if not grains.get('noservices', False) %}
- watch_in:
- service: opencontrail_config_services
+{%- endif %}
/etc/sudoers.d/contrail_sudoers:
file.managed:
@@ -120,9 +124,11 @@
- template: jinja
- require:
- pkg: opencontrail_config_packages
+{%- if not grains.get('noservices', False) %}
- watch_in:
- service: opencontrail_config_services
{%- endif %}
+{%- endif %}
/etc/contrail/contrail-schema.conf:
file.managed:
@@ -145,8 +151,10 @@
- source: salt://opencontrail/files/{{ config.version }}/config/contrail-config-nodemgr.ini
- require:
- pkg: opencontrail_config_packages
+{%- if not grains.get('noservices', False) %}
- require_in:
- service: opencontrail_config_services
+{%- endif %}
{%- if not grains.get('virtual_subtype', None) == "Docker" %}
{%- if not common.vendor == "juniper" %}
@@ -155,8 +163,10 @@
file.absent:
- require:
- pkg: opencontrail_config_packages
+{%- if not grains.get('noservices', False) %}
- require_in:
- service: opencontrail_config_services
+{%- endif %}
{%- endif %}
{%- endif %}
@@ -166,17 +176,19 @@
- source: salt://opencontrail/files/{{ config.version }}/config/supervisord_config.conf
- require:
- pkg: opencontrail_config_packages
+{%- if not grains.get('noservices', False) %}
- require_in:
- service: opencontrail_config_services
+{%- endif %}
{% endif %}
+{%- if not grains.get('noservices', False) %}
+
opencontrail_config_services:
service.running:
- enable: true
- names: {{ config.services }}
- - onlyif:
- - grains.get('noservices') == True
- watch:
- file: /etc/contrail/contrail-discovery.conf
- file: /etc/contrail/contrail-svc-monitor.conf
@@ -186,6 +198,8 @@
- file: /etc/ifmap-server/basicauthusers.properties
- file: /etc/sudoers.d/contrail_sudoers
+{%- endif %}
+
{%- if grains.get('virtual_subtype', None) == "Docker" %}
opencontrail_config_entrypoint:
diff --git a/opencontrail/control.sls b/opencontrail/control.sls
index 3442f59..98bd146 100644
--- a/opencontrail/control.sls
+++ b/opencontrail/control.sls
@@ -51,31 +51,37 @@
- makedirs: true
- require:
- pkg: opencontrail_control_packages
+{%- if not grains.get('noservices', False) %}
- require_in:
- service: opencontrail_control_services
+{%- endif %}
/etc/contrail/supervisord_control.conf:
file.managed:
- source: salt://opencontrail/files/{{ control.version }}/control/supervisord_control.conf
- require:
- pkg: opencontrail_control_packages
+{%- if not grains.get('noservices', False) %}
- require_in:
- service: opencontrail_control_services
+{%- endif %}
{% endif %}
+{%- if not grains.get('noservices', False) %}
+
opencontrail_control_services:
service.running:
- enable: true
- names: {{ control.services }}
- - onlyif:
- - grains.get('noservices') == True
- watch:
- file: /etc/contrail/dns/contrail-rndc.conf
- file: /etc/contrail/contrail-dns.conf
- file: /etc/contrail/contrail-control.conf
- file: /etc/contrail/contrail-control-nodemgr.conf
+{%- endif %}
+
{%- if grains.get('virtual_subtype', None) == "Docker" %}
opencontrail_control_entrypoint:
diff --git a/opencontrail/database.sls b/opencontrail/database.sls
index 7c97372..cd9e043 100644
--- a/opencontrail/database.sls
+++ b/opencontrail/database.sls
@@ -109,18 +109,22 @@
- template: jinja
- require:
- pkg: opencontrail_database_packages
+{%- if not grains.get('noservices', False) %}
- require_in:
- service: opencontrail_database_services
- service: opencontrail_zookeeper_service
+{%- endif %}
/etc/contrail/supervisord_database_files/contrail-database-nodemgr.ini:
file.managed:
- source: salt://opencontrail/files/{{ database.version }}/database/contrail-database-nodemgr.ini
- require:
- pkg: opencontrail_database_packages
+{%- if not grains.get('noservices', False) %}
- require_in:
- service: opencontrail_database_services
- service: opencontrail_zookeeper_service
+{%- endif %}
{% endif %}
@@ -137,8 +141,10 @@
- user: cassandra
- group: cassandra
- makedirs: True
+{%- if not grains.get('noservices', False) %}
- require_in:
- service: opencontrail_database_services
+{%- endif %}
/var/lib/cassandra:
file.directory:
@@ -147,12 +153,12 @@
- require:
- file: /var/lib/cassandra/data
+{%- if not grains.get('noservices', False) %}
+
zookeeper_service:
service.running:
- enable: true
- name: zookeeper
- - onlyif:
- - grains.get('noservices') == True
- watch:
- file: /etc/zookeeper/conf/zoo.cfg
- file: /var/lib/zookeeper/myid
@@ -167,8 +173,6 @@
- name: supervisor-database
{%- endif %}
- init_delay: 5
- - onlyif:
- - grains.get('noservices') == True
- watch:
- file: {{ database.cassandra_config }}cassandra.yaml
- file: {{ database.cassandra_config }}cassandra-env.sh
@@ -183,13 +187,13 @@
service.running:
- enable: true
- name: zookeeper
- - onlyif:
- - grains.get('noservices') == True
- watch:
- file: /etc/zookeeper/conf/zoo.cfg
- file: /etc/default/zookeeper
- file: /etc/zookeeper/conf/log4j.properties
+{%- endif %}
+
{%- if grains.get('virtual_subtype', None) == "Docker" %}
opencontrail_database_entrypoint:
diff --git a/opencontrail/web.sls b/opencontrail/web.sls
index 69be26f..7d9105b 100644
--- a/opencontrail/web.sls
+++ b/opencontrail/web.sls
@@ -19,6 +19,7 @@
- template: jinja
- require:
- pkg: opencontrail_web_packages
+{%- if not grains.get('noservices', False) %}
- watch_in:
- service: opencontrail_web_services
@@ -26,11 +27,11 @@
service.running:
- enable: true
- names: {{ web.services }}
- - onlyif:
- - grains.get('noservices') == True
- watch:
- file: /etc/contrail/config.global.js
+{%- endif %}
+
{%- if grains.get('virtual_subtype', None) == "Docker" %}
opencontrail_web_entrypoint: