Attempt to fix k8s-ha-contrail
Change-Id: I4b5a50ee2edcf2d18282bc7dd8da2f4133b5d3bb
diff --git a/classes/cluster/k8s-ha-contrail/infra/config.yml b/classes/cluster/k8s-ha-contrail/infra/config.yml
index 3d7cbd0..d439773 100644
--- a/classes/cluster/k8s-ha-contrail/infra/config.yml
+++ b/classes/cluster/k8s-ha-contrail/infra/config.yml
@@ -1,11 +1,12 @@
classes:
+- system.linux.system.single
- system.linux.system.repo.ubuntu
- system.linux.system.repo.mcp.salt
- system.openssh.client.lab
- system.salt.master.pkg
-- system.salt.minion.ca.salt_master
- system.salt.master.api
- system.reclass.storage.salt
+- system.salt.minion.ca.salt_master
- system.salt.minion.cert.k8s_server
- system.reclass.storage.system.kubernetes_control_cluster
- system.reclass.storage.system.opencontrail_control_cluster
@@ -35,6 +36,15 @@
proto: static
address: ${_param:single_address}
netmask: 255.255.255.0
+ pre_up_cmds:
+ - "iptables -t nat -A POSTROUTING -o ens3 -j MASQUERADE"
+ post_down_cmds:
+ - "iptables -t nat -F POSTROUTING"
+ system:
+ kernel:
+ sysctl:
+ net.ipv4.conf.ens3.forwarding: 1
+ net.ipv4.conf.ens3.send_redirects: 0
reclass:
storage:
class_mapping:
diff --git a/classes/cluster/k8s-ha-contrail/infra/init.yml b/classes/cluster/k8s-ha-contrail/infra/init.yml
index 5fbbbea..d5fe565 100644
--- a/classes/cluster/k8s-ha-contrail/infra/init.yml
+++ b/classes/cluster/k8s-ha-contrail/infra/init.yml
@@ -1,7 +1,3 @@
-classes:
-- system.linux.system.repo.mcp.extra
-- system.linux.system.repo.mcp.salt
-- system.linux.system.repo.ubuntu
parameters:
_param:
# infra service addresses
diff --git a/classes/cluster/k8s-ha-contrail/init.yml b/classes/cluster/k8s-ha-contrail/init.yml
index ee4126e..de3fa9b 100644
--- a/classes/cluster/k8s-ha-contrail/init.yml
+++ b/classes/cluster/k8s-ha-contrail/init.yml
@@ -1,6 +1,8 @@
classes:
- system.linux.network.dynamic_hosts
+- system.linux.system.repo.mcp.extra
- system.linux.system.single
+- system.rsyslog.client.single
- cluster.k8s-ha-contrail.kubernetes
- cluster.k8s-ha-contrail.opencontrail
- cluster.k8s-ha-contrail.infra
@@ -9,3 +11,16 @@
- system.openssh.server.team.mcp_qa
- system.openssh.server.team.k8s_team
- cluster.overrides
+parameters:
+ salt:
+ minion:
+ trusted_ca_minions:
+ - cfg01
+ linux:
+ network:
+ host:
+ vsrx1:
+ address: 172.16.10.131
+ names:
+ - vsrx1
+ - vsrx1.${_param:cluster_domain}
\ No newline at end of file
diff --git a/classes/cluster/k8s-ha-contrail/opencontrail/control.yml b/classes/cluster/k8s-ha-contrail/opencontrail/control.yml
index 0c101cc..50e7e6d 100644
--- a/classes/cluster/k8s-ha-contrail/opencontrail/control.yml
+++ b/classes/cluster/k8s-ha-contrail/opencontrail/control.yml
@@ -6,14 +6,15 @@
- system.linux.system.repo.mcp.extra
- system.linux.system.repo.saltstack.trusty
- system.opencontrail.client.resource.edge_router
-- system.rabbitmq.server.cluster
- system.opencontrail.control.cluster
- system.opencontrail.client.cluster
- system.opencontrail.client.resource.control_node
- 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.rabbitmq.server.cluster
- cluster.k8s-ha-contrail
parameters:
_param:
diff --git a/classes/cluster/k8s-ha-contrail/opencontrail/init.yml b/classes/cluster/k8s-ha-contrail/opencontrail/init.yml
index cd3445a..7ed1b19 100644
--- a/classes/cluster/k8s-ha-contrail/opencontrail/init.yml
+++ b/classes/cluster/k8s-ha-contrail/opencontrail/init.yml
@@ -1,6 +1,7 @@
parameters:
_param:
opencontrail_version: 3.0
+ linux_repo_contrail_component: oc323
opencontrail_control_hostname: ntw
opencontrail_control_node01_hostname: ntw01
opencontrail_control_node02_hostname: ntw02