commit 7bb5584f980cf76a78ada86eede9cd674843475e
author Pavel Svimbersky <psvimbersky@mirantis.com> Mon Sep 04 13:34:26 2017 +0200
committer Pavel Svimbersky <psvimbersky@mirantis.com> Tue Sep 12 15:26:21 2017 +0200
tree 6fae9939fa87815e422c55b5a144de2e83983b25
parent 773a6ea97d514ef98785faaaade9427d40e63a61

Fix Openstack with K8s and OpenContrail auth

Change-Id: I2ecf9ccb33c2a56a4b087ecde1fe7dab690ac38e

opencontrail/config.sls

diff --git a/opencontrail/config.sls b/opencontrail/config.sls
index 502d2aa..68d7901 100644
--- a/opencontrail/config.sls
+++ b/opencontrail/config.sls
@@ -192,7 +192,7 @@
   {%- if grains.get('noservices') %}
   - onlyif: /bin/false
   {%- endif %}
-  - watch: 
+  - watch:
     {%- if config.version <= 3.0 %}
     - file: /etc/contrail/contrail-discovery.conf
     - file: /etc/ifmap-server/basicauthusers.properties

opencontrail/files/3.0/contrail-api.conf

diff --git a/opencontrail/files/3.0/contrail-api.conf b/opencontrail/files/3.0/contrail-api.conf
index 629b1ac..ceadd64 100644
--- a/opencontrail/files/3.0/contrail-api.conf
+++ b/opencontrail/files/3.0/contrail-api.conf
@@ -23,7 +23,7 @@
 rabbit_server={{ config.message_queue.host }}
 {%- endif %}
 rabbit_port={{ config.message_queue.port }}
-{%- if config.identity.engine == "keystone" %}
+{%- if config.identity.engine == "keystone" and not config.get('k8s_enabled', False) %}
 auth=keystone
 {%- endif %}
 #rabbit_port=5673{{ config.message_queue.port }}

opencontrail/files/4.0/contrail-api.conf

diff --git a/opencontrail/files/4.0/contrail-api.conf b/opencontrail/files/4.0/contrail-api.conf
index accbf49..acb2fc9 100644
--- a/opencontrail/files/4.0/contrail-api.conf
+++ b/opencontrail/files/4.0/contrail-api.conf
@@ -19,7 +19,7 @@
 rabbit_server={{ config.message_queue.host }}
 {%- endif %}
 rabbit_port={{ config.message_queue.port }}
-{%- if config.identity.engine == "keystone" %}
+{%- if config.identity.engine == "keystone" and not config.get('k8s_enabled', False) %}
 auth=keystone
 {%- endif %}
 #rabbit_port=5673