Keystone v3 support for opencontrail
Change-Id: I230438c62aaf9a95f8760f0daeed242906ecd132
diff --git a/tests/pillar/cluster.sls b/tests/pillar/cluster.sls
index aed4819..33bb380 100644
--- a/tests/pillar/cluster.sls
+++ b/tests/pillar/cluster.sls
@@ -43,6 +43,7 @@
host: 127.0.0.1
identity:
engine: keystone
+ version: '2.0'
region: RegionOne
host: 127.0.0.1
port: 35357
@@ -137,9 +138,10 @@
id: 3
identity:
engine: keystone
+ version: '2.0'
host: 127.0.0.1
port: 35357
user: admin
password: password
token: token
- tenant: admin
\ No newline at end of file
+ tenant: admin
diff --git a/tests/pillar/control.sls b/tests/pillar/control.sls
index db0cd7f..37ffae9 100644
--- a/tests/pillar/control.sls
+++ b/tests/pillar/control.sls
@@ -40,6 +40,7 @@
host: 127.0.0.1
identity:
engine: keystone
+ version: '2.0'
region: RegionOne
host: 127.0.0.1
port: 35357
@@ -116,9 +117,10 @@
id: 3
identity:
engine: keystone
+ version: '2.0'
host: 127.0.0.1
port: 35357
user: admin
password: password
token: token
- tenant: admin
\ No newline at end of file
+ tenant: admin
diff --git a/tests/pillar/single.sls b/tests/pillar/single.sls
index 4dd7c22..0c7b9a3 100644
--- a/tests/pillar/single.sls
+++ b/tests/pillar/single.sls
@@ -39,6 +39,7 @@
host: 127.0.0.1
identity:
engine: keystone
+ version: '2.0'
region: RegionOne
host: 127.0.0.1
port: 35357
@@ -113,9 +114,10 @@
id: 1
identity:
engine: keystone
+ version: '2.0'
host: 127.0.0.1
port: 35357
user: admin
password: password
token: token
- tenant: admin
\ No newline at end of file
+ tenant: admin