diff options
Diffstat (limited to 'mcp/reclass/classes/cluster/baremetal-mcp-ocata-odl-ha')
17 files changed, 418 insertions, 402 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..33f2804e0 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,40 +1,43 @@ +--- 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 reclass_data_repository: local salt_master_environment_repository: "https://github.com/tcpcloud" salt_master_environment_revision: master - reclass_config_master: ${_param:infra_config_deploy_address} 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" + dhcp_nic: ${_param:opnfv_fn_vm_primary_interface} + single_nic: ${_param:opnfv_fn_vm_secondary_interface} linux: network: interface: - ens3: ${_param:linux_dhcp_interface} - ens4: ${_param:linux_single_interface} + dhcp: ${_param:linux_dhcp_interface} + single: ${_param:linux_single_interface} salt: master: accept_policy: open_mode @@ -80,16 +83,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 +103,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 +116,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 +128,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 +138,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..4f8f87a2b 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,34 +1,36 @@ +--- 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 + salt_version: 2016.11 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 infra_maas_database_password: opnfv_secret # infra service addresses - infra_config_address: 10.167.4.100 - infra_config_deploy_address: 10.20.0.2 - infra_maas_node01_address: 10.167.4.3 + infra_config_address: ${_param:opnfv_infra_config_address} + infra_config_deploy_address: ${_param:reclass_config_master} + infra_maas_node01_address: ${_param:opnfv_infra_maas_node01_address} infra_maas_node01_deploy_address: ${_param:opnfv_maas_pxe_address} - infra_compute_node01_address: 10.167.4.141 - infra_compute_node02_address: 10.167.4.142 - infra_compute_node03_address: 10.167.4.143 + infra_compute_node01_address: ${_param:opnfv_infra_compute_node01_address} + infra_compute_node02_address: ${_param:opnfv_infra_compute_node02_address} + infra_compute_node03_address: ${_param:opnfv_infra_compute_node03_address} - infra_kvm_address: 10.167.4.140 - infra_kvm_node01_address: 10.167.4.141 - infra_kvm_node02_address: 10.167.4.142 - infra_kvm_node03_address: 10.167.4.143 + infra_kvm_address: ${_param:opnfv_infra_kvm_address} + infra_kvm_node01_address: ${_param:opnfv_infra_kvm_node01_address} + infra_kvm_node02_address: ${_param:opnfv_infra_kvm_node02_address} + infra_kvm_node03_address: ${_param:opnfv_infra_kvm_node03_address} infra_maas_node01_hostname: mas01 infra_kvm_node01_hostname: kvm01 @@ -43,17 +45,22 @@ parameters: storage: node: name: default + dhcp_nic: ${_param:opnfv_vcp_vm_primary_interface} + single_nic: ${_param:opnfv_vcp_vm_secondary_interface} linux_dhcp_interface: enabled: true type: eth proto: dhcp + name: ${_param:dhcp_nic} linux_single_interface: enabled: true type: eth proto: static + name: ${_param:single_nic} 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 +74,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..c9b3bc1e0 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,21 @@ +--- 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 + - 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 @@ -25,11 +25,11 @@ parameters: cluster_node03_address: ${_param:infra_kvm_node03_address} keepalived_vip_interface: br-ctl keepalived_vip_virtual_router_id: 69 - deploy_nic: enp6s0 + deploy_nic: ${_param:opnfv_baremetal_primary_nic} 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 +55,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 +80,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,15 +132,15 @@ 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: network: interface: - eth3: + deploy: enabled: true type: eth proto: manual @@ -151,19 +152,17 @@ parameters: enabled: true proto: dhcp type: bridge - name_servers: - - 8.8.8.8 - - 8.8.4.4 + name_servers: ${_param:opnfv_name_servers} use_interfaces: - - ${_param:deploy_nic} + - ${_param:deploy_nic} noifupdown: true - vlan300: + mgmt-vlan: enabled: true proto: manual type: vlan - name: ${_param:deploy_nic}.300 + name: ${_param:deploy_nic}.${_param:opnfv_net_mgmt_vlan} use_interfaces: - - ${_param:deploy_nic} + - ${_param:deploy_nic} br-ctl: enabled: true type: bridge @@ -171,4 +170,4 @@ parameters: address: ${_param:single_address} netmask: 255.255.255.0 use_interfaces: - - ${_param:deploy_nic}.300 + - ${_param:deploy_nic}.${_param:opnfv_net_mgmt_vlan} 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..260da225d 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,12 +1,13 @@ +--- classes: -- system.linux.system.repo.saltstack.xenial -- system.maas.region.single -- cluster.baremetal-mcp-ocata-odl-ha.infra + - system.maas.region.single + - service.maas.cluster.single + - cluster.baremetal-mcp-ocata-odl-ha.infra parameters: _param: - dhcp_interface: ens3 - primary_interface: ens4 - pxe_interface: ens5 + dhcp_interface: ${_param:opnfv_fn_vm_primary_interface} + primary_interface: ${_param:opnfv_fn_vm_secondary_interface} + pxe_interface: ${_param:opnfv_fn_vm_tertiary_interface} interface_mtu: 1500 # MaaS has issues using MTU > 1500 for PXE interface pxe_interface_mtu: 1500 @@ -14,7 +15,7 @@ parameters: maas_admin_username: opnfv maas_admin_password: opnfv_secret maas_db_password: opnfv_secret - dns_server01: 8.8.4.4 + dns_server01: ${_param:opnfv_dns_server01} single_address: ${_param:infra_maas_node01_deploy_address} maas: region: @@ -32,12 +33,12 @@ parameters: default_min_hwe_kernel: 'hwe-16.04' subnets: opnfv_maas_pxe: - name: ${_param:opnfv_maas_pxe_network}/24 - cidr: ${_param:opnfv_maas_pxe_network}/24 + name: ${_param:opnfv_maas_pxe_network_address}/24 + cidr: ${_param:opnfv_maas_pxe_network_address}/24 gateway_ip: ${_param:single_address} iprange: - start: ${_param:opnfv_maas_pxe_iprange_start} - end: ${_param:opnfv_maas_pxe_iprange_end} + start: ${_param:opnfv_maas_pxe_start_address} + end: ${_param:opnfv_maas_pxe_end_address} type: dynamic vlans: untagged: @@ -47,57 +48,57 @@ parameters: machines: kvm01: interface: - mac: "00:25:b5:a0:00:2a" + mac: ${_param:opnfv_maas_node01_interface_mac} power_parameters: - power_address: "172.30.8.75" - power_password: "octopus" - power_type: ipmi - power_user: "admin" - architecture: 'amd64/generic' + power_address: ${_param:opnfv_maas_node01_power_address} + power_password: ${_param:opnfv_maas_node01_power_password} + power_type: ${_param:opnfv_maas_node01_power_type} + power_user: ${_param:opnfv_maas_node01_power_user} + architecture: ${_param:opnfv_maas_node01_architecture} distro_series: xenial hwe_kernel: hwe-16.04 kvm02: interface: - mac: "00:25:b5:a0:00:3a" + mac: ${_param:opnfv_maas_node02_interface_mac} power_parameters: - power_address: "172.30.8.65" - power_password: "octopus" - power_type: ipmi - power_user: "admin" - architecture: 'amd64/generic' + power_address: ${_param:opnfv_maas_node02_power_address} + power_password: ${_param:opnfv_maas_node02_power_password} + power_type: ${_param:opnfv_maas_node02_power_type} + power_user: ${_param:opnfv_maas_node02_power_user} + architecture: ${_param:opnfv_maas_node02_architecture} distro_series: xenial hwe_kernel: hwe-16.04 kvm03: interface: - mac: "00:25:b5:a0:00:4a" + mac: ${_param:opnfv_maas_node03_interface_mac} power_parameters: - power_address: "172.30.8.74" - power_password: "octopus" - power_type: ipmi - power_user: "admin" - architecture: 'amd64/generic' + power_address: ${_param:opnfv_maas_node03_power_address} + power_password: ${_param:opnfv_maas_node03_power_password} + power_type: ${_param:opnfv_maas_node03_power_type} + power_user: ${_param:opnfv_maas_node03_power_user} + architecture: ${_param:opnfv_maas_node03_architecture} distro_series: xenial hwe_kernel: hwe-16.04 cmp001: interface: - mac: "00:25:b5:a0:00:5a" + mac: ${_param:opnfv_maas_node04_interface_mac} power_parameters: - power_address: "172.30.8.73" - power_password: "octopus" - power_type: ipmi - power_user: "admin" - architecture: 'amd64/generic' + power_address: ${_param:opnfv_maas_node04_power_address} + power_password: ${_param:opnfv_maas_node04_power_password} + power_type: ${_param:opnfv_maas_node04_power_type} + power_user: ${_param:opnfv_maas_node04_power_user} + architecture: ${_param:opnfv_maas_node04_architecture} distro_series: xenial hwe_kernel: hwe-16.04 cmp002: interface: - mac: "00:25:b5:a0:00:6a" + mac: ${_param:opnfv_maas_node05_interface_mac} power_parameters: - power_address: "172.30.8.72" - power_password: "octopus" - power_type: ipmi - power_user: "admin" - architecture: 'amd64/generic' + power_address: ${_param:opnfv_maas_node05_power_address} + power_password: ${_param:opnfv_maas_node05_power_password} + power_type: ${_param:opnfv_maas_node05_power_type} + power_user: ${_param:opnfv_maas_node05_power_user} + architecture: ${_param:opnfv_maas_node05_architecture} distro_series: xenial hwe_kernel: hwe-16.04 linux: diff --git a/mcp/reclass/classes/cluster/baremetal-mcp-ocata-odl-ha/init.yml b/mcp/reclass/classes/cluster/baremetal-mcp-ocata-odl-ha/init.yml index b2c795fdd..2c347131d 100644 --- a/mcp/reclass/classes/cluster/baremetal-mcp-ocata-odl-ha/init.yml +++ b/mcp/reclass/classes/cluster/baremetal-mcp-ocata-odl-ha/init.yml @@ -1,4 +1,5 @@ +--- classes: -- cluster.all-mcp-ocata-common -- cluster.baremetal-mcp-ocata-odl-ha.infra -- cluster.baremetal-mcp-ocata-odl-ha.openstack + - cluster.all-mcp-ocata-common + - cluster.baremetal-mcp-ocata-odl-ha.infra + - cluster.baremetal-mcp-ocata-odl-ha.openstack diff --git a/mcp/reclass/classes/cluster/baremetal-mcp-ocata-odl-ha/opendaylight/control.yml b/mcp/reclass/classes/cluster/baremetal-mcp-ocata-odl-ha/opendaylight/control.yml index 0a01af746..b68eb3db5 100644 --- a/mcp/reclass/classes/cluster/baremetal-mcp-ocata-odl-ha/opendaylight/control.yml +++ b/mcp/reclass/classes/cluster/baremetal-mcp-ocata-odl-ha/opendaylight/control.yml @@ -1,21 +1,16 @@ +--- classes: -- system.linux.system.repo.mcp.openstack -- system.linux.system.repo.mcp.extra -- system.linux.system.repo.saltstack.xenial -- system.opendaylight.server.single -- cluster.baremetal-mcp-ocata-odl-ha + - system.linux.system.repo.mcp.openstack + - system.linux.system.repo.mcp.extra + - system.opendaylight.server.single + - cluster.baremetal-mcp-ocata-odl-ha parameters: _param: linux_system_codename: xenial linux: network: interface: - ens3: - enabled: true - type: eth - proto: static - address: ${_param:single_address} - netmask: 255.255.255.0 + single: ${_param:linux_single_interface} opendaylight: server: odl_bind_ip: ${_param:single_address} @@ -28,5 +23,6 @@ parameters: - odl-restconf-all - odl-aaa-authn - odl-dlux-all + - odl-mdsal-apidocs netvirt: - odl-netvirt-openstack diff --git a/mcp/reclass/classes/cluster/baremetal-mcp-ocata-odl-ha/openstack/benchmark.yml b/mcp/reclass/classes/cluster/baremetal-mcp-ocata-odl-ha/openstack/benchmark.yml index b7f9f3fe7..758fa3ffc 100644 --- a/mcp/reclass/classes/cluster/baremetal-mcp-ocata-odl-ha/openstack/benchmark.yml +++ b/mcp/reclass/classes/cluster/baremetal-mcp-ocata-odl-ha/openstack/benchmark.yml @@ -1,8 +1,12 @@ +--- classes: -- cluster.baremetal-mcp-ocata-odl-ha + - cluster.baremetal-mcp-ocata-odl-ha parameters: + _param: + dhcp_nic: eth0 + single_nic: eth1 linux: network: interface: - eth0: ${_param:linux_dhcp_interface} - eth1: ${_param:linux_single_interface} + dhcp: ${_param:linux_dhcp_interface} + single: ${_param:linux_single_interface} diff --git a/mcp/reclass/classes/cluster/baremetal-mcp-ocata-odl-ha/openstack/compute.yml b/mcp/reclass/classes/cluster/baremetal-mcp-ocata-odl-ha/openstack/compute.yml index d2495c26a..032dd8452 100644 --- a/mcp/reclass/classes/cluster/baremetal-mcp-ocata-odl-ha/openstack/compute.yml +++ b/mcp/reclass/classes/cluster/baremetal-mcp-ocata-odl-ha/openstack/compute.yml @@ -1,18 +1,18 @@ +--- classes: -- system.linux.system.repo.mcp.openstack -- system.linux.system.repo.mcp.extra -- system.linux.system.repo.saltstack.xenial -- system.linux.storage.loopback -- system.glusterfs.client.cluster -- system.nova.compute.cluster -- system.nova.compute.nfv.hugepages -- system.nova.compute.nfv.cpu_pinning -- system.neutron.gateway.opendaylight.single -- system.neutron.gateway.cluster -- system.cinder.volume.single -- system.cinder.volume.backend.lvm -- system.ceilometer.agent.cluster -- cluster.baremetal-mcp-ocata-odl-ha.infra + - system.linux.system.repo.mcp.openstack + - system.linux.system.repo.mcp.extra + - system.linux.storage.loopback + - system.glusterfs.client.cluster + - system.nova.compute.cluster + - system.nova.compute.nfv.hugepages + - system.nova.compute.nfv.cpu_pinning + - system.neutron.gateway.opendaylight.single + - system.neutron.gateway.cluster + - system.cinder.volume.single + - system.cinder.volume.backend.lvm + - system.ceilometer.agent.cluster + - cluster.baremetal-mcp-ocata-odl-ha.infra parameters: _param: cluster_vip_address: ${_param:openstack_control_address} @@ -24,17 +24,17 @@ parameters: cluster_node03_hostname: ctl03 cluster_node03_address: ${_param:openstack_control_node03_address} nova_vncproxy_url: https://${_param:cluster_public_host}:6080 - mgmt_nic: enp6s0 - tenant_nic: enp7s0 - linux_system_codename: xenial - external_nic: enp8s0 + mgmt_nic: ${_param:opnfv_baremetal_primary_nic} + tenant_nic: ${_param:opnfv_baremetal_secondary_nic} + external_nic: ${_param:opnfv_baremetal_tertiary_nic} interface_mtu: 1500 keepalived_vip_interface: br-ctl keepalived_vip_virtual_router_id: 69 loopback_device_size: 20 + linux_system_codename: xenial neutron_agents: - - neutron-dhcp-agent - - neutron-metadata-agent + - neutron-dhcp-agent + - neutron-metadata-agent opendaylight: client: ovsdb_server_iface: ptcp:6639:127.0.0.1 @@ -56,6 +56,7 @@ parameters: server: ${_param:glusterfs_service_host} user: nova group: nova + # yamllint disable-line rule:line-length opts: "defaults,backup-volfile-servers=${_param:cluster_node01_address}:${_param:cluster_node02_address}:${_param:cluster_node03_address}" linux: system: @@ -89,21 +90,21 @@ parameters: netmask: 255.255.255.0 mtu: 1500 use_interfaces: - - ${_param:tenant_nic}.302 - vlan300: + - ${_param:tenant_nic}.${_param:opnfv_net_tenant_vlan} + mgmt-vlan: enabled: true proto: manual type: vlan - name: ${_param:mgmt_nic}.300 + name: ${_param:mgmt_nic}.${_param:opnfv_net_mgmt_vlan} use_interfaces: - - ${_param:mgmt_nic} - vlan302: + - ${_param:mgmt_nic} + tenant-vlan: enabled: true proto: manual type: vlan - name: ${_param:tenant_nic}.302 + name: ${_param:tenant_nic}.${_param:opnfv_net_tenant_vlan} use_interfaces: - - ${_param:tenant_nic} + - ${_param:tenant_nic} br-ctl: enabled: true type: bridge @@ -111,7 +112,7 @@ parameters: address: ${_param:single_address} netmask: 255.255.255.0 use_interfaces: - - ${_param:mgmt_nic}.300 + - ${_param:mgmt_nic}.${_param:opnfv_net_mgmt_vlan} br-floating: enabled: true type: ovs_bridge @@ -128,7 +129,6 @@ parameters: address: ${_param:external_address} netmask: 255.255.255.0 use_interfaces: - - ${_param:external_nic} + - ${_param:external_nic} use_ovs_ports: - - float-to-ex - + - float-to-ex diff --git a/mcp/reclass/classes/cluster/baremetal-mcp-ocata-odl-ha/openstack/control.yml b/mcp/reclass/classes/cluster/baremetal-mcp-ocata-odl-ha/openstack/control.yml index b46e23da7..9da1f03da 100644 --- a/mcp/reclass/classes/cluster/baremetal-mcp-ocata-odl-ha/openstack/control.yml +++ b/mcp/reclass/classes/cluster/baremetal-mcp-ocata-odl-ha/openstack/control.yml @@ -1,29 +1,29 @@ +--- classes: -- system.linux.system.repo.mcp.openstack -- system.linux.system.repo.mcp.extra -- system.linux.system.repo.saltstack.xenial -- system.ceilometer.client -- system.memcached.server.single -- system.keystone.server.cluster -- system.keystone.server.wsgi -- system.glance.control.cluster -- system.neutron.control.opendaylight.cluster -- system.nova.control.cluster -- system.cinder.control.cluster -- system.cinder.control.backend.lvm -- system.heat.server.cluster -- system.designate.server.cluster -- system.designate.server.backend.bind -- system.bind.server.single -- system.haproxy.proxy.listen.openstack.nova-placement -- system.haproxy.proxy.listen.openstack.glare -- system.glusterfs.client.cluster -- system.glusterfs.client.volume.glance -- system.glusterfs.client.volume.keystone -- cluster.baremetal-mcp-ocata-odl-ha.infra + - system.linux.system.repo.mcp.openstack + - system.linux.system.repo.mcp.extra + - system.ceilometer.client + - system.memcached.server.single + - system.keystone.server.cluster + - system.keystone.server.wsgi + - system.glance.control.cluster + - system.neutron.control.opendaylight.cluster + - system.nova.control.cluster + - system.cinder.control.cluster + - system.cinder.control.backend.lvm + - system.heat.server.cluster + - system.designate.server.cluster + - system.designate.server.backend.bind + - system.bind.server.single + - system.haproxy.proxy.listen.openstack.nova-placement + - system.haproxy.proxy.listen.openstack.glare + - system.glusterfs.client.cluster + - system.glusterfs.client.volume.glance + - system.glusterfs.client.volume.keystone + - cluster.baremetal-mcp-ocata-odl-ha.infra parameters: _param: - keepalived_vip_interface: ens3 + keepalived_vip_interface: ${_param:single_nic} keepalived_vip_virtual_router_id: 50 cluster_vip_address: ${_param:openstack_control_address} cluster_local_address: ${_param:single_address} @@ -37,8 +37,8 @@ parameters: linux: network: interface: - ens2: ${_param:linux_dhcp_interface} - ens3: ${_param:linux_single_interface} + dhcp: ${_param:linux_dhcp_interface} + single: ${_param:linux_single_interface} keystone: server: cacert: /etc/ssl/certs/mcp_os_cacert diff --git a/mcp/reclass/classes/cluster/baremetal-mcp-ocata-odl-ha/openstack/control_init.yml b/mcp/reclass/classes/cluster/baremetal-mcp-ocata-odl-ha/openstack/control_init.yml index e759c0c8d..79c387940 100644 --- a/mcp/reclass/classes/cluster/baremetal-mcp-ocata-odl-ha/openstack/control_init.yml +++ b/mcp/reclass/classes/cluster/baremetal-mcp-ocata-odl-ha/openstack/control_init.yml @@ -1,9 +1,10 @@ +--- classes: -- system.keystone.client.single -- system.keystone.client.service.aodh -- system.keystone.client.service.ceilometer -- system.keystone.client.service.nova21 -- system.keystone.client.service.nova-placement -- system.keystone.client.service.glare -- system.keystone.client.service.cinder3 -- system.keystone.client.service.designate + - system.keystone.client.single + - system.keystone.client.service.aodh + - system.keystone.client.service.ceilometer + - system.keystone.client.service.nova21 + - system.keystone.client.service.nova-placement + - system.keystone.client.service.glare + - system.keystone.client.service.cinder3 + - system.keystone.client.service.designate diff --git a/mcp/reclass/classes/cluster/baremetal-mcp-ocata-odl-ha/openstack/dashboard.yml b/mcp/reclass/classes/cluster/baremetal-mcp-ocata-odl-ha/openstack/dashboard.yml index 9748c4cd4..e70aab514 100644 --- a/mcp/reclass/classes/cluster/baremetal-mcp-ocata-odl-ha/openstack/dashboard.yml +++ b/mcp/reclass/classes/cluster/baremetal-mcp-ocata-odl-ha/openstack/dashboard.yml @@ -1,11 +1,12 @@ +--- classes: -- system.horizon.server.single -- cluster.baremetal-mcp-ocata-odl-ha + - system.horizon.server.single + - cluster.baremetal-mcp-ocata-odl-ha parameters: _param: horizon_site_branding: OpenStack Dashboard linux: network: interface: - ens2: ${_param:linux_dhcp_interface} - ens3: ${_param:linux_single_interface} + dhcp: ${_param:linux_dhcp_interface} + single: ${_param:linux_single_interface} diff --git a/mcp/reclass/classes/cluster/baremetal-mcp-ocata-odl-ha/openstack/database.yml b/mcp/reclass/classes/cluster/baremetal-mcp-ocata-odl-ha/openstack/database.yml index e61a4699f..fc783d1b4 100644 --- a/mcp/reclass/classes/cluster/baremetal-mcp-ocata-odl-ha/openstack/database.yml +++ b/mcp/reclass/classes/cluster/baremetal-mcp-ocata-odl-ha/openstack/database.yml @@ -1,22 +1,22 @@ +--- classes: -- system.linux.system.repo.mcp.openstack -- system.linux.system.repo.mcp.extra -- system.linux.system.repo.saltstack.xenial -- system.galera.server.cluster -- system.galera.server.database.aodh -- system.galera.server.database.ceilometer -- system.galera.server.database.cinder -- system.galera.server.database.designate -- system.galera.server.database.glance -- system.galera.server.database.grafana -- system.galera.server.database.heat -- system.galera.server.database.keystone -- system.galera.server.database.nova -- system.galera.server.database.neutron -- cluster.baremetal-mcp-ocata-odl-ha + - system.linux.system.repo.mcp.openstack + - system.linux.system.repo.mcp.extra + - system.galera.server.cluster + - system.galera.server.database.aodh + - system.galera.server.database.ceilometer + - system.galera.server.database.cinder + - system.galera.server.database.designate + - system.galera.server.database.glance + - system.galera.server.database.grafana + - system.galera.server.database.heat + - system.galera.server.database.keystone + - system.galera.server.database.nova + - system.galera.server.database.neutron + - cluster.baremetal-mcp-ocata-odl-ha parameters: _param: - keepalived_vip_interface: ens3 + keepalived_vip_interface: ${_param:single_nic} keepalived_vip_virtual_router_id: 80 galera_server_cluster_name: openstack_cluster galera_max_connections: 3072 @@ -32,5 +32,5 @@ parameters: linux: network: interface: - ens2: ${_param:linux_dhcp_interface} - ens3: ${_param:linux_single_interface} + dhcp: ${_param:linux_dhcp_interface} + single: ${_param:linux_single_interface} diff --git a/mcp/reclass/classes/cluster/baremetal-mcp-ocata-odl-ha/openstack/database_init.yml b/mcp/reclass/classes/cluster/baremetal-mcp-ocata-odl-ha/openstack/database_init.yml index b16f05593..5dcb9c9e1 100644 --- a/mcp/reclass/classes/cluster/baremetal-mcp-ocata-odl-ha/openstack/database_init.yml +++ b/mcp/reclass/classes/cluster/baremetal-mcp-ocata-odl-ha/openstack/database_init.yml @@ -1,2 +1,3 @@ +--- classes: -- system.mysql.client.single + - system.mysql.client.single diff --git a/mcp/reclass/classes/cluster/baremetal-mcp-ocata-odl-ha/openstack/init.yml b/mcp/reclass/classes/cluster/baremetal-mcp-ocata-odl-ha/openstack/init.yml index e49a2052d..c7df472d3 100644 --- a/mcp/reclass/classes/cluster/baremetal-mcp-ocata-odl-ha/openstack/init.yml +++ b/mcp/reclass/classes/cluster/baremetal-mcp-ocata-odl-ha/openstack/init.yml @@ -1,34 +1,36 @@ +--- +# yamllint disable rule:line-length parameters: _param: openstack_version: ocata - openstack_gateway_node01_address: 10.167.4.124 - openstack_gateway_node02_address: 10.167.4.125 - openstack_gateway_node03_address: 10.167.4.126 - openstack_gateway_node01_tenant_address: 10.1.0.6 - openstack_gateway_node02_tenant_address: 10.1.0.7 - openstack_gateway_node03_tenant_address: 10.1.0.9 + openstack_gateway_node01_address: ${_param:opnfv_openstack_gateway_node01_address} + openstack_gateway_node02_address: ${_param:opnfv_openstack_gateway_node02_address} + openstack_gateway_node03_address: ${_param:opnfv_openstack_gateway_node03_address} + openstack_gateway_node01_tenant_address: ${_param:opnfv_openstack_gateway_node01_tenant_address} + openstack_gateway_node02_tenant_address: ${_param:opnfv_openstack_gateway_node02_tenant_address} + openstack_gateway_node03_tenant_address: ${_param:opnfv_openstack_gateway_node03_tenant_address} openstack_gateway_node01_hostname: gtw01 openstack_gateway_node02_hostname: gtw02 openstack_gateway_node03_hostname: gtw03 # openstack service addresses - openstack_proxy_address: 10.167.4.80 - openstack_proxy_node01_address: 10.167.4.81 - openstack_proxy_node02_address: 10.167.4.82 - openstack_control_address: 10.167.4.10 - openstack_control_node01_address: 10.167.4.11 - openstack_control_node02_address: 10.167.4.12 - openstack_control_node03_address: 10.167.4.13 - openstack_database_address: 10.167.4.50 - openstack_database_node01_address: 10.167.4.51 - openstack_database_node02_address: 10.167.4.52 - openstack_database_node03_address: 10.167.4.53 - openstack_message_queue_address: 10.167.4.40 - openstack_message_queue_node01_address: 10.167.4.41 - openstack_message_queue_node02_address: 10.167.4.42 - openstack_message_queue_node03_address: 10.167.4.43 + openstack_proxy_address: ${_param:opnfv_openstack_proxy_address} + openstack_proxy_node01_address: ${_param:opnfv_openstack_proxy_node01_address} + openstack_proxy_node02_address: ${_param:opnfv_openstack_proxy_node02_address} + openstack_control_address: ${_param:opnfv_openstack_control_address} + openstack_control_node01_address: ${_param:opnfv_openstack_control_node01_address} + openstack_control_node02_address: ${_param:opnfv_openstack_control_node02_address} + openstack_control_node03_address: ${_param:opnfv_openstack_control_node03_address} + openstack_database_address: ${_param:opnfv_openstack_database_address} + openstack_database_node01_address: ${_param:opnfv_openstack_database_node01_address} + openstack_database_node02_address: ${_param:opnfv_openstack_database_node02_address} + openstack_database_node03_address: ${_param:opnfv_openstack_database_node03_address} + openstack_message_queue_address: ${_param:opnfv_openstack_message_queue_address} + openstack_message_queue_node01_address: ${_param:opnfv_openstack_message_queue_node01_address} + openstack_message_queue_node02_address: ${_param:opnfv_openstack_message_queue_node02_address} + openstack_message_queue_node03_address: ${_param:opnfv_openstack_message_queue_node03_address} openstack_telemetry_hostname: mdb @@ -36,26 +38,26 @@ parameters: openstack_telemetry_node02_hostname: mdb02 openstack_telemetry_node03_hostname: mdb03 - openstack_telemetry_address: 10.167.4.75 - openstack_telemetry_node01_address: 10.167.4.76 - openstack_telemetry_node02_address: 10.167.4.77 - openstack_telemetry_node03_address: 10.167.4.78 + openstack_telemetry_address: ${_param:opnfv_openstack_telemetry_address} + openstack_telemetry_node01_address: ${_param:opnfv_openstack_telemetry_node01_address} + openstack_telemetry_node02_address: ${_param:opnfv_openstack_telemetry_node02_address} + openstack_telemetry_node03_address: ${_param:opnfv_openstack_telemetry_node03_address} # OpenStack Compute - openstack_compute_node01_single_address: 10.167.4.101 - openstack_compute_node02_single_address: 10.167.4.102 - openstack_compute_node03_single_address: 10.167.4.103 - openstack_compute_node01_control_address: 10.167.4.101 - openstack_compute_node02_control_address: 10.167.4.102 - openstack_compute_node03_control_address: 10.167.4.103 - openstack_compute_node01_tenant_address: 10.1.0.101 - openstack_compute_node02_tenant_address: 10.1.0.102 - openstack_compute_node03_tenant_address: 10.1.0.103 - openstack_compute_node01_external_address: 172.30.10.2 - openstack_compute_node02_external_address: 172.30.10.3 + openstack_compute_node01_single_address: ${_param:opnfv_openstack_compute_node01_single_address} + openstack_compute_node02_single_address: ${_param:opnfv_openstack_compute_node02_single_address} + openstack_compute_node03_single_address: ${_param:opnfv_openstack_compute_node03_single_address} + openstack_compute_node01_control_address: ${_param:opnfv_openstack_compute_node01_control_address} + openstack_compute_node02_control_address: ${_param:opnfv_openstack_compute_node02_control_address} + openstack_compute_node03_control_address: ${_param:opnfv_openstack_compute_node03_control_address} + openstack_compute_node01_tenant_address: ${_param:opnfv_openstack_compute_node01_tenant_address} + openstack_compute_node02_tenant_address: ${_param:opnfv_openstack_compute_node02_tenant_address} + openstack_compute_node03_tenant_address: ${_param:opnfv_openstack_compute_node03_tenant_address} + openstack_compute_node01_external_address: ${_param:opnfv_openstack_compute_node01_external_address} + openstack_compute_node02_external_address: ${_param:opnfv_openstack_compute_node02_external_address} # opendaylight options - opendaylight_server_node01_single_address: 10.167.4.111 + opendaylight_server_node01_single_address: ${_param:opnfv_opendaylight_server_node01_single_address} opendaylight_service_host: ${_param:opendaylight_server_node01_single_address} opendaylight_server_node01_hostname: odl01 opendaylight_router: odl-router_v2 @@ -83,17 +85,17 @@ parameters: openstack_region: RegionOne admin_email: root@localhost - ##Neutron osv/nodvr - neutron_control_dvr: False + # Neutron osv/nodvr + neutron_control_dvr: 'False' neutron_tenant_network_types: "flat,vxlan" - neutron_l3_ha: True + neutron_l3_ha: 'True' neutron_global_physnet_mtu: 1500 neutron_external_mtu: 1500 - neutron_gateway_dvr: False + neutron_gateway_dvr: 'False' neutron_gateway_agent_mode: legacy - neutron_compute_dvr: False + neutron_compute_dvr: 'False' neutron_compute_agent_mode: legacy - neutron_compute_external_access: True + neutron_compute_external_access: 'True' galera_server_cluster_name: openstack_cluster galera_server_maintenance_password: opnfv_secret galera_server_admin_password: opnfv_secret @@ -188,14 +190,14 @@ parameters: rndc_key_file: /etc/designate/rndc.key designate_version: ${_param:openstack_version} # Billing - #keystone_billometer_password: opnfv_secret - #keystone_billometer_address: ${_param:billometer_service_host} - #billometer_service_host: ${_param:openstack_billing_address} - #billometer_version: ${_param:openstack_version} - #billometer_secret_key: opnfv_secretpasswordpasswordpassword - #billometer_identity_password: ${_param:keystone_billometer_password} - #billometer_identity_host: ${_param:openstack_control_address} - #billometer_identity_token: ${_param:keystone_service_token} + # keystone_billometer_password: opnfv_secret + # keystone_billometer_address: ${_param:billometer_service_host} + # billometer_service_host: ${_param:openstack_billing_address} + # billometer_version: ${_param:openstack_version} + # billometer_secret_key: opnfv_secretpasswordpasswordpassword + # billometer_identity_password: ${_param:keystone_billometer_password} + # billometer_identity_host: ${_param:openstack_control_address} + # billometer_identity_token: ${_param:keystone_service_token} linux: system: repo: @@ -214,120 +216,120 @@ parameters: prx: address: ${_param:openstack_proxy_address} names: - - ${_param:openstack_proxy_hostname} - - ${_param:openstack_proxy_hostname}.${_param:cluster_domain} + - ${_param:openstack_proxy_hostname} + - ${_param:openstack_proxy_hostname}.${_param:cluster_domain} prx01: address: ${_param:openstack_proxy_node01_address} names: - - ${_param:openstack_proxy_node01_hostname} - - ${_param:openstack_proxy_node01_hostname}.${_param:cluster_domain} + - ${_param:openstack_proxy_node01_hostname} + - ${_param:openstack_proxy_node01_hostname}.${_param:cluster_domain} prx02: address: ${_param:openstack_proxy_node02_address} names: - - ${_param:openstack_proxy_node02_hostname} - - ${_param:openstack_proxy_node02_hostname}.${_param:cluster_domain} + - ${_param:openstack_proxy_node02_hostname} + - ${_param:openstack_proxy_node02_hostname}.${_param:cluster_domain} ctl: address: ${_param:openstack_control_address} names: - - ${_param:openstack_control_hostname} - - ${_param:openstack_control_hostname}.${_param:cluster_domain} + - ${_param:openstack_control_hostname} + - ${_param:openstack_control_hostname}.${_param:cluster_domain} ctl01: address: ${_param:openstack_control_node01_address} names: - - ${_param:openstack_control_node01_hostname} - - ${_param:openstack_control_node01_hostname}.${_param:cluster_domain} + - ${_param:openstack_control_node01_hostname} + - ${_param:openstack_control_node01_hostname}.${_param:cluster_domain} ctl02: address: ${_param:openstack_control_node02_address} names: - - ${_param:openstack_control_node02_hostname} - - ${_param:openstack_control_node02_hostname}.${_param:cluster_domain} + - ${_param:openstack_control_node02_hostname} + - ${_param:openstack_control_node02_hostname}.${_param:cluster_domain} ctl03: address: ${_param:openstack_control_node03_address} names: - - ${_param:openstack_control_node03_hostname} - - ${_param:openstack_control_node03_hostname}.${_param:cluster_domain} + - ${_param:openstack_control_node03_hostname} + - ${_param:openstack_control_node03_hostname}.${_param:cluster_domain} msg: address: ${_param:openstack_message_queue_address} names: - - ${_param:openstack_message_queue_hostname} - - ${_param:openstack_message_queue_hostname}.${_param:cluster_domain} + - ${_param:openstack_message_queue_hostname} + - ${_param:openstack_message_queue_hostname}.${_param:cluster_domain} msg01: address: ${_param:openstack_message_queue_node01_address} names: - - ${_param:openstack_message_queue_node01_hostname} - - ${_param:openstack_message_queue_node01_hostname}.${_param:cluster_domain} + - ${_param:openstack_message_queue_node01_hostname} + - ${_param:openstack_message_queue_node01_hostname}.${_param:cluster_domain} msg02: address: ${_param:openstack_message_queue_node02_address} names: - - ${_param:openstack_message_queue_node02_hostname} - - ${_param:openstack_message_queue_node02_hostname}.${_param:cluster_domain} + - ${_param:openstack_message_queue_node02_hostname} + - ${_param:openstack_message_queue_node02_hostname}.${_param:cluster_domain} msg03: address: ${_param:openstack_message_queue_node03_address} names: - - ${_param:openstack_message_queue_node03_hostname} - - ${_param:openstack_message_queue_node03_hostname}.${_param:cluster_domain} + - ${_param:openstack_message_queue_node03_hostname} + - ${_param:openstack_message_queue_node03_hostname}.${_param:cluster_domain} dbs: address: ${_param:openstack_database_address} names: - - ${_param:openstack_database_hostname} - - ${_param:openstack_database_hostname}.${_param:cluster_domain} + - ${_param:openstack_database_hostname} + - ${_param:openstack_database_hostname}.${_param:cluster_domain} dbs01: address: ${_param:openstack_database_node01_address} names: - - ${_param:openstack_database_node01_hostname} - - ${_param:openstack_database_node01_hostname}.${_param:cluster_domain} + - ${_param:openstack_database_node01_hostname} + - ${_param:openstack_database_node01_hostname}.${_param:cluster_domain} dbs02: address: ${_param:openstack_database_node02_address} names: - - ${_param:openstack_database_node02_hostname} - - ${_param:openstack_database_node02_hostname}.${_param:cluster_domain} + - ${_param:openstack_database_node02_hostname} + - ${_param:openstack_database_node02_hostname}.${_param:cluster_domain} dbs03: address: ${_param:openstack_database_node03_address} names: - - ${_param:openstack_database_node03_hostname} - - ${_param:openstack_database_node03_hostname}.${_param:cluster_domain} + - ${_param:openstack_database_node03_hostname} + - ${_param:openstack_database_node03_hostname}.${_param:cluster_domain} mdb: address: ${_param:openstack_telemetry_address} names: - - ${_param:openstack_telemetry_hostname} - - ${_param:openstack_telemetry_hostname}.${_param:cluster_domain} + - ${_param:openstack_telemetry_hostname} + - ${_param:openstack_telemetry_hostname}.${_param:cluster_domain} mdb01: address: ${_param:openstack_telemetry_node01_address} names: - - ${_param:openstack_telemetry_node01_hostname} - - ${_param:openstack_telemetry_node01_hostname}.${_param:cluster_domain} + - ${_param:openstack_telemetry_node01_hostname} + - ${_param:openstack_telemetry_node01_hostname}.${_param:cluster_domain} mdb02: address: ${_param:openstack_telemetry_node02_address} names: - - ${_param:openstack_telemetry_node02_hostname} - - ${_param:openstack_telemetry_node02_hostname}.${_param:cluster_domain} + - ${_param:openstack_telemetry_node02_hostname} + - ${_param:openstack_telemetry_node02_hostname}.${_param:cluster_domain} mdb03: address: ${_param:openstack_telemetry_node03_address} names: - - ${_param:openstack_telemetry_node03_hostname} - - ${_param:openstack_telemetry_node03_hostname}.${_param:cluster_domain} + - ${_param:openstack_telemetry_node03_hostname} + - ${_param:openstack_telemetry_node03_hostname}.${_param:cluster_domain} cmp001: address: ${_param:openstack_compute_node01_control_address} names: - - ${_param:openstack_compute_node01_hostname} - - ${_param:openstack_compute_node01_hostname}.${_param:cluster_domain} + - ${_param:openstack_compute_node01_hostname} + - ${_param:openstack_compute_node01_hostname}.${_param:cluster_domain} cmp002: address: ${_param:openstack_compute_node02_control_address} names: - - ${_param:openstack_compute_node02_hostname} - - ${_param:openstack_compute_node02_hostname}.${_param:cluster_domain} -# gtw01: -# address: ${_param:openstack_gateway_node01_address} -# names: -# - ${_param:openstack_gateway_node01_hostname} -# - ${_param:openstack_gateway_node01_hostname}.${_param:cluster_domain} -# gtw02: -# address: ${_param:openstack_gateway_node02_address} -# names: -# - ${_param:openstack_gateway_node02_hostname} -# - ${_param:openstack_gateway_node02_hostname}.${_param:cluster_domain} + - ${_param:openstack_compute_node02_hostname} + - ${_param:openstack_compute_node02_hostname}.${_param:cluster_domain} + # gtw01: + # address: ${_param:openstack_gateway_node01_address} + # names: + # - ${_param:openstack_gateway_node01_hostname} + # - ${_param:openstack_gateway_node01_hostname}.${_param:cluster_domain} + # gtw02: + # address: ${_param:openstack_gateway_node02_address} + # names: + # - ${_param:openstack_gateway_node02_hostname} + # - ${_param:openstack_gateway_node02_hostname}.${_param:cluster_domain} odl01: address: ${_param:opendaylight_service_host} names: - - ${_param:opendaylight_server_node01_hostname} - - ${_param:opendaylight_server_node01_hostname}.${_param:cluster_domain} + - ${_param:opendaylight_server_node01_hostname} + - ${_param:opendaylight_server_node01_hostname}.${_param:cluster_domain} diff --git a/mcp/reclass/classes/cluster/baremetal-mcp-ocata-odl-ha/openstack/message_queue.yml b/mcp/reclass/classes/cluster/baremetal-mcp-ocata-odl-ha/openstack/message_queue.yml index f5312c1da..f740e2904 100644 --- a/mcp/reclass/classes/cluster/baremetal-mcp-ocata-odl-ha/openstack/message_queue.yml +++ b/mcp/reclass/classes/cluster/baremetal-mcp-ocata-odl-ha/openstack/message_queue.yml @@ -1,13 +1,13 @@ +--- classes: -- system.linux.system.repo.mcp.openstack -- system.linux.system.repo.mcp.extra -- system.linux.system.repo.saltstack.xenial -- system.rabbitmq.server.cluster -- system.rabbitmq.server.vhost.openstack -- cluster.baremetal-mcp-ocata-odl-ha + - system.linux.system.repo.mcp.openstack + - system.linux.system.repo.mcp.extra + - system.rabbitmq.server.cluster + - system.rabbitmq.server.vhost.openstack + - cluster.baremetal-mcp-ocata-odl-ha parameters: _param: - keepalived_vip_interface: ens3 + keepalived_vip_interface: ${_param:single_nic} keepalived_vip_virtual_router_id: 90 cluster_vip_address: ${_param:openstack_message_queue_address} cluster_local_address: ${_param:single_address} @@ -20,5 +20,5 @@ parameters: linux: network: interface: - ens2: ${_param:linux_dhcp_interface} - ens3: ${_param:linux_single_interface} + dhcp: ${_param:linux_dhcp_interface} + single: ${_param:linux_single_interface} diff --git a/mcp/reclass/classes/cluster/baremetal-mcp-ocata-odl-ha/openstack/proxy.yml b/mcp/reclass/classes/cluster/baremetal-mcp-ocata-odl-ha/openstack/proxy.yml index 89a193061..83a4be3fb 100644 --- a/mcp/reclass/classes/cluster/baremetal-mcp-ocata-odl-ha/openstack/proxy.yml +++ b/mcp/reclass/classes/cluster/baremetal-mcp-ocata-odl-ha/openstack/proxy.yml @@ -1,23 +1,23 @@ +--- classes: -- system.linux.system.repo.mcp.openstack -- system.linux.system.repo.mcp.extra -- system.linux.system.repo.saltstack.xenial -- system.nginx.server.single -- system.nginx.server.proxy.openstack_api -- system.nginx.server.proxy.openstack_vnc -- system.nginx.server.proxy.openstack_web -- system.nginx.server.proxy.openstack.aodh -- system.nginx.server.proxy.openstack.ceilometer -- system.horizon.server.single -- system.salt.minion.cert.proxy -- system.sphinx.server.doc.reclass -- service.keepalived.cluster.single -- cluster.baremetal-mcp-ocata-odl-ha.infra -- cluster.baremetal-mcp-ocata-odl-ha.openstack.dashboard -# - cluster.baremetal-mcp-ocata-odl-ha.stacklight.proxy + - system.linux.system.repo.mcp.openstack + - system.linux.system.repo.mcp.extra + - system.nginx.server.single + - system.nginx.server.proxy.openstack_api + - system.nginx.server.proxy.openstack_vnc + - system.nginx.server.proxy.openstack_web + - system.nginx.server.proxy.openstack.aodh + - system.nginx.server.proxy.openstack.ceilometer + - system.horizon.server.single + - system.salt.minion.cert.proxy + - system.sphinx.server.doc.reclass + - service.keepalived.cluster.single + - cluster.baremetal-mcp-ocata-odl-ha.infra + - cluster.baremetal-mcp-ocata-odl-ha.openstack.dashboard + # - cluster.baremetal-mcp-ocata-odl-ha.stacklight.proxy parameters: _param: - keepalived_vip_interface: ens3 + keepalived_vip_interface: ${_param:single_nic} keepalived_vip_virtual_router_id: 240 nginx_proxy_ssl: enabled: true @@ -29,8 +29,8 @@ parameters: linux: network: interface: - ens2: ${_param:linux_dhcp_interface} - ens3: ${_param:linux_single_interface} + dhcp: ${_param:linux_dhcp_interface} + single: ${_param:linux_single_interface} system: package: libapache2-mod-wsgi: diff --git a/mcp/reclass/classes/cluster/baremetal-mcp-ocata-odl-ha/openstack/telemetry.yml b/mcp/reclass/classes/cluster/baremetal-mcp-ocata-odl-ha/openstack/telemetry.yml index 4e900908b..4b14f7beb 100644 --- a/mcp/reclass/classes/cluster/baremetal-mcp-ocata-odl-ha/openstack/telemetry.yml +++ b/mcp/reclass/classes/cluster/baremetal-mcp-ocata-odl-ha/openstack/telemetry.yml @@ -1,18 +1,18 @@ +--- classes: -- system.linux.system.repo.mcp.openstack -- system.linux.system.repo.mcp.extra -- system.linux.system.repo.saltstack.xenial -- system.mongodb.server.cluster -- system.mongodb.server.database.ceilometer -- system.ceilometer.server.backend.mongodb -# - system.ceilometer.server.backend.influxdb -# - system.heka.ceilometer_collector.single -- system.ceilometer.server.cluster -- system.aodh.server.cluster -- cluster.baremetal-mcp-ocata-odl-ha.infra + - system.linux.system.repo.mcp.openstack + - system.linux.system.repo.mcp.extra + - system.mongodb.server.cluster + - system.mongodb.server.database.ceilometer + - system.ceilometer.server.backend.mongodb + # - system.ceilometer.server.backend.influxdb + # - system.heka.ceilometer_collector.single + - system.ceilometer.server.cluster + - system.aodh.server.cluster + - cluster.baremetal-mcp-ocata-odl-ha.infra parameters: _param: - keepalived_openstack_telemetry_vip_interface: ens3 + keepalived_openstack_telemetry_vip_interface: ${_param:single_nic} keepalived_vip_virtual_router_id: 230 cluster_vip_address: ${_param:openstack_telemetry_address} cluster_local_address: ${_param:single_address} @@ -25,8 +25,8 @@ parameters: linux: network: interface: - ens2: ${_param:linux_dhcp_interface} - ens3: ${_param:linux_single_interface} + dhcp: ${_param:linux_dhcp_interface} + single: ${_param:linux_single_interface} mongodb: server: logging: |