diff options
Diffstat (limited to 'mcp/reclass/classes/cluster/baremetal-mcp-pike-common-ha')
11 files changed, 66 insertions, 27 deletions
diff --git a/mcp/reclass/classes/cluster/baremetal-mcp-pike-common-ha/include/proxy.yml b/mcp/reclass/classes/cluster/baremetal-mcp-pike-common-ha/include/proxy.yml index 5d7475812..3c324db8b 100644 --- a/mcp/reclass/classes/cluster/baremetal-mcp-pike-common-ha/include/proxy.yml +++ b/mcp/reclass/classes/cluster/baremetal-mcp-pike-common-ha/include/proxy.yml @@ -16,8 +16,9 @@ parameters: # https_proxy: http://${_param:infra_maas_node01_deploy_address}:8000 # no_proxy: # - .local - salt: - minion: + linux: + system: proxy: - host: ${_param:infra_maas_node01_deploy_address} - port: 8000 + keyserver: + http: http://${_param:infra_maas_node01_deploy_address}:8000 + https: http://${_param:infra_maas_node01_deploy_address}:8000 diff --git a/mcp/reclass/classes/cluster/baremetal-mcp-pike-common-ha/infra/config.yml b/mcp/reclass/classes/cluster/baremetal-mcp-pike-common-ha/infra/config.yml index 6b44be6a4..4d7fa1eb1 100644 --- a/mcp/reclass/classes/cluster/baremetal-mcp-pike-common-ha/infra/config.yml +++ b/mcp/reclass/classes/cluster/baremetal-mcp-pike-common-ha/infra/config.yml @@ -25,6 +25,7 @@ classes: # - system.reclass.storage.system.stacklight_monitor_cluster # - system.reclass.storage.system.stacklight_telemetry_cluster - system.reclass.storage.system.infra_maas_single + - cluster.baremetal-mcp-pike-common-ha.infra.lab_proxy_pdf parameters: _param: salt_master_base_environment: prd diff --git a/mcp/reclass/classes/cluster/baremetal-mcp-pike-common-ha/infra/init.yml b/mcp/reclass/classes/cluster/baremetal-mcp-pike-common-ha/infra/init.yml index f2a6b4e68..7d513e9bf 100644 --- a/mcp/reclass/classes/cluster/baremetal-mcp-pike-common-ha/infra/init.yml +++ b/mcp/reclass/classes/cluster/baremetal-mcp-pike-common-ha/infra/init.yml @@ -13,7 +13,7 @@ classes: # - cluster.baremetal-mcp-pike-common-ha.stacklight.client parameters: _param: - apt_mk_version: nightly + apt_mk_version: stable mcp_repo_version: 1.1 salt_version: 2016.11 cluster_domain: ${_param:cluster_name}.local diff --git a/mcp/reclass/classes/cluster/baremetal-mcp-pike-common-ha/infra/kvm.yml b/mcp/reclass/classes/cluster/baremetal-mcp-pike-common-ha/infra/kvm.yml index dcd78a2cf..1e6b3bd0d 100644 --- a/mcp/reclass/classes/cluster/baremetal-mcp-pike-common-ha/infra/kvm.yml +++ b/mcp/reclass/classes/cluster/baremetal-mcp-pike-common-ha/infra/kvm.yml @@ -37,6 +37,11 @@ parameters: network: remove_iface_files: - '/etc/network/interfaces.d/50-cloud-init.cfg' + system: + kernel: + boot_options: + - spectre_v2=off + - nopti libvirt: server: service: libvirtd diff --git a/mcp/reclass/classes/cluster/baremetal-mcp-pike-common-ha/infra/kvm_pdf.yml.j2 b/mcp/reclass/classes/cluster/baremetal-mcp-pike-common-ha/infra/kvm_pdf.yml.j2 index b7f6b7cdc..0aab6cbc0 100644 --- a/mcp/reclass/classes/cluster/baremetal-mcp-pike-common-ha/infra/kvm_pdf.yml.j2 +++ b/mcp/reclass/classes/cluster/baremetal-mcp-pike-common-ha/infra/kvm_pdf.yml.j2 @@ -6,14 +6,14 @@ # http://www.apache.org/licenses/LICENSE-2.0 ############################################################################## {# NOTE: br-{mgmt,ctl} are cross-referenced, careful when changing names #} -{%- if conf.net_config is defined and conf.idf is defined -%} +{%- if conf.idf is defined and conf.idf.net_config is defined -%} {#- NOTE: Currently, we assume all cluster nodes use the same mapping -#} {#- Determine interface index for each network (plumbing vars) -#} - {%- set idx_admin = conf['net_config']['admin']['interface'] -%} - {%- set idx_mgmt = conf['net_config']['mgmt']['interface'] -%} - {%- set idx_private = conf['net_config']['private']['interface'] -%} - {%- set idx_public = conf['net_config']['public']['interface'] -%} + {%- set idx_admin = conf['idf']['net_config']['admin']['interface'] -%} + {%- set idx_mgmt = conf['idf']['net_config']['mgmt']['interface'] -%} + {%- set idx_private = conf['idf']['net_config']['private']['interface'] -%} + {%- set idx_public = conf['idf']['net_config']['public']['interface'] -%} {#- Physical interface OS name for each network (e.g. em1, enp1s0f1) -#} {%- set node = conf['idf']['fuel']['network']['node'][0] -%} @@ -26,10 +26,10 @@ {%- set bus_private = node['busaddr'][idx_private] -%} {#- VLAN for each network (only untagged 'admin' is supported by MaaS config!) -#} - {%- set vlan_admin = conf['net_config']['admin']['vlan'] -%} - {%- set vlan_mgmt = conf['net_config']['mgmt']['vlan'] -%} - {%- set vlan_private = conf['net_config']['private']['vlan'] -%} - {%- set vlan_public = conf['net_config']['public']['vlan'] -%} + {%- set vlan_admin = conf['idf']['net_config']['admin']['vlan'] -%} + {%- set vlan_mgmt = conf['idf']['net_config']['mgmt']['vlan'] -%} + {%- set vlan_private = conf['idf']['net_config']['private']['vlan'] -%} + {%- set vlan_public = conf['idf']['net_config']['public']['vlan'] -%} {%- else -%} {%- set nic_admin = 'enp6s0' -%} {%- set nic_mgmt = 'enp6s0' -%} @@ -91,7 +91,7 @@ parameters: enabled: true proto: manual address: 0.0.0.0 - netmask: 255.255.255.0 + netmask: ${_param:opnfv_net_public_mask} type: bridge use_interfaces: - {{ nic_public }}{% if vlan_public and vlan_public != 'native' %}.{{ vlan_public }}{% endif %} diff --git a/mcp/reclass/classes/cluster/baremetal-mcp-pike-common-ha/infra/lab_proxy_pdf.yml.j2 b/mcp/reclass/classes/cluster/baremetal-mcp-pike-common-ha/infra/lab_proxy_pdf.yml.j2 new file mode 100644 index 000000000..0e95d2d1d --- /dev/null +++ b/mcp/reclass/classes/cluster/baremetal-mcp-pike-common-ha/infra/lab_proxy_pdf.yml.j2 @@ -0,0 +1,24 @@ +############################################################################## +# Copyright (c) 2018 Mirantis Inc., Enea AB and others. +# All rights reserved. This program and the accompanying materials +# are made available under the terms of the Apache License, Version 2.0 +# which accompanies this distribution, and is available at +# http://www.apache.org/licenses/LICENSE-2.0 +############################################################################## +--- +# We'll craft this class so it can be reused on both cfg01 and mas01 +{%- if conf.idf.fuel.network.upstream_proxy is defined %} +{%- set upstream_proxy=conf.idf.fuel.network.upstream_proxy %} +parameters: + maas: + region: + upstream_proxy: + address: {{ upstream_proxy.address }} + port: {{ upstream_proxy.port }} + linux: + system: + proxy: + keyserver: + http: http://{{ upstream_proxy.address }}:{{ upstream_proxy.port }} + https: http://{{ upstream_proxy.address }}:{{ upstream_proxy.port }} +{%- endif %} diff --git a/mcp/reclass/classes/cluster/baremetal-mcp-pike-common-ha/infra/maas.yml b/mcp/reclass/classes/cluster/baremetal-mcp-pike-common-ha/infra/maas.yml index 04ffdb44d..da28abf06 100644 --- a/mcp/reclass/classes/cluster/baremetal-mcp-pike-common-ha/infra/maas.yml +++ b/mcp/reclass/classes/cluster/baremetal-mcp-pike-common-ha/infra/maas.yml @@ -9,6 +9,7 @@ classes: - system.maas.region.single - service.maas.cluster.single + - cluster.baremetal-mcp-pike-common-ha.infra.lab_proxy_pdf parameters: _param: dhcp_interface: ${_param:opnfv_fn_vm_primary_interface} @@ -23,7 +24,7 @@ parameters: maas_db_password: opnfv_secret dns_server01: ${_param:opnfv_dns_server01} single_address: ${_param:infra_maas_node01_deploy_address} - hwe_kernel: 'hwe-16.04-edge' + hwe_kernel: 'ga-16.04' maas: region: salt_master_ip: ${_param:reclass_config_master} diff --git a/mcp/reclass/classes/cluster/baremetal-mcp-pike-common-ha/openstack_compute.yml b/mcp/reclass/classes/cluster/baremetal-mcp-pike-common-ha/openstack_compute.yml index 60a01a885..a0cdd98c8 100644 --- a/mcp/reclass/classes/cluster/baremetal-mcp-pike-common-ha/openstack_compute.yml +++ b/mcp/reclass/classes/cluster/baremetal-mcp-pike-common-ha/openstack_compute.yml @@ -53,6 +53,9 @@ parameters: sysctl: vm.dirty_ratio: 10 vm.dirty_background_ratio: 5 + boot_options: + - spectre_v2=off + - nopti neutron: gateway: vlan_aware_vms: true diff --git a/mcp/reclass/classes/cluster/baremetal-mcp-pike-common-ha/openstack_compute_pdf.yml.j2 b/mcp/reclass/classes/cluster/baremetal-mcp-pike-common-ha/openstack_compute_pdf.yml.j2 index bf2b66e4f..2e9466980 100644 --- a/mcp/reclass/classes/cluster/baremetal-mcp-pike-common-ha/openstack_compute_pdf.yml.j2 +++ b/mcp/reclass/classes/cluster/baremetal-mcp-pike-common-ha/openstack_compute_pdf.yml.j2 @@ -6,14 +6,14 @@ # http://www.apache.org/licenses/LICENSE-2.0 ############################################################################## {# NOTE: br-{mgmt,ctl} are cross-referenced, careful when changing names #} -{%- if conf.net_config is defined and conf.idf is defined -%} +{%- if conf.idf is defined and conf.idf.net_config is defined -%} {#- NOTE: Currently, we assume all cluster nodes use the same mapping -#} {#- Determine interface index for each network (plumbing vars) -#} - {%- set idx_admin = conf['net_config']['admin']['interface'] -%} - {%- set idx_mgmt = conf['net_config']['mgmt']['interface'] -%} - {%- set idx_private = conf['net_config']['private']['interface'] -%} - {%- set idx_public = conf['net_config']['public']['interface'] -%} + {%- set idx_admin = conf['idf']['net_config']['admin']['interface'] -%} + {%- set idx_mgmt = conf['idf']['net_config']['mgmt']['interface'] -%} + {%- set idx_private = conf['idf']['net_config']['private']['interface'] -%} + {%- set idx_public = conf['idf']['net_config']['public']['interface'] -%} {#- Physical interface OS name for each network (e.g. em1, enp1s0f1) -#} {%- set iface_names = conf['idf']['fuel']['network']['node'][3]['interfaces'] -%} @@ -23,10 +23,10 @@ {%- set nic_public = iface_names[idx_public] -%} {#- VLAN for each network (only untagged 'admin' is supported by MaaS config!) -#} - {%- set vlan_admin = conf['net_config']['admin']['vlan'] -%} - {%- set vlan_mgmt = conf['net_config']['mgmt']['vlan'] -%} - {%- set vlan_private = conf['net_config']['private']['vlan'] -%} - {%- set vlan_public = conf['net_config']['public']['vlan'] -%} + {%- set vlan_admin = conf['idf']['net_config']['admin']['vlan'] -%} + {%- set vlan_mgmt = conf['idf']['net_config']['mgmt']['vlan'] -%} + {%- set vlan_private = conf['idf']['net_config']['private']['vlan'] -%} + {%- set vlan_public = conf['idf']['net_config']['public']['vlan'] -%} {%- else -%} {%- set nic_admin = 'enp6s0' -%} {%- set nic_mgmt = 'enp6s0' -%} @@ -60,7 +60,11 @@ parameters: type: eth proto: manual address: 0.0.0.0 + {%- if nic == nic_public %} + netmask: ${_param:opnfv_net_public_mask} + {%- else %} netmask: 255.255.255.0 + {%- endif %} mtu: ${_param:interface_mtu} name: {{ nic }} {%- endif %} diff --git a/mcp/reclass/classes/cluster/baremetal-mcp-pike-common-ha/openstack_interface_vcp_biport.yml b/mcp/reclass/classes/cluster/baremetal-mcp-pike-common-ha/openstack_interface_vcp_biport.yml index f5a4ad0ef..f0fabbafa 100644 --- a/mcp/reclass/classes/cluster/baremetal-mcp-pike-common-ha/openstack_interface_vcp_biport.yml +++ b/mcp/reclass/classes/cluster/baremetal-mcp-pike-common-ha/openstack_interface_vcp_biport.yml @@ -26,4 +26,4 @@ parameters: proto: static name: ${_param:single_nic} address: ${_param:single_address} - netmask: 255.255.255.0 + netmask: ${_param:opnfv_net_public_mask} diff --git a/mcp/reclass/classes/cluster/baremetal-mcp-pike-common-ha/openstack_interface_vcp_triport.yml b/mcp/reclass/classes/cluster/baremetal-mcp-pike-common-ha/openstack_interface_vcp_triport.yml index 146e54575..47f2f76f4 100644 --- a/mcp/reclass/classes/cluster/baremetal-mcp-pike-common-ha/openstack_interface_vcp_triport.yml +++ b/mcp/reclass/classes/cluster/baremetal-mcp-pike-common-ha/openstack_interface_vcp_triport.yml @@ -27,7 +27,7 @@ parameters: proto: static name: ${_param:single_nic} address: ${_param:single_address} - netmask: 255.255.255.0 + netmask: ${_param:opnfv_net_public_mask} route: public: address: 0.0.0.0 |