Cleanup + extend tests/pillars
diff --git a/tests/pillar/analytics.sls b/tests/pillar/analytics.sls
index 7ef9977..0fe58c0 100644
--- a/tests/pillar/analytics.sls
+++ b/tests/pillar/analytics.sls
@@ -1,6 +1,6 @@
opencontrail:
common:
- version: 2.2
+ version: 3.0
identity:
engine: keystone
host: 127.0.0.1
@@ -12,7 +12,7 @@
host: 127.0.0.1
port: 9696
collector:
- version: 2.2
+ version: 3.0
enabled: true
bind:
address: 127.0.0.1
@@ -30,7 +30,7 @@
- host: 127.0.0.1
port: 9160
database:
- version: 2.2
+ version: 3.0
cassandra:
version: 2
enabled: true
@@ -52,4 +52,4 @@
- host: 127.0.0.1
id: 2
- host: 127.0.0.1
- id: 3
\ No newline at end of file
+ id: 3
diff --git a/tests/pillar/cluster.sls b/tests/pillar/cluster.sls
index a1984fd..29e22c9 100644
--- a/tests/pillar/cluster.sls
+++ b/tests/pillar/cluster.sls
@@ -1,6 +1,6 @@
opencontrail:
common:
- version: 2.2
+ version: 3.0
source:
engine: pkg
address: http://mirror.robotice.cz/contrail-havana/
@@ -15,7 +15,7 @@
host: 127.0.0.1
port: 9696
config:
- version: 2.2
+ version: 3.0
enabled: true
multi_tenancy: false
network:
@@ -66,7 +66,7 @@
- host: 127.0.0.1
id: 3
control:
- version: 2.2
+ version: 3.0
enabled: true
bind:
address: 127.0.0.1
@@ -82,7 +82,7 @@
- host: 127.0.0.1
id: 3
collector:
- version: 2.2
+ version: 3.0
enabled: true
bind:
address: 127.0.0.1
@@ -100,7 +100,7 @@
- host: 127.0.0.1
port: 9160
database:
- version: 2.2
+ version: 3.0
cassandra:
version: 2
enabled: true
@@ -124,7 +124,7 @@
- host: 127.0.0.1
id: 3
web:
- version: 2.2
+ version: 3.0
enabled: True
bind:
address: 127.0.0.1
diff --git a/tests/pillar/control.sls b/tests/pillar/control.sls
index 83ec951..3ba9d34 100644
--- a/tests/pillar/control.sls
+++ b/tests/pillar/control.sls
@@ -1,6 +1,6 @@
opencontrail:
common:
- version: 2.2
+ version: 3.0
identity:
engine: keystone
host: 127.0.0.1
@@ -12,7 +12,7 @@
host: 127.0.0.1
port: 9696
config:
- version: 2.2
+ version: 3.0
enabled: true
multi_tenancy: false
network:
@@ -63,7 +63,7 @@
- host: 127.0.0.1
id: 3
control:
- version: 2.2
+ version: 3.0
enabled: true
bind:
address: 127.0.0.1
@@ -103,7 +103,7 @@
- host: 127.0.0.1
id: 3
web:
- version: 2.2
+ version: 3.0
enabled: True
bind:
address: 127.0.0.1
diff --git a/tests/pillar/single.sls b/tests/pillar/single.sls
index 4a253f7..faba0dc 100644
--- a/tests/pillar/single.sls
+++ b/tests/pillar/single.sls
@@ -1,6 +1,6 @@
opencontrail:
common:
- version: 2.2
+ version: 3.0
source:
engine: pkg
address: http://mirror.robotice.cz/contrail-havana/
@@ -15,7 +15,7 @@
host: 127.0.0.1
port: 9696
config:
- version: 2.2
+ version: 3.0
multi_tenancy: false
enabled: true
network:
@@ -54,7 +54,7 @@
- host: 127.0.0.1
id: 1
control:
- version: 2.2
+ version: 3.0
enabled: true
bind:
address: 127.0.0.1
@@ -66,7 +66,7 @@
- host: 127.0.0.1
id: 1
collector:
- version: 2.2
+ version: 3.0
enabled: true
bind:
address: 127.0.0.1
@@ -80,7 +80,7 @@
- host: 127.0.0.1
port: 9160
database:
- version: 2.2
+ version: 3.0
cassandra:
version: 2
enabled: true
@@ -100,7 +100,7 @@
- host: 127.0.0.1
id: 1
web:
- version: 2.2
+ version: 3.0
enabled: True
bind:
address: 127.0.0.1
diff --git a/tests/pillar/tor.sls b/tests/pillar/tor.sls
index 2452377..a14ce11 100644
--- a/tests/pillar/tor.sls
+++ b/tests/pillar/tor.sls
@@ -1,6 +1,6 @@
opencontrail:
common:
- version: 2.2
+ version: 3.0
identity:
engine: keystone
host: 127.0.0.1
@@ -13,11 +13,11 @@
port: 9696
tor:
enabled: true
- version: 2.2
+ version: 3.0
agents: 1
control:
address: 127.0.0.1
interface:
address: 127.0.0.1
device:
- host: 127.0.0.1
\ No newline at end of file
+ host: 127.0.0.1
diff --git a/tests/pillar/vrouter.sls b/tests/pillar/vrouter.sls
index fa00635..45418a0 100644
--- a/tests/pillar/vrouter.sls
+++ b/tests/pillar/vrouter.sls
@@ -1,6 +1,6 @@
opencontrail:
common:
- version: 2.2
+ version: 3.0
identity:
engine: keystone
host: 127.0.0.1
@@ -12,7 +12,7 @@
host: 127.0.0.1
port: 9696
compute:
- version: 2.2
+ version: 3.0
enabled: True
discovery:
host: 127.0.0.1
diff --git a/tests/pillar/vrouter_kubernetes.sls b/tests/pillar/vrouter_kubernetes.sls
index 86aa79f..bc5bcc6 100644
--- a/tests/pillar/vrouter_kubernetes.sls
+++ b/tests/pillar/vrouter_kubernetes.sls
@@ -1,11 +1,11 @@
opencontrail:
common:
- version: 2.2
+ version: 3.0
identity:
engine: kubernetes
compute:
engine: kubernetes
- version: 2.2
+ version: 3.0
enabled: True
discovery:
host: 127.0.0.1
@@ -15,4 +15,4 @@
gateway: 127.0.0.1
mask: /24
dns: 127.0.0.1
- mtu: 9000
\ No newline at end of file
+ mtu: 9000