Merge "Add .env for virtual-mcp11-contrail"
diff --git a/.gitignore b/.gitignore
index 2e88c07..7bfbce7 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,2 @@
classes/service/
+.kitchen/
diff --git a/classes/cluster/os-ha-contrail-40/infra/init.yml b/classes/cluster/os-ha-contrail-40/infra/init.yml
index 182936e..eafd3c6 100644
--- a/classes/cluster/os-ha-contrail-40/infra/init.yml
+++ b/classes/cluster/os-ha-contrail-40/infra/init.yml
@@ -6,4 +6,3 @@
infra_config_address: 172.16.10.100
infra_config_hostname: cfg01
linux_system_repo_mcp_salt_version: nightly
-
diff --git a/classes/cluster/os-ha-contrail-40/opencontrail/control.yml b/classes/cluster/os-ha-contrail-40/opencontrail/control.yml
index e8b854d..c3a531d 100644
--- a/classes/cluster/os-ha-contrail-40/opencontrail/control.yml
+++ b/classes/cluster/os-ha-contrail-40/opencontrail/control.yml
@@ -14,8 +14,9 @@
- system.opencontrail.client.resource.config_node
- system.opencontrail.client.resource.database_node
- system.opencontrail.client.resource.analytics_node
+- system.opencontrail.client.resource.global_vrouter_config
- system.haproxy.proxy.listen.opencontrail.analytics
-- system.docker.client
+- system.docker.client.compose
- cluster.os-ha-contrail-40
parameters:
_param:
diff --git a/classes/cluster/os-ha-contrail-40/openstack/compute.yml b/classes/cluster/os-ha-contrail-40/openstack/compute.yml
index 30613d3..6f677d4 100644
--- a/classes/cluster/os-ha-contrail-40/openstack/compute.yml
+++ b/classes/cluster/os-ha-contrail-40/openstack/compute.yml
@@ -34,6 +34,8 @@
enabled: true
type: eth
proto: manual
+ pre_up_cmds:
+ - ethtool -K ens4 rx off tx off gro off tso off
vhost0:
enabled: true
type: eth
diff --git a/classes/cluster/os-ha-contrail/infra/init.yml b/classes/cluster/os-ha-contrail/infra/init.yml
index e504ccc..b54cf03 100755
--- a/classes/cluster/os-ha-contrail/infra/init.yml
+++ b/classes/cluster/os-ha-contrail/infra/init.yml
@@ -6,4 +6,3 @@
infra_config_address: 172.16.10.100
infra_config_hostname: cfg01
linux_system_repo_mcp_salt_version: nightly
-
diff --git a/classes/cluster/os-ha-contrail/opencontrail/control.yml b/classes/cluster/os-ha-contrail/opencontrail/control.yml
index 4c03393..64cb921 100644
--- a/classes/cluster/os-ha-contrail/opencontrail/control.yml
+++ b/classes/cluster/os-ha-contrail/opencontrail/control.yml
@@ -13,6 +13,7 @@
- system.opencontrail.client.resource.database_node
- system.opencontrail.client.resource.analytics_node
- system.opencontrail.client.resource.openstack_metadata
+- system.opencontrail.client.resource.global_vrouter_config
- system.haproxy.proxy.listen.opencontrail.analytics
- cluster.os-ha-contrail
parameters:
diff --git a/classes/cluster/os-ha-contrail/openstack/compute.yml b/classes/cluster/os-ha-contrail/openstack/compute.yml
index 8346f2f..8f15232 100755
--- a/classes/cluster/os-ha-contrail/openstack/compute.yml
+++ b/classes/cluster/os-ha-contrail/openstack/compute.yml
@@ -36,6 +36,8 @@
enabled: true
type: eth
proto: manual
+ pre_up_cmds:
+ - ethtool -K ens4 rx off tx off gro off tso off
vhost0:
enabled: true
type: eth
diff --git a/classes/system b/classes/system
index 1cf016f..0a17807 160000
--- a/classes/system
+++ b/classes/system
@@ -1 +1 @@
-Subproject commit 1cf016fcf3f283df4215efb7697b3a4dcfe4c9ac
+Subproject commit 0a17807f39aac95f9e0de8643f64e5116bdd1a1e