Merge "Introduce test-kitchen"
diff --git a/other-requirements.txt b/bindep.txt
similarity index 100%
rename from other-requirements.txt
rename to bindep.txt
diff --git a/metadata/service/control/cluster.yml b/metadata/service/control/cluster.yml
index d53b59e..af57c64 100644
--- a/metadata/service/control/cluster.yml
+++ b/metadata/service/control/cluster.yml
@@ -46,14 +46,6 @@
port: 9160
- host: ${_param:cluster_node03_address}
port: 9160
- cache:
- members:
- - host: ${_param:cluster_node01_address}
- port: 11211
- - host: ${_param:cluster_node02_address}
- port: 11211
- - host: ${_param:cluster_node03_address}
- port: 11211
identity:
engine: keystone
version: '2.0'
diff --git a/metadata/service/control/single.yml b/metadata/service/control/single.yml
index 3741c3f..fe4bca8 100644
--- a/metadata/service/control/single.yml
+++ b/metadata/service/control/single.yml
@@ -43,7 +43,9 @@
- host: ${_param:single_address}
port: 9160
cache:
- host: ${_param:single_address}
+ members:
+ - host: ${_param:single_address}
+ port: 11211
identity:
engine: keystone
version: '2.0'
diff --git a/opencontrail/config.sls b/opencontrail/config.sls
index 9b2006f..91425c1 100644
--- a/opencontrail/config.sls
+++ b/opencontrail/config.sls
@@ -122,6 +122,10 @@
- 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:
@@ -188,7 +192,6 @@
- file: /etc/contrail/contrail-api.conf
- file: /etc/contrail/vnc_api_lib.ini
- file: /etc/ifmap-server/basicauthusers.properties
- - file: /etc/contrail/contrail-keystone-auth.conf
- file: /etc/sudoers.d/contrail_sudoers
{%- endif %}
diff --git a/opencontrail/files/2.2/contrail-control.conf b/opencontrail/files/2.2/contrail-control.conf
index 6cd29ce..7992aea 100644
--- a/opencontrail/files/2.2/contrail-control.conf
+++ b/opencontrail/files/2.2/contrail-control.conf
@@ -29,10 +29,10 @@
[IFMAP]
certs_store=
- password=control-node-1
+ password={{ control.bind.address }}
# server_url= # Provided by discovery server, e.g. https://127.0.0.1:8443
{%- if grains.get('virtual_subtype', None) == "Docker" %}
server_url=https://{{ control.discovery.host }}:8443
{%- endif %}
- user=control-node-1
+ user={{ control.bind.address }}
diff --git a/opencontrail/files/3.0/contrail-control.conf b/opencontrail/files/3.0/contrail-control.conf
index ad2d046..b8241e4 100644
--- a/opencontrail/files/3.0/contrail-control.conf
+++ b/opencontrail/files/3.0/contrail-control.conf
@@ -29,9 +29,9 @@
[IFMAP]
certs_store=
- password=control-node-1
+ password={{ control.bind.address }}
# server_url= # Provided by discovery server, e.g. https://127.0.0.1:8443
{%- if grains.get('virtual_subtype', None) == "Docker" %}
server_url=https://{{ control.discovery.host }}:8443
{%- endif %}
- user=control-node-1
+ user={{ control.bind.address }}