add routing and DNS configuration in salt-master
Ensure ens3 is set up and default gateway is set,
also that nameserver is specified.
PROD-18280
Change-Id: Ic9afcd85abf2e5f5704e08dd50acb4cf368fd308
diff --git a/classes/cluster/sl-os-contrail/infra/config.yml b/classes/cluster/sl-os-contrail/infra/config.yml
index e85cff6..e4d89a1 100755
--- a/classes/cluster/sl-os-contrail/infra/config.yml
+++ b/classes/cluster/sl-os-contrail/infra/config.yml
@@ -41,6 +41,7 @@
reclass_data_repository: "https://gerrit.mcp.mirantis.net/salt-models/mcp-virtual-lab"
reclass_data_revision: master
reclass_config_master: 192.168.10.90
+ reclass_config_master_gateway: 192.168.10.1
single_address: 172.16.10.90
salt_master_host: 127.0.0.1
salt_master_base_environment: prd
@@ -49,6 +50,13 @@
linux:
network:
interface:
+ ens3:
+ enabled: true
+ type: eth
+ proto: static
+ address: ${_param:reclass_config_master}
+ gateway: ${_param:reclass_config_master_gateway}
+ netmask: 255.255.255.0
ens4:
enabled: true
type: eth
diff --git a/classes/cluster/sl-os-ovs/infra/config.yml b/classes/cluster/sl-os-ovs/infra/config.yml
index 945673b..0f10552 100644
--- a/classes/cluster/sl-os-ovs/infra/config.yml
+++ b/classes/cluster/sl-os-ovs/infra/config.yml
@@ -49,6 +49,7 @@
salt_master_environment_repository: "https://github.com/tcpcloud"
salt_master_environment_revision: master
reclass_config_master: ${_param:infra_config_deploy_address}
+ reclass_config_master_gateway: ${_param:infra_config_gateway_address}
single_address: ${_param:infra_config_address}
salt_master_host: 127.0.0.1
salt_master_base_environment: prd
@@ -58,6 +59,13 @@
linux:
network:
interface:
+ ens3:
+ enabled: true
+ type: eth
+ proto: static
+ address: ${_param:reclass_config_master}
+ gateway: ${_param:reclass_config_master_gateway}
+ netmask: 255.255.255.0
ens4:
enabled: true
type: eth
diff --git a/classes/cluster/sl-os-ovs/infra/init.yml b/classes/cluster/sl-os-ovs/infra/init.yml
index 3722558..eeed3a6 100644
--- a/classes/cluster/sl-os-ovs/infra/init.yml
+++ b/classes/cluster/sl-os-ovs/infra/init.yml
@@ -6,6 +6,7 @@
cluster_name: sl-os-ovs
infra_config_hostname: cfg01
infra_config_deploy_address: 192.168.10.90
+ infra_config_gateway_address: 192.168.10.1
infra_config_address: 172.16.10.100
linux:
network:
diff --git a/classes/cluster/sl-pike-dvr/infra/config.yml b/classes/cluster/sl-pike-dvr/infra/config.yml
index c400ce8..6e5d423 100644
--- a/classes/cluster/sl-pike-dvr/infra/config.yml
+++ b/classes/cluster/sl-pike-dvr/infra/config.yml
@@ -37,6 +37,7 @@
salt_master_environment_revision: master
salt_api_password_hash: "$6$sGnRlxGf$al5jMCetLP.vfI/fTl3Z0N7Za1aeiexL487jAtyRABVfT3NlwZxQGVhO7S1N8OwS/34VHYwZQA8lkXwKMN/GS1"
reclass_config_master: 192.168.10.90
+ reclass_config_master_gateway: 192.168.10.1
single_address: 172.16.10.100
salt_master_host: 127.0.0.1
salt_master_base_environment: prd
@@ -44,6 +45,13 @@
linux:
network:
interface:
+ ens3:
+ enabled: true
+ type: eth
+ proto: static
+ address: ${_param:reclass_config_master}
+ gateway: ${_param:reclass_config_master_gateway}
+ netmask: 255.255.255.0
ens4:
enabled: true
type: eth
diff --git a/classes/cluster/virtual-mcp11-contrail/infra/config.yml b/classes/cluster/virtual-mcp11-contrail/infra/config.yml
index 580d993..d0d72ec 100755
--- a/classes/cluster/virtual-mcp11-contrail/infra/config.yml
+++ b/classes/cluster/virtual-mcp11-contrail/infra/config.yml
@@ -41,6 +41,7 @@
reclass_data_repository: "https://gerrit.mcp.mirantis.net/salt-models/mcp-virtual-lab"
reclass_data_revision: master
reclass_config_master: 192.168.10.90
+ reclass_config_master_gateway: 192.168.10.1
single_address: 172.16.10.90
salt_master_host: 127.0.0.1
salt_master_base_environment: prd
@@ -49,6 +50,13 @@
linux:
network:
interface:
+ ens3:
+ enabled: true
+ type: eth
+ proto: static
+ address: ${_param:reclass_config_master}
+ gateway: ${_param:reclass_config_master_gateway}
+ netmask: 255.255.255.0
ens4:
enabled: true
type: eth