Update virtual-mcp11-k8s-contrail
- Updated k8s part
- Minor updates for contrail part
Change-Id: Iad8cd491dcb33bd1fc03d05389ed0d3a848ef600
Related-PROD: PROD-18983
diff --git a/classes/cluster/virtual-mcp11-k8s-contrail/infra/config.yml b/classes/cluster/virtual-mcp11-k8s-contrail/infra/config.yml
index 422adc9..717aa88 100644
--- a/classes/cluster/virtual-mcp11-k8s-contrail/infra/config.yml
+++ b/classes/cluster/virtual-mcp11-k8s-contrail/infra/config.yml
@@ -1,18 +1,21 @@
classes:
+- system.linux.system.single
+- system.linux.system.single.debian
+- system.linux.system.repo.mcp.salt
- system.linux.system.repo.mcp.apt_mirantis.ubuntu
- system.linux.system.repo.mcp.apt_mirantis.saltstack_2016_3
-- 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.salt.minion.ca.salt_master
- system.salt.minion.cert.k8s_server
- system.mysql.client
- system.mysql.client.database.grafana
- system.reclass.storage.salt
- system.reclass.storage.system.kubernetes_control_cluster
- system.reclass.storage.system.opencontrail_control_cluster
-- cluster.virtual-mcp11-k8s-contrail.infra
+- system.sphinx.server.doc.reclass
+- cluster.virtual-mcp11-k8s-contrail
parameters:
_param:
salt_master_base_environment: prd
@@ -20,10 +23,16 @@
reclass_data_revision: master
reclass_config_master: ${_param:infra_config_deploy_address}
single_address: ${_param:infra_config_address}
+ deploy_address: ${_param:infra_config_deploy_address}
linux_system_codename: xenial
salt_api_password_hash: "$6$WV0P1shnoDh2gI/Z$22/Bcd7ffMv0jDlFpT63cAU4PiXHz9pjXwngToKwqAsgoeK4HNR3PiKaushjxp3JsQ8hNoJmAC6TxzVqfV8WH/"
salt_master_host: ${_param:infra_config_deploy_address}
openstack_version: pike
+ salt:
+ master:
+ reactor:
+ reclass/minion/classify:
+ - salt://reclass/reactor/node_register.sls
linux:
network:
interface:
@@ -33,11 +42,15 @@
proto: static
address: ${_param:single_address}
netmask: 255.255.255.0
- salt:
- master:
- reactor:
- reclass/minion/classify:
- - salt://reclass/reactor/node_register.sls
+ 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:
@@ -50,6 +63,8 @@
value_template: <<node_os>>
salt_master_host:
value_template: <<node_master_ip>>
+ deploy_address:
+ value_template: <<node_deploy_ip>>
infra_config:
expression: <<node_hostname>>__equals__cfg01
cluster_param:
@@ -57,6 +72,8 @@
value_template: <<node_control_ip>>
infra_config_deploy_address:
value_template: <<node_deploy_ip>>
+ cluster_domain:
+ value_template: <<node_domain>>
infra_proxy:
expression: <<node_hostname>>__startswith__prx
node_class:
@@ -67,16 +84,37 @@
cluster_param:
kubernetes_control_node01_address:
value_template: <<node_control_ip>>
+ kubernetes_control_node01_deploy_address:
+ value_template: <<node_deploy_ip>>
kubernetes_control02:
expression: <<node_hostname>>__equals__ctl02
cluster_param:
kubernetes_control_node02_address:
value_template: <<node_control_ip>>
+ kubernetes_control_node02_deploy_address:
+ value_template: <<node_deploy_ip>>
kubernetes_control03:
expression: <<node_hostname>>__equals__ctl03
cluster_param:
kubernetes_control_node03_address:
value_template: <<node_control_ip>>
+ kubernetes_control_node03_deploy_address:
+ value_template: <<node_deploy_ip>>
+ etcd_control01:
+ expression: <<node_hostname>>__equals__ctl01
+ cluster_param:
+ etcd_control_node01_address:
+ value_template: <<node_deploy_ip>>
+ etcd_control02:
+ expression: <<node_hostname>>__equals__ctl02
+ cluster_param:
+ etcd_control_node02_address:
+ value_template: <<node_deploy_ip>>
+ etcd_control03:
+ expression: <<node_hostname>>__equals__ctl03
+ cluster_param:
+ etcd_control_node03_address:
+ value_template: <<node_deploy_ip>>
kubernetes_compute:
expression: <<node_hostname>>__startswith__cmp
node_class:
diff --git a/classes/cluster/virtual-mcp11-k8s-contrail/infra/init.yml b/classes/cluster/virtual-mcp11-k8s-contrail/infra/init.yml
index b5a73b2..9b30986 100644
--- a/classes/cluster/virtual-mcp11-k8s-contrail/infra/init.yml
+++ b/classes/cluster/virtual-mcp11-k8s-contrail/infra/init.yml
@@ -1,31 +1,10 @@
-classes:
-- system.linux.system.single
-- system.linux.system.single.debian
-- system.linux.system.repo.mcp.extra
-- system.linux.system.repo.mcp.salt
-- system.linux.system.repo.mcp.apt_mirantis.ubuntu
-- system.linux.system.repo.mcp.apt_mirantis.fluentd
-- system.linux.system.repo.mcp.apt_mirantis.openstack
-- system.openssh.server.team.all
-- system.rsyslog.client.single
-- system.fluentd
-- system.fluentd.label.default_metric
-- system.fluentd.label.default_metric.prometheus
-- system.fluentd.label.default_output.elasticsearch
-- system.fluentd.label.default_output.drop_event
-- system.telegraf.agent
-- system.prometheus.collector
-- service.grafana.collector
-- cluster.virtual-mcp11-k8s-contrail.kubernetes
-- cluster.virtual-mcp11-k8s-contrail.opencontrail
-- cluster.virtual-mcp11-k8s-contrail.stacklight
-- cluster.overrides
parameters:
_param:
# infra service addresses
infra_config_hostname: cfg01
infra_config_address: 172.16.10.100
infra_config_deploy_address: 192.168.10.90
+ cluster_public_host: 172.16.10.254
cluster_domain: virtual-mcp11-k8s-contrail.local
cluster_name: virtual-mcp11-k8s-contrail
@@ -33,6 +12,11 @@
linux:
network:
host:
+ self:
+ address: ${_param:single_address}
+ names:
+ - ${linux:system:name}
+ - ${linux:system:name}.${linux:system:domain}
cfg01:
address: ${_param:infra_config_address}
names: