Add missing sriov_agent.ini + update test structure
Change-Id: If431aa5dc8c65abf6e4da947421f3c6cfb8f820d
Related-PROD: PROD-25611
diff --git a/tests/pillar/compute_ovn.sls b/tests/pillar/compute_ovn.sls
index 487faa3..f3fbaf1 100644
--- a/tests/pillar/compute_ovn.sls
+++ b/tests/pillar/compute_ovn.sls
@@ -13,11 +13,4 @@
ovsdb_server_iface: ptcp:6640:127.0.0.1
host: 10.1.0.101
password: unsegreto
-linux:
- system:
- enabled: true
- repo:
- mirantis_openstack_queens:
- source: "deb http://mirror.fuel-infra.org/mcp-repos/queens/xenial queens main"
- architectures: amd64
- key_url: "http://mirror.fuel-infra.org/mcp-repos/queens/xenial/archive-mcpqueens.key"
+
diff --git a/tests/pillar/control_bgpvpn.sls b/tests/pillar/control_bgpvpn.sls
index d7b4d16..b8926fd 100644
--- a/tests/pillar/control_bgpvpn.sls
+++ b/tests/pillar/control_bgpvpn.sls
@@ -7,11 +7,3 @@
bgp_vpn:
enabled: true
driver: bagpipe
-linux:
- system:
- enabled: true
- repo:
- mirantis_openstack_pike:
- source: "deb http://mirror.fuel-infra.org/mcp-repos/pike/xenial pike main"
- architectures: amd64
- key_url: "http://mirror.fuel-infra.org/mcp-repos/pike/xenial/archive-mcppike.key"
\ No newline at end of file
diff --git a/tests/pillar/control_l2gw.sls b/tests/pillar/control_l2gw.sls
index b1c2065..30e5b72 100644
--- a/tests/pillar/control_l2gw.sls
+++ b/tests/pillar/control_l2gw.sls
@@ -53,12 +53,4 @@
'create_network:shared':
version: pike
l2gw:
- enabled: true
-linux:
- system:
- enabled: true
- repo:
- mirantis_openstack_pike:
- source: "deb http://mirror.fuel-infra.org/mcp-repos/pike/xenial pike main"
- architectures: amd64
- key_url: "http://mirror.fuel-infra.org/mcp-repos/pike/xenial/archive-mcppike.key"
+ enabled: true
\ No newline at end of file
diff --git a/tests/pillar/control_opendaylight.sls b/tests/pillar/control_opendaylight.sls
index 76a4c90..86310e9 100644
--- a/tests/pillar/control_opendaylight.sls
+++ b/tests/pillar/control_opendaylight.sls
@@ -61,11 +61,3 @@
ovs:
driver: opendaylight
order: 77
-linux:
- system:
- enabled: true
- repo:
- mirantis_openstack_pike:
- source: "deb http://mirror.fuel-infra.org/mcp-repos/pike/xenial pike main"
- architectures: amd64
- key_url: "http://mirror.fuel-infra.org/mcp-repos/pike/xenial/archive-mcppike.key"
diff --git a/tests/pillar/control_ovn.sls b/tests/pillar/control_ovn.sls
index f5348fa..e891cb4 100644
--- a/tests/pillar/control_ovn.sls
+++ b/tests/pillar/control_ovn.sls
@@ -57,11 +57,3 @@
db-nb-create-insecure-remote: 'yes'
db-sb-create-insecure-remote: 'yes'
-linux:
- system:
- enabled: true
- repo:
- mirantis_openstack_queens:
- source: "deb http://mirror.fuel-infra.org/mcp-repos/queens/xenial queens main"
- architectures: amd64
- key_url: "http://mirror.fuel-infra.org/mcp-repos/queens/xenial/archive-mcpqueens.key"
diff --git a/tests/pillar/control_sfc.sls b/tests/pillar/control_sfc.sls
index 81a4bc2..c460274 100644
--- a/tests/pillar/control_sfc.sls
+++ b/tests/pillar/control_sfc.sls
@@ -10,12 +10,3 @@
- ovs
flow_classifier_drivers:
- ovs
-
-linux:
- system:
- enabled: true
- repo:
- mirantis_openstack_queens:
- source: "deb http://mirror.fuel-infra.org/mcp-repos/queens/xenial queens main"
- architectures: amd64
- key_url: "http://mirror.fuel-infra.org/mcp-repos/queens/xenial/archive-mcpqueens.key"
diff --git a/tests/pillar/gateway_legacy_l2gw.sls b/tests/pillar/gateway_legacy_l2gw.sls
index d3cd4a8..df45399 100644
--- a/tests/pillar/gateway_legacy_l2gw.sls
+++ b/tests/pillar/gateway_legacy_l2gw.sls
@@ -27,11 +27,4 @@
enabled: true
ovsdb_hosts:
ovsdbx: 10.164.5.33:6632
-linux:
- system:
- enabled: true
- repo:
- mirantis_openstack_pike:
- source: "deb http://mirror.fuel-infra.org/mcp-repos/pike/xenial pike main"
- architectures: amd64
- key_url: "http://mirror.fuel-infra.org/mcp-repos/pike/xenial/archive-mcppike.key"
+
diff --git a/tests/pillar/gateway_legacy_opendaylight.sls b/tests/pillar/gateway_legacy_opendaylight.sls
index 2f43676..948955b 100644
--- a/tests/pillar/gateway_legacy_opendaylight.sls
+++ b/tests/pillar/gateway_legacy_opendaylight.sls
@@ -31,11 +31,3 @@
ovsdb_odl_iface: tcp:127.0.0.1:6640
tunnel_ip: 10.1.0.110
provider_mappings: physnet1:br-floating
-linux:
- system:
- enabled: true
- repo:
- mirantis_openstack_pike:
- source: "deb http://mirror.fuel-infra.org/mcp-repos/pike/xenial pike main"
- architectures: amd64
- key_url: "http://mirror.fuel-infra.org/mcp-repos/pike/xenial/archive-mcppike.key"
diff --git a/tests/pillar/repo_mitaka.sls b/tests/pillar/repo_mitaka.sls
new file mode 100644
index 0000000..625210a
--- /dev/null
+++ b/tests/pillar/repo_mitaka.sls
@@ -0,0 +1,8 @@
+linux:
+ system:
+ enabled: true
+ repo:
+ mirantis_openstack:
+ source: "deb http://mirror.fuel-infra.org/mcp-repos/mitaka/xenial/ mitaka main"
+ architectures: amd64
+ key_url: "http://mirror.fuel-infra.org/mcp-repos/mitaka/xenial/archive-mcpmitaka.key"
\ No newline at end of file
diff --git a/tests/pillar/repo_newton.sls b/tests/pillar/repo_newton.sls
new file mode 100644
index 0000000..e11cb18
--- /dev/null
+++ b/tests/pillar/repo_newton.sls
@@ -0,0 +1,8 @@
+linux:
+ system:
+ enabled: true
+ repo:
+ mirantis_openstack:
+ source: "deb http://mirror.fuel-infra.org/mcp-repos/newton/xenial/ newton main"
+ architectures: amd64
+ key_url: "http://mirror.fuel-infra.org/mcp-repos/newton/xenial/archive-mcpnewton.key"
\ No newline at end of file
diff --git a/tests/pillar/repo_ocata.sls b/tests/pillar/repo_ocata.sls
new file mode 100644
index 0000000..41d42d1
--- /dev/null
+++ b/tests/pillar/repo_ocata.sls
@@ -0,0 +1,8 @@
+linux:
+ system:
+ enabled: true
+ repo:
+ mirantis_openstack:
+ source: "deb http://mirror.fuel-infra.org/mcp-repos/ocata/xenial ocata main"
+ architectures: amd64
+ key_url: "http://mirror.fuel-infra.org/mcp-repos/ocata/xenial/archive-mcpocata.key"
\ No newline at end of file
diff --git a/tests/pillar/repo_pike.sls b/tests/pillar/repo_pike.sls
new file mode 100644
index 0000000..bc006ea
--- /dev/null
+++ b/tests/pillar/repo_pike.sls
@@ -0,0 +1,8 @@
+linux:
+ system:
+ enabled: true
+ repo:
+ mirantis_openstack_repo:
+ source: "deb http://mirror.mirantis.com/stable/openstack-pike/xenial xenial main"
+ architectures: amd64
+ key_url: "http://mirror.mirantis.com/stable/openstack-pike/xenial/archive-pike.key"
diff --git a/tests/pillar/repo_queens.sls b/tests/pillar/repo_queens.sls
new file mode 100644
index 0000000..46f7bd9
--- /dev/null
+++ b/tests/pillar/repo_queens.sls
@@ -0,0 +1,8 @@
+linux:
+ system:
+ enabled: true
+ repo:
+ mirantis_openstack_queens:
+ source: "deb http://mirror.mirantis.com/stable/openstack-queens/xenial xenial main"
+ architectures: amd64
+ key_url: "http://mirror.mirantis.com/stable/openstack-queens/xenial/archive-queens.key"
\ No newline at end of file