aboutsummaryrefslogtreecommitdiffstats
path: root/mcp/reclass/classes/cluster/virtual-mcp-ocata-odl-router
diff options
context:
space:
mode:
Diffstat (limited to 'mcp/reclass/classes/cluster/virtual-mcp-ocata-odl-router')
-rw-r--r--mcp/reclass/classes/cluster/virtual-mcp-ocata-odl-router/infra/config.yml58
-rw-r--r--mcp/reclass/classes/cluster/virtual-mcp-ocata-odl-router/infra/init.yml14
-rw-r--r--mcp/reclass/classes/cluster/virtual-mcp-ocata-odl-router/init.yml2
3 files changed, 2 insertions, 72 deletions
diff --git a/mcp/reclass/classes/cluster/virtual-mcp-ocata-odl-router/infra/config.yml b/mcp/reclass/classes/cluster/virtual-mcp-ocata-odl-router/infra/config.yml
index 39edab299..c66ba2a9c 100644
--- a/mcp/reclass/classes/cluster/virtual-mcp-ocata-odl-router/infra/config.yml
+++ b/mcp/reclass/classes/cluster/virtual-mcp-ocata-odl-router/infra/config.yml
@@ -1,70 +1,14 @@
classes:
-- service.git.client
-- system.linux.system.single
-- system.linux.system.repo.mcp.salt
-- system.salt.master.api
-- system.salt.master.pkg
-- system.reclass.storage.salt
-- system.salt.minion.ca.salt_master
-- system.salt.minion.cert.proxy
-- system.mysql.client.single
-- system.reclass.storage.system.openstack_compute_multi
-- system.reclass.storage.system.openstack_gateway_single
- system.reclass.storage.system.opendaylight_control_single
- cluster.virtual-mcp-ocata-common.infra.config
- cluster.virtual-mcp-ocata-odl-router
parameters:
- _param:
- openstack_control_node01_hostname: ctl01
- reclass_data_repository: local
- salt_master_environment_repository: "https://github.com/tcpcloud"
- salt_master_environment_revision: master
- reclass_config_master: 192.168.10.100
- single_address: 172.16.10.100
- salt_master_host: 127.0.0.1
- salt_master_base_environment: prd
- salt_minion_ca_host: ${linux:network:fqdn}
- salt_api_password_hash: "$6$sGnRlxGf$al5jMCetLP.vfI/fTl3Z0N7Za1aeiexL487jAtyRABVfT3NlwZxQGVhO7S1N8OwS/34VHYwZQA8lkXwKMN/GS1"
- linux:
- network:
- interface:
- ens4:
- enabled: true
- type: eth
- proto: static
- address: ${_param:single_address}
- netmask: 255.255.255.0
reclass:
storage:
- data_source:
- engine: local
node:
- openstack_control_node01:
- name: ${_param:openstack_control_node01_hostname}
- domain: ${_param:cluster_domain}
- classes:
- - cluster.${_param:cluster_name}.openstack.control
- params:
- linux_system_codename: xenial
- salt_master_host: ${_param:reclass_config_master}
- single_address: ${_param:openstack_control_node01_address}
- openstack_compute_node01:
- params:
- single_address: 172.16.10.105
- tenant_address: 10.1.0.105
- external_address: 10.16.0.105
- openstack_compute_node02:
- params:
- single_address: 172.16.10.106
- tenant_address: 10.1.0.106
- external_address: 10.16.0.106
- openstack_gateway_node01:
- params:
- tenant_address: 10.1.0.110
- external_address: 10.16.0.110
opendaylight_control_node01:
classes:
- cluster.${_param:cluster_name}.opendaylight.control
params:
linux_system_codename: xenial
- single_address: 172.16.10.111
+ single_address: ${_param:opendaylight_service_host}
diff --git a/mcp/reclass/classes/cluster/virtual-mcp-ocata-odl-router/infra/init.yml b/mcp/reclass/classes/cluster/virtual-mcp-ocata-odl-router/infra/init.yml
deleted file mode 100644
index 9140bd0bc..000000000
--- a/mcp/reclass/classes/cluster/virtual-mcp-ocata-odl-router/infra/init.yml
+++ /dev/null
@@ -1,14 +0,0 @@
-parameters:
- linux:
- network:
- host:
- cfg01:
- address: ${_param:infra_config_address}
- names:
- - cfg01
- - cfg01.${_param:cluster_domain}
- cfg:
- address: ${_param:infra_config_address}
- names:
- - cfg
- - cfg.${_param:cluster_domain}
diff --git a/mcp/reclass/classes/cluster/virtual-mcp-ocata-odl-router/init.yml b/mcp/reclass/classes/cluster/virtual-mcp-ocata-odl-router/init.yml
index 954a7a189..e0311de55 100644
--- a/mcp/reclass/classes/cluster/virtual-mcp-ocata-odl-router/init.yml
+++ b/mcp/reclass/classes/cluster/virtual-mcp-ocata-odl-router/init.yml
@@ -1,7 +1,7 @@
classes:
- system.linux.system.single
- cluster.virtual-mcp-ocata-common.init_options
-- cluster.virtual-mcp-ocata-odl-router.infra
+- cluster.virtual-mcp-ocata-common.infra
- cluster.virtual-mcp-ocata-odl-router.openstack
parameters: