Fix restart of contrail config services
This was found during testing upgrade to OC4.0 when config only
mode is used on trusty (non systemd) init system.
+ Change keyserver
PROD-20915
Change-Id: Iaf55c73b20cf6f932ca6e1cb9e4a45397bd32c13
diff --git a/opencontrail/config.sls b/opencontrail/config.sls
index e6a9bed..3aa7378 100644
--- a/opencontrail/config.sls
+++ b/opencontrail/config.sls
@@ -117,7 +117,7 @@
- source: salt://opencontrail/files/{{ config.version }}/contrail-api.ini
- template: jinja
- makedirs: true
-{%- if config.get('config_only', False) %}
+{%- if not config.get('config_only', False) %}
- watch_in:
- service: opencontrail_config_services
{%- endif %}
diff --git a/tests/pillar/repo_cassandra.sls b/tests/pillar/repo_cassandra.sls
index d6c454d..0be66f8 100644
--- a/tests/pillar/repo_cassandra.sls
+++ b/tests/pillar/repo_cassandra.sls
@@ -5,6 +5,6 @@
cassandra-21x:
source: "deb [arch=amd64] http://www.apache.org/dist/cassandra/debian 21x main"
architectures: amd64
- key_server: hkp://p80.pool.sks-keyservers.net:80
+ key_server: keyserver.ubuntu.com
key_id: A278B781FE4B2BDA