Update Kitchen test suites and Travis settings
diff --git a/tests/pillar/repo_cassandra.sls b/tests/pillar/repo_cassandra.sls
index 8ece8a8..d6c454d 100644
--- a/tests/pillar/repo_cassandra.sls
+++ b/tests/pillar/repo_cassandra.sls
@@ -1,9 +1,10 @@
linux:
system:
+ enabled: true
repo:
cassandra-21x:
source: "deb [arch=amd64] http://www.apache.org/dist/cassandra/debian 21x main"
architectures: amd64
- key_server: pool.sks-keyservers.net
+ key_server: hkp://p80.pool.sks-keyservers.net:80
key_id: A278B781FE4B2BDA
diff --git a/tests/pillar/repo_mos8.sls b/tests/pillar/repo_mos8.sls
index 3b53e53..1033cb4 100644
--- a/tests/pillar/repo_mos8.sls
+++ b/tests/pillar/repo_mos8.sls
@@ -1,7 +1,8 @@
linux:
system:
+ enabled: true
repo:
- mirantis_openstack:
+ mirantis_openstack_mos8:
source: "deb [arch=amd64] http://mirror.fuel-infra.org/mos-repos/ubuntu/8.0-mu-3/ mos8.0 main restricted"
architectures: amd64
key_url: "http://mirror.fuel-infra.org/mos-repos/ubuntu/8.0-mu-3/archive-mos8.0.key"
diff --git a/tests/pillar/repo_mos9.sls b/tests/pillar/repo_mos9.sls
index 90df22d..8316770 100644
--- a/tests/pillar/repo_mos9.sls
+++ b/tests/pillar/repo_mos9.sls
@@ -1,7 +1,7 @@
linux:
system:
repo:
- mirantis_openstack:
+ mirantis_openstack_mos9:
source: "deb [arch=amd64] http://mirror.fuel-infra.org/mos-repos/ubuntu/9.0/ mos9.0 main restricted"
architectures: amd64
key_url: "http://mirror.fuel-infra.org/mos-repos/ubuntu/9.0/archive-mos9.0.key"
diff --git a/tests/pillar/repo_opencontrail.sls b/tests/pillar/repo_opencontrail.sls
new file mode 100644
index 0000000..79cf4d0
--- /dev/null
+++ b/tests/pillar/repo_opencontrail.sls
@@ -0,0 +1,20 @@
+linux:
+ system:
+ enabled: true
+ repo:
+ mcp_opencontrail_repo:
+ source: "deb [arch=amd64] http://apt-mk.mirantis.com/{{ grains.get('oscodename') }}/ stable oc311 extra"
+ architectures: amd64
+ key_url: "http://apt-mk.mirantis.com/public.gpg"
+ pin:
+ - pin: 'release a=stable'
+ priority: 1100
+ package: '*'
+ opencontrail_team:
+ source: "deb http://ppa.launchpad.net/opencontrail/ppa/ubuntu {{ grains.get('oscodename') }} main"
+ opencontrail_extra:
+ source: "deb http://ppa.launchpad.net/mirantis-opencontrail/extra/ubuntu trusty main"
+ openjdk-r_repo:
+ source: "deb http://ppa.launchpad.net/openjdk-r/ppa/ubuntu {{ grains.get('oscodename') }} main"
+ opencontrail_311:
+ source: "deb http://ppa.launchpad.net/mirantis-opencontrail/opencontrail-3.1.1/ubuntu {{ grains.get('oscodename') }} main "
diff --git a/tests/pillar/repo_openstack.sls b/tests/pillar/repo_openstack.sls
new file mode 100644
index 0000000..c3d858d
--- /dev/null
+++ b/tests/pillar/repo_openstack.sls
@@ -0,0 +1,44 @@
+linux:
+ system:
+ enabled: true
+ repo:
+ mirantis_openstack:
+ source: "deb http://mirror.fuel-infra.org/mcp-repos/1.0/{{ grains.get('oscodename') }} mitaka main"
+ architectures: amd64
+ key_url: "http://mirror.fuel-infra.org/mcp-repos/1.0/{{ grains.get('oscodename') }}/archive-mcp1.0.key"
+ pin:
+ - pin: 'release a=mitaka'
+ priority: 1050
+ package: '*'
+ mirantis_openstack_hotfix:
+ source: "deb http://mirror.fuel-infra.org/mcp-repos/1.0/{{ grains.get('oscodename') }} mitaka-hotfix main"
+ architectures: amd64
+ key_url: "http://mirror.fuel-infra.org/mcp-repos/1.0/{{ grains.get('oscodename') }}/archive-mcp1.0.key"
+ pin:
+ - pin: 'release a=mitaka-hotfix'
+ priority: 1050
+ package: '*'
+ mirantis_openstack_security:
+ source: "deb http://mirror.fuel-infra.org/mcp-repos/1.0/{{ grains.get('oscodename') }} mitaka-security main"
+ architectures: amd64
+ key_url: "http://mirror.fuel-infra.org/mcp-repos/1.0/{{ grains.get('oscodename') }}/archive-mcp1.0.key"
+ pin:
+ - pin: 'release a=mitaka-security'
+ priority: 1050
+ package: '*'
+ mirantis_openstack_updates:
+ source: "deb http://mirror.fuel-infra.org/mcp-repos/1.0/{{ grains.get('oscodename') }} mitaka-updates main"
+ architectures: amd64
+ key_url: "http://mirror.fuel-infra.org/mcp-repos/1.0/{{ grains.get('oscodename') }}/archive-mcp1.0.key"
+ pin:
+ - pin: 'release a=mitaka-uptades'
+ priority: 1050
+ package: '*'
+ mirantis_openstack_holdback:
+ source: "deb http://mirror.fuel-infra.org/mcp-repos/1.0/{{ grains.get('oscodename') }} mitaka-holdback main"
+ architectures: amd64
+ key_url: "http://mirror.fuel-infra.org/mcp-repos/1.0/{{ grains.get('oscodename') }}/archive-mcp1.0.key"
+ pin:
+ - pin: 'release a=mitaka-holdback'
+ priority: 1050
+ package: '*'
diff --git a/tests/pillar/tor.sls b/tests/pillar/tor.sls
index 04ecba0..39009ce 100644
--- a/tests/pillar/tor.sls
+++ b/tests/pillar/tor.sls
@@ -33,3 +33,11 @@
mask: /24
dns: 127.0.0.1
mtu: 9000
+linux:
+ network:
+ enabled: true
+ hostname: opencontrail
+ interface:
+ vhost0:
+ enabled: True
+ type: eth
diff --git a/tests/pillar/vrouter_dpdk.sls b/tests/pillar/vrouter-dpdk.sls
similarity index 82%
rename from tests/pillar/vrouter_dpdk.sls
rename to tests/pillar/vrouter-dpdk.sls
index 8a6c17f..8004bac 100644
--- a/tests/pillar/vrouter_dpdk.sls
+++ b/tests/pillar/vrouter-dpdk.sls
@@ -31,4 +31,11 @@
mask: /24
dns: 127.0.0.1
mtu: 9000
-
+linux:
+ network:
+ enabled: true
+ hostname: opencontrail
+ interface:
+ vhost0:
+ enabled: True
+ type: eth
diff --git a/tests/pillar/vrouter.sls b/tests/pillar/vrouter.sls
index 45418a0..8ddbdc6 100644
--- a/tests/pillar/vrouter.sls
+++ b/tests/pillar/vrouter.sls
@@ -25,3 +25,11 @@
mask: /24
dns: 127.0.0.1
mtu: 9000
+linux:
+ network:
+ enabled: true
+ hostname: opencontrail
+ interface:
+ vhost0:
+ enabled: True
+ type: eth
diff --git a/tests/pillar/vrouter_kubernetes.sls b/tests/pillar/vrouter_kubernetes.sls
deleted file mode 100644
index bc5bcc6..0000000
--- a/tests/pillar/vrouter_kubernetes.sls
+++ /dev/null
@@ -1,18 +0,0 @@
-opencontrail:
- common:
- version: 3.0
- identity:
- engine: kubernetes
- compute:
- engine: kubernetes
- version: 3.0
- enabled: True
- discovery:
- host: 127.0.0.1
- interface:
- address: 127.0.0.1
- dev: eth0
- gateway: 127.0.0.1
- mask: /24
- dns: 127.0.0.1
- mtu: 9000