Config only
Change-Id: Ie154129c1a5aee23bdb32ac4f924cd2f2045dad3
diff --git a/tests/pillar/analytics40.sls b/tests/pillar/analytics40.sls
index 9ab5628..34bc5eb 100644
--- a/tests/pillar/analytics40.sls
+++ b/tests/pillar/analytics40.sls
@@ -1,6 +1,7 @@
opencontrail:
common:
version: 4.0
+ config_only: true
identity:
engine: keystone
host: 127.0.0.1
@@ -12,7 +13,18 @@
host: 127.0.0.1
port: 9696
collector:
+ identity:
+ engine: keystone
+ version: '2.0'
+ region: RegionOne
+ host: 127.0.0.1
+ port: 35357
+ user: admin
+ password: password
+ token: token
+ tenant: admin
version: 4.0
+ config_only: true
enabled: true
bind:
address: 127.0.0.1
@@ -45,6 +57,7 @@
- host: 127.0.0.1
database:
version: 4.0
+ config_only: true
cassandra:
version: 2
enabled: true
diff --git a/tests/pillar/cluster40.sls b/tests/pillar/cluster40.sls
index 387b934..4cdac34 100644
--- a/tests/pillar/cluster40.sls
+++ b/tests/pillar/cluster40.sls
@@ -1,6 +1,7 @@
opencontrail:
common:
version: 4.0
+ config_only: true
identity:
engine: keystone
host: 127.0.0.1
@@ -13,6 +14,7 @@
port: 9696
config:
version: 4.0
+ config_only: true
enabled: true
api:
host: 127.0.0.1
@@ -66,6 +68,7 @@
id: 3
control:
version: 4.0
+ config_only: true
enabled: true
name: ntw-01
bind:
@@ -95,7 +98,18 @@
- host: 127.0.0.1
- host: 127.0.0.1
collector:
+ identity:
+ engine: keystone
+ version: '2.0'
+ region: RegionOne
+ host: 127.0.0.1
+ port: 35357
+ user: admin
+ password: password
+ token: token
+ tenant: admin
version: 4.0
+ config_only: true
enabled: true
bind:
address: 127.0.0.1
@@ -128,6 +142,7 @@
- host: 127.0.0.1
database:
version: 4.0
+ config_only: true
cassandra:
version: 2
enabled: true
@@ -155,6 +170,7 @@
- host: 127.0.0.1
web:
version: 4.0
+ config_only: true
enabled: True
network:
host: 127.0.0.1
diff --git a/tests/pillar/control40.sls b/tests/pillar/control40.sls
index 907dee7..5351ef8 100644
--- a/tests/pillar/control40.sls
+++ b/tests/pillar/control40.sls
@@ -1,6 +1,7 @@
opencontrail:
common:
version: 4.0
+ config_only: true
identity:
engine: keystone
host: 127.0.0.1
@@ -13,6 +14,7 @@
port: 9696
config:
version: 4.0
+ config_only: true
enabled: true
api:
host: 127.0.0.1
@@ -67,6 +69,7 @@
list_optimization_enabled: true
control:
version: 4.0
+ config_only: true
enabled: true
name: ntw-01
bind:
@@ -97,6 +100,7 @@
id: 3
database:
version: 4.0
+ config_only: true
cassandra:
version: 2
enabled: true
@@ -124,6 +128,7 @@
- host: 127.0.0.1
web:
version: 4.0
+ config_only: true
enabled: True
network:
host: 127.0.0.1
diff --git a/tests/pillar/repo_opencontrail_oc40.sls b/tests/pillar/repo_opencontrail_oc40.sls
index 4e856d1..98f3056 100644
--- a/tests/pillar/repo_opencontrail_oc40.sls
+++ b/tests/pillar/repo_opencontrail_oc40.sls
@@ -10,10 +10,3 @@
- pin: 'release a=nightly'
priority: 1100
package: '*'
- package:
- librdkafka1:
- version: 0.9.0-0contrail0
- hold: true
- python-kafka:
- version: 1.0.1-0contrail1
- hold: true
diff --git a/tests/pillar/single40.sls b/tests/pillar/single40.sls
index 5edb3dd..008a004 100644
--- a/tests/pillar/single40.sls
+++ b/tests/pillar/single40.sls
@@ -73,6 +73,16 @@
- host: 127.0.0.1
id: 1
collector:
+ identity:
+ engine: keystone
+ version: '2.0'
+ region: RegionOne
+ host: 127.0.0.1
+ port: 35357
+ user: admin
+ password: password
+ token: token
+ tenant: admin
version: 4.0
enabled: true
bind: