diff options
Diffstat (limited to 'mcp/reclass/classes/cluster/baremetal-mcp-ocata-odl-ha/infra')
4 files changed, 102 insertions, 95 deletions
diff --git a/mcp/reclass/classes/cluster/baremetal-mcp-ocata-odl-ha/infra/config.yml b/mcp/reclass/classes/cluster/baremetal-mcp-ocata-odl-ha/infra/config.yml index 3f72e182f..4cf2a60a6 100644 --- a/mcp/reclass/classes/cluster/baremetal-mcp-ocata-odl-ha/infra/config.yml +++ b/mcp/reclass/classes/cluster/baremetal-mcp-ocata-odl-ha/infra/config.yml @@ -1,24 +1,25 @@ +--- classes: -- service.git.client -- system.linux.system.single -- system.linux.system.repo.mcp.salt -- system.linux.system.repo.saltstack.xenial -- system.salt.master.api -- system.salt.master.pkg -- system.salt.minion.ca.salt_master -- system.reclass.storage.salt -- system.reclass.storage.system.physical_control_cluster -- system.reclass.storage.system.openstack_control_cluster -- system.reclass.storage.system.openstack_proxy_cluster -- system.reclass.storage.system.openstack_database_cluster -- system.reclass.storage.system.openstack_message_queue_cluster -- system.reclass.storage.system.opendaylight_control_single -- system.reclass.storage.system.openstack_telemetry_cluster -# - system.reclass.storage.system.stacklight_log_cluster -# - system.reclass.storage.system.stacklight_monitor_cluster -# - system.reclass.storage.system.stacklight_telemetry_cluster -- system.reclass.storage.system.infra_maas_single -- cluster.baremetal-mcp-ocata-odl-ha.infra + - service.git.client + - system.linux.system.single + - system.linux.system.repo.mcp.salt + - system.linux.system.repo.saltstack.xenial + - system.salt.master.api + - system.salt.master.pkg + - system.salt.minion.ca.salt_master + - system.reclass.storage.salt + - system.reclass.storage.system.physical_control_cluster + - system.reclass.storage.system.openstack_control_cluster + - system.reclass.storage.system.openstack_proxy_cluster + - system.reclass.storage.system.openstack_database_cluster + - system.reclass.storage.system.openstack_message_queue_cluster + - system.reclass.storage.system.opendaylight_control_single + - system.reclass.storage.system.openstack_telemetry_cluster + # - system.reclass.storage.system.stacklight_log_cluster + # - system.reclass.storage.system.stacklight_monitor_cluster + # - system.reclass.storage.system.stacklight_telemetry_cluster + - system.reclass.storage.system.infra_maas_single + - cluster.baremetal-mcp-ocata-odl-ha.infra parameters: _param: salt_master_base_environment: prd @@ -29,6 +30,7 @@ parameters: single_address: ${_param:infra_config_address} deploy_address: ${_param:infra_config_deploy_address} salt_master_host: ${_param:infra_config_deploy_address} + # yamllint disable rule:line-length salt_api_password_hash: "$6$sGnRlxGf$al5jMCetLP.vfI/fTl3Z0N7Za1aeiexL487jAtyRABVfT3NlwZxQGVhO7S1N8OwS/34VHYwZQA8lkXwKMN/GS1" linux: network: @@ -80,16 +82,16 @@ parameters: openstack_proxy_node02: params: linux_system_codename: xenial -# stacklight_log_node01: -# classes: -# - system.elasticsearch.client.single -# stacklight_monitor_node01: -# classes: -# - system.grafana.client.single -# - system.kibana.client.single + # stacklight_log_node01: + # classes: + # - system.elasticsearch.client.single + # stacklight_monitor_node01: + # classes: + # - system.grafana.client.single + # - system.kibana.client.single openstack_control_node01: classes: - - cluster.${_param:cluster_name}.openstack.control_init + - cluster.${_param:cluster_name}.openstack.control_init params: linux_system_codename: xenial openstack_control_node02: @@ -100,7 +102,7 @@ parameters: linux_system_codename: xenial openstack_database_node01: classes: - - cluster.${_param:cluster_name}.openstack.database_init + - cluster.${_param:cluster_name}.openstack.database_init params: linux_system_codename: xenial openstack_database_node02: @@ -113,7 +115,7 @@ parameters: name: ${_param:openstack_compute_node01_hostname} domain: ${_param:cluster_domain} classes: - - cluster.${_param:cluster_name}.openstack.compute + - cluster.${_param:cluster_name}.openstack.compute params: salt_master_host: ${_param:reclass_config_master} linux_system_codename: xenial @@ -125,7 +127,7 @@ parameters: name: ${_param:openstack_compute_node02_hostname} domain: ${_param:cluster_domain} classes: - - cluster.${_param:cluster_name}.openstack.compute + - cluster.${_param:cluster_name}.openstack.compute params: salt_master_host: ${_param:reclass_config_master} linux_system_codename: xenial @@ -135,7 +137,7 @@ parameters: external_address: ${_param:openstack_compute_node02_external_address} opendaylight_control_node01: classes: - - cluster.${_param:cluster_name}.opendaylight.control + - cluster.${_param:cluster_name}.opendaylight.control params: linux_system_codename: xenial single_address: ${_param:opendaylight_server_node01_single_address} diff --git a/mcp/reclass/classes/cluster/baremetal-mcp-ocata-odl-ha/infra/init.yml b/mcp/reclass/classes/cluster/baremetal-mcp-ocata-odl-ha/infra/init.yml index 29b25216e..b1cd5d21c 100644 --- a/mcp/reclass/classes/cluster/baremetal-mcp-ocata-odl-ha/infra/init.yml +++ b/mcp/reclass/classes/cluster/baremetal-mcp-ocata-odl-ha/infra/init.yml @@ -1,16 +1,17 @@ +--- classes: -- system.linux.system.single -- cluster.all-mcp-ocata-common -- cluster.baremetal-mcp-ocata-odl-ha.openstack -# - cluster.baremetal-mcp-ocata-odl-ha.stacklight -# - cluster.baremetal-mcp-ocata-odl-ha.stacklight.client + - system.linux.system.single + - cluster.all-mcp-ocata-common + - cluster.baremetal-mcp-ocata-odl-ha.openstack + # - cluster.baremetal-mcp-ocata-odl-ha.stacklight + # - cluster.baremetal-mcp-ocata-odl-ha.stacklight.client parameters: _param: apt_mk_version: nightly mcp_repo_version: 1.1 cluster_name: baremetal-mcp-ocata-odl-ha cluster_domain: ${_param:cluster_name}.local -# stacklight_environment: ${_param:cluster_domain} + # stacklight_environment: ${_param:cluster_domain} reclass_data_revision: master cluster_public_host: ${_param:openstack_proxy_address} infra_config_hostname: cfg01 @@ -54,6 +55,7 @@ parameters: address: ${_param:single_address} netmask: 255.255.255.0 + # yamllint disable-line rule:line-length salt_api_password_hash: "$6$WV0P1shnoDh2gI/Z$22/Bcd7ffMv0jDlFpT63cAU4PiXHz9pjXwngToKwqAsgoeK4HNR3PiKaushjxp3JsQ8hNoJmAC6TxzVqfV8WH/" linux: system: @@ -67,30 +69,30 @@ parameters: cfg01: address: ${_param:infra_config_address} names: - - cfg01 - - cfg01.${_param:cluster_domain} + - cfg01 + - cfg01.${_param:cluster_domain} cfg: address: ${_param:infra_config_address} names: - - ${_param:infra_config_hostname} - - ${_param:infra_config_hostname}.${_param:cluster_domain} + - ${_param:infra_config_hostname} + - ${_param:infra_config_hostname}.${_param:cluster_domain} mas01: address: ${_param:infra_maas_node01_address} names: - - ${_param:infra_maas_node01_hostname} - - ${_param:infra_maas_node01_hostname}.${_param:cluster_domain} + - ${_param:infra_maas_node01_hostname} + - ${_param:infra_maas_node01_hostname}.${_param:cluster_domain} kvm01: address: ${_param:infra_kvm_node01_address} names: - - ${_param:infra_kvm_node01_hostname} - - ${_param:infra_kvm_node01_hostname}.${_param:cluster_domain} + - ${_param:infra_kvm_node01_hostname} + - ${_param:infra_kvm_node01_hostname}.${_param:cluster_domain} kvm02: address: ${_param:infra_kvm_node02_address} names: - - ${_param:infra_kvm_node02_hostname} - - ${_param:infra_kvm_node02_hostname}.${_param:cluster_domain} + - ${_param:infra_kvm_node02_hostname} + - ${_param:infra_kvm_node02_hostname}.${_param:cluster_domain} kvm03: address: ${_param:infra_kvm_node03_address} names: - - ${_param:infra_kvm_node03_hostname} - - ${_param:infra_kvm_node03_hostname}.${_param:cluster_domain} + - ${_param:infra_kvm_node03_hostname} + - ${_param:infra_kvm_node03_hostname}.${_param:cluster_domain} diff --git a/mcp/reclass/classes/cluster/baremetal-mcp-ocata-odl-ha/infra/kvm.yml b/mcp/reclass/classes/cluster/baremetal-mcp-ocata-odl-ha/infra/kvm.yml index e55bcbf25..99ac02e34 100644 --- a/mcp/reclass/classes/cluster/baremetal-mcp-ocata-odl-ha/infra/kvm.yml +++ b/mcp/reclass/classes/cluster/baremetal-mcp-ocata-odl-ha/infra/kvm.yml @@ -1,21 +1,22 @@ +--- classes: -- system.linux.system.repo.mcp.openstack -- system.linux.system.repo.mcp.extra -- system.linux.system.repo.saltstack.xenial -- service.keepalived.cluster.single -- system.glusterfs.server.volume.glance -- system.glusterfs.server.volume.keystone -- system.glusterfs.server.cluster -- system.salt.control.virt -- system.salt.control.cluster.openstack_control_cluster -- system.salt.control.cluster.openstack_proxy_cluster -- system.salt.control.cluster.openstack_database_cluster -- system.salt.control.cluster.openstack_message_queue_cluster -- system.salt.control.cluster.openstack_telemetry_cluster -# - system.salt.control.cluster.stacklight_server_cluster -# - system.salt.control.cluster.stacklight_log_cluster -# - system.salt.control.cluster.stacklight_telemetry_cluster -- cluster.baremetal-mcp-ocata-odl-ha.infra + - system.linux.system.repo.mcp.openstack + - system.linux.system.repo.mcp.extra + - system.linux.system.repo.saltstack.xenial + - service.keepalived.cluster.single + - system.glusterfs.server.volume.glance + - system.glusterfs.server.volume.keystone + - system.glusterfs.server.cluster + - system.salt.control.virt + - system.salt.control.cluster.openstack_control_cluster + - system.salt.control.cluster.openstack_proxy_cluster + - system.salt.control.cluster.openstack_database_cluster + - system.salt.control.cluster.openstack_message_queue_cluster + - system.salt.control.cluster.openstack_telemetry_cluster + # - system.salt.control.cluster.stacklight_server_cluster + # - system.salt.control.cluster.stacklight_log_cluster + # - system.salt.control.cluster.stacklight_telemetry_cluster + - cluster.baremetal-mcp-ocata-odl-ha.infra parameters: _param: linux_system_codename: xenial @@ -28,8 +29,8 @@ parameters: deploy_nic: enp6s0 salt: control: - size: #RAM 4096,8192,16384,32768,65536 - ##Default production sizing + size: # RAM 4096,8192,16384,32768,65536 + # Default production sizing openstack.control: cpu: 4 ram: 12288 @@ -55,21 +56,21 @@ parameters: ram: 2048 disk_profile: small net_profile: default -# stacklight.log: -# cpu: 2 -# ram: 4096 -# disk_profile: xxlarge -# net_profile: default -# stacklight.server: -# cpu: 2 -# ram: 4096 -# disk_profile: small -# net_profile: default -# stacklight.telemetry: -# cpu: 2 -# ram: 4096 -# disk_profile: xxlarge -# net_profile: default + # stacklight.log: + # cpu: 2 + # ram: 4096 + # disk_profile: xxlarge + # net_profile: default + # stacklight.server: + # cpu: 2 + # ram: 4096 + # disk_profile: small + # net_profile: default + # stacklight.telemetry: + # cpu: 2 + # ram: 4096 + # disk_profile: xxlarge + # net_profile: default opendaylight.server: cpu: 4 ram: 6144 @@ -80,6 +81,7 @@ parameters: node: odl01: name: ${_param:opendaylight_server_node01_hostname} + # yamllint disable-line rule:line-length provider: ${_param:infra_kvm_node03_hostname}.${_param:cluster_domain} image: ${_param:salt_control_xenial_image} size: opendaylight.server @@ -131,9 +133,9 @@ parameters: - ${_param:cluster_node02_address}:/srv/glusterfs/nova_instances - ${_param:cluster_node03_address}:/srv/glusterfs/nova_instances options: - cluster.readdir-optimize: On - nfs.disable: On - network.remote-dio: On + cluster.readdir-optimize: 'On' + nfs.disable: 'On' + network.remote-dio: 'On' diagnostics.client-log-level: WARNING diagnostics.brick-log-level: WARNING linux: @@ -152,10 +154,10 @@ parameters: proto: dhcp type: bridge name_servers: - - 8.8.8.8 - - 8.8.4.4 + - 8.8.8.8 + - 8.8.4.4 use_interfaces: - - ${_param:deploy_nic} + - ${_param:deploy_nic} noifupdown: true vlan300: enabled: true @@ -163,7 +165,7 @@ parameters: type: vlan name: ${_param:deploy_nic}.300 use_interfaces: - - ${_param:deploy_nic} + - ${_param:deploy_nic} br-ctl: enabled: true type: bridge @@ -171,4 +173,4 @@ parameters: address: ${_param:single_address} netmask: 255.255.255.0 use_interfaces: - - ${_param:deploy_nic}.300 + - ${_param:deploy_nic}.300 diff --git a/mcp/reclass/classes/cluster/baremetal-mcp-ocata-odl-ha/infra/maas.yml b/mcp/reclass/classes/cluster/baremetal-mcp-ocata-odl-ha/infra/maas.yml index 64ae85a38..2a2fedb86 100644 --- a/mcp/reclass/classes/cluster/baremetal-mcp-ocata-odl-ha/infra/maas.yml +++ b/mcp/reclass/classes/cluster/baremetal-mcp-ocata-odl-ha/infra/maas.yml @@ -1,7 +1,8 @@ +--- classes: -- system.linux.system.repo.saltstack.xenial -- system.maas.region.single -- cluster.baremetal-mcp-ocata-odl-ha.infra + - system.linux.system.repo.saltstack.xenial + - system.maas.region.single + - cluster.baremetal-mcp-ocata-odl-ha.infra parameters: _param: dhcp_interface: ens3 |