Merge pull request #13 from Martin819/master
Update Kitchen test suites and Travis settings
diff --git a/opencontrail/database.sls b/opencontrail/database.sls
index 2d48ab4..22279ad 100644
--- a/opencontrail/database.sls
+++ b/opencontrail/database.sls
@@ -1,4 +1,4 @@
-{%- from "opencontrail/map.jinja" import database with context %}
+{%- from "opencontrail/map.jinja" import database,common with context %}
{%- if database.enabled %}
include:
@@ -158,7 +158,12 @@
opencontrail_database_services:
service.running:
- enable: true
+{%- if common.vendor == "juniper" %}
+ - name: contrail-database
+{%- else %}
- name: supervisor-database
+{%- endif %}
+ - init_delay: 5
- watch:
- file: {{ database.cassandra_config }}cassandra.yaml
- file: {{ database.cassandra_config }}cassandra-env.sh
diff --git a/opencontrail/meta/collectd.yml b/opencontrail/meta/collectd.yml
index ab0d75c..e64c64b 100644
--- a/opencontrail/meta/collectd.yml
+++ b/opencontrail/meta/collectd.yml
@@ -108,7 +108,7 @@
{%- if config.get('enabled', False) %}
{%- set bind_addr=config.bind.address|replace('0.0.0.0', '127.0.0.1') %}
contrail-api:
- expected_code: 401
+ expected_code: 200
url: "http://{{ bind_addr }}:{{ config.bind.api_port }}/"
contrail-discovery:
expected_code: 200