commit 5756325bd2af3b529601b02d824800f1e2c8289a
author ibumarskov <ibumarskov@mirantis.com> Tue Apr 16 00:15:00 2019 +0400
committer Ilya Bumarskov <ibumarskov@mirantis.com> Tue Apr 16 17:48:32 2019 +0000
tree c5d527c75d869d39cc6b6499c9eb06e254a14137
parent f608678477b5a7755a28aa2005433567f51cb420

contrail-webui: enable ssl auth for openstack services

Fixes:
- determine default parameter for identity protocol.
- fix documentation.

Change-Id: I07a82064178e466c017cb18c64a405e683a5493c
Related-PROD: PROD-29221 (PROD:29221)

tests/pillar/cluster3.sls

diff --git a/tests/pillar/cluster3.sls b/tests/pillar/cluster3.sls
index f61c636..a23557c 100644
--- a/tests/pillar/cluster3.sls
+++ b/tests/pillar/cluster3.sls
@@ -162,6 +162,7 @@
     identity:
       engine: keystone
       version: '2.0'
+      protocol: http
       host: 127.0.0.1
       port: 35357
       user: admin

tests/pillar/cluster40.sls

diff --git a/tests/pillar/cluster40.sls b/tests/pillar/cluster40.sls
index f8d0583..5bc81b5 100644
--- a/tests/pillar/cluster40.sls
+++ b/tests/pillar/cluster40.sls
@@ -197,6 +197,7 @@
     identity:
       engine: keystone
       version: '2.0'
+      protocol: http
       host: 127.0.0.1
       port: 35357
       user: admin

tests/pillar/control3.sls

diff --git a/tests/pillar/control3.sls b/tests/pillar/control3.sls
index 2a107ee..d2c9f4e 100644
--- a/tests/pillar/control3.sls
+++ b/tests/pillar/control3.sls
@@ -147,6 +147,7 @@
     identity:
       engine: keystone
       version: '2.0'
+      protocol: http
       host: 127.0.0.1
       port: 35357
       user: admin

tests/pillar/control40.sls

diff --git a/tests/pillar/control40.sls b/tests/pillar/control40.sls
index a503ce6..d7d9bb5 100644
--- a/tests/pillar/control40.sls
+++ b/tests/pillar/control40.sls
@@ -162,6 +162,7 @@
     identity:
       engine: keystone
       version: '2.0'
+      protocol: http
       host: 127.0.0.1
       port: 35357
       user: admin

tests/pillar/single3.sls

diff --git a/tests/pillar/single3.sls b/tests/pillar/single3.sls
index c99fc83..045eb7a 100644
--- a/tests/pillar/single3.sls
+++ b/tests/pillar/single3.sls
@@ -129,6 +129,7 @@
     identity:
       engine: keystone
       version: '2.0'
+      protocol: http
       host: 127.0.0.1
       port: 35357
       user: admin

tests/pillar/single40.sls

diff --git a/tests/pillar/single40.sls b/tests/pillar/single40.sls
index ae4f8b4..c064f37 100644
--- a/tests/pillar/single40.sls
+++ b/tests/pillar/single40.sls
@@ -151,6 +151,7 @@
     identity:
       engine: keystone
       version: '2.0'
+      protocol: http
       host: 127.0.0.1
       port: 35357
       user: admin