diff options
18 files changed, 144 insertions, 73 deletions
diff --git a/mcp/config/states/maas b/mcp/config/states/maas index 24cefe818..5e33f3a08 100755 --- a/mcp/config/states/maas +++ b/mcp/config/states/maas @@ -1,4 +1,5 @@ #!/bin/bash -e +# shellcheck disable=SC1090,SC2155 ############################################################################## # Copyright (c) 2017 Mirantis Inc., Enea AB and others. # All rights reserved. This program and the accompanying materials @@ -10,21 +11,18 @@ CI_DEBUG=${CI_DEBUG:-0}; [[ "${CI_DEBUG}" =~ (false|0) ]] || set -x ERASE_ENV=${ERASE_ENV:-0} -# shellcheck disable=SC1090 +source "$(dirname "${BASH_SOURCE[0]}")/../../scripts/globals.sh" source "$(dirname "${BASH_SOURCE[0]}")/../../scripts/lib.sh" # Wait for MaaS commissioning/deploy to finish, retry on failure function maas_fixup() { local statuscmd="salt 'mas01*' --out yaml state.apply maas.machines.status" - # shellcheck disable=SC2155 local ncount=$(salt --out yaml 'mas01*' pillar.get maas:region:machines | \ grep -cE '^\s{2}\w+:$') wait_for 180 "${statuscmd} | tee /dev/stderr | " \ "grep -Eq '((Deployed|Ready): ${ncount}|status: (Failed|Allocated))'" - # shellcheck disable=SC2155 local statusout=$(eval "${statuscmd}") - # shellcheck disable=SC2155 local fcnodes=$(echo "${statusout}" | \ grep -Pzo 'status: Failed commissioning\n\s+system_id: \K.+\n') for node_system_id in ${fcnodes}; do @@ -37,7 +35,6 @@ function maas_fixup() { return 1 fi - # shellcheck disable=SC2155 local fdnodes=$(echo "${statusout}" | \ grep -Pzo 'status: (Failed deployment|Allocated)\n\s+system_id: \K.+\n') for node_system_id in ${fdnodes}; do @@ -55,21 +52,20 @@ function maas_fixup() { # Optionally destroy MaaS machines from a previous run if [ "${ERASE_ENV}" -gt 1 ]; then - dnodes=$(salt 'mas01*' --out yaml state.apply maas.machines.status | \ - grep -Pzo '\s+system_id: \K.+\n') + set +e; dnodes=$(salt 'mas01*' --out yaml state.apply maas.machines.status | \ + grep -Pzo '\s+system_id: \K.+\n'); set -e + cleanup_uefi for node_system_id in ${dnodes}; do salt -C 'mas01*' state.apply maas.machines.delete \ pillar="{'system_id': '${node_system_id}'}" - sleep 30 + sleep 10 done fi # MaaS rack/region controller, node commissioning salt -C 'mas01*' state.apply linux,salt,openssh,ntp -salt -C 'mas01*' state.apply linux.network.interface salt -C 'mas01*' state.apply maas.pxe_nat salt -C 'mas01*' state.apply maas.cluster -salt -C 'cfg01*' state.apply maas.pxe_route wait_for 10 "salt -C 'mas01*' state.apply maas.region" diff --git a/mcp/patches/0011-maas-region-interface-default-mode-DHCP.patch b/mcp/patches/0011-maas-region-interface-default-mode-DHCP.patch new file mode 100644 index 000000000..d161a9527 --- /dev/null +++ b/mcp/patches/0011-maas-region-interface-default-mode-DHCP.patch @@ -0,0 +1,44 @@ +:::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::: +: Copyright (c) 2017 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 +:::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::: +From: Alexandru Avadanii <Alexandru.Avadanii@enea.com> +Date: Mon, 18 Dec 2017 02:03:01 +0200 +Subject: [PATCH] maas: region: interface: default mode DHCP + +Switch MaaS interface mode default from AUTO to DHCP. +This way, MaaS will not statically assign IPs *outside* the dynamic +reserved range, but instead DHCP will assign them *inside* the range. + +One alternative would be to handle this via API calls, for each +node's PXE physical interface, but that overcomplicates things. + +JIRA: FUEL-316 + +Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com> +--- + +diff --git a/maas/region.sls b/maas/region.sls +--- a/maas/region.sls ++++ b/maas/region.sls +@@ -39,6 +39,16 @@ + - require_in: + - service: maas_region_services + ++maas_interface_default_mode_dhcp: ++ file.replace: ++ - name: "/usr/lib/python3/dist-packages/maasserver/models/node.py" ++ - pattern: '^(\s+INTERFACE_LINK_TYPE)\.AUTO' ++ - repl: \1.DHCP ++ - require: ++ - pkg: maas_region_packages ++ - require_in: ++ - service: maas_region_services ++ + {%- if region.get('enable_iframe', False) %} + + /etc/apache2/conf-enabled/maas-http.conf: diff --git a/mcp/patches/0013-libvirt-unix_sock_group-s-libvirtd-libvirt.patch b/mcp/patches/0013-libvirt-unix_sock_group-s-libvirtd-libvirt.patch index 1ac6cd157..715ddc042 100644 --- a/mcp/patches/0013-libvirt-unix_sock_group-s-libvirtd-libvirt.patch +++ b/mcp/patches/0013-libvirt-unix_sock_group-s-libvirtd-libvirt.patch @@ -1,3 +1,11 @@ +:::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::: +: Copyright (c) 2017 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 +:::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::: From: Alexandru Avadanii <Alexandru.Avadanii@enea.com> Date: Sun, 20 Aug 2017 02:03:01 +0200 Subject: [PATCH] libvirt: unix_sock_group: s/libvirtd/libvirt/ diff --git a/mcp/patches/patches.list b/mcp/patches/patches.list index a87a935bc..d16e3c207 100644 --- a/mcp/patches/patches.list +++ b/mcp/patches/patches.list @@ -13,5 +13,6 @@ /usr/share/salt-formulas/env: 0006-maas-module-Add-VLAN-DHCP-enable-support.patch /usr/share/salt-formulas/env: 0008-Handle-file_recv-option.patch /usr/share/salt-formulas/env: 0010-maas-region-allow-timeout-override.patch +/usr/share/salt-formulas/env: 0011-maas-region-interface-default-mode-DHCP.patch /usr/share/salt-formulas/env: 0012-linux.storage.lvm-Disable-filter.patch /usr/share/salt-formulas/env: 0013-libvirt-unix_sock_group-s-libvirtd-libvirt.patch diff --git a/mcp/patches/pharos/0001-Update-MaaS-PXE-config.patch b/mcp/patches/pharos/0001-Update-MaaS-PXE-config.patch new file mode 100644 index 000000000..27467dd61 --- /dev/null +++ b/mcp/patches/pharos/0001-Update-MaaS-PXE-config.patch @@ -0,0 +1,47 @@ +:::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::: +: Copyright (c) 2017 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 +:::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::: +From: Alexandru Avadanii <Alexandru.Avadanii@enea.com> +Date: Sat, 16 Dec 2017 21:14:35 +0100 +Subject: [PATCH] Update MaaS PXE config + +- reduce DHCP range to silence a dummy MaaS warning about address exhaustion; +- define PXE/admin address for Salt Master node; +- drop obsolete opnfv_infra_maas_pxe_address; + +JIRA: FUEL-316 + +Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com> +--- + config/installers/fuel/pod_config.yml.j2 | 6 +++--- + 1 file changed, 3 insertions(+), 3 deletions(-) + +diff --git a/config/installers/fuel/pod_config.yml.j2 b/config/installers/fuel/pod_config.yml.j2 +index 28c6188..f380535 100644 +--- a/config/installers/fuel/pod_config.yml.j2 ++++ b/config/installers/fuel/pod_config.yml.j2 +@@ -40,6 +40,7 @@ parameters: + {%- endif %} + + opnfv_infra_config_address: {{ net_mgmt | ipaddr_index('100') }} ++ opnfv_infra_config_pxe_address: {{ net_admin | ipaddr_index('2') }} + opnfv_infra_maas_node01_address: {{ net_mgmt | ipaddr_index('3') }} + opnfv_infra_maas_node01_deploy_address: {{ net_admin | ipaddr_index('3') }} + opnfv_infra_kvm_address: {{ net_mgmt | ipaddr_index('140') }} +@@ -48,9 +49,8 @@ parameters: + opnfv_infra_kvm_node03_address: {{ net_mgmt | ipaddr_index('143') }} + + opnfv_infra_maas_pxe_network_address: {{ net_admin }} +- opnfv_infra_maas_pxe_address: {{ net_admin | ipaddr_index('3') }} +- opnfv_infra_maas_pxe_start_address: {{ net_admin | ipaddr_index('5') }} +- opnfv_infra_maas_pxe_end_address: {{ net_admin | ipaddr_index('250') }} ++ opnfv_infra_maas_pxe_start_address: {{ net_admin | ipaddr_index('4') }} ++ opnfv_infra_maas_pxe_end_address: {{ net_admin | ipaddr_index('100') }} + + opnfv_openstack_gateway_node01_address: {{ net_mgmt | ipaddr_index('124') }} + opnfv_openstack_gateway_node02_address: {{ net_mgmt | ipaddr_index('125') }} diff --git a/mcp/reclass/classes/cluster/all-mcp-arch-common/opnfv/pod_config.yml.example b/mcp/reclass/classes/cluster/all-mcp-arch-common/opnfv/pod_config.yml.example index 66999de86..a2cdabbf3 100644 --- a/mcp/reclass/classes/cluster/all-mcp-arch-common/opnfv/pod_config.yml.example +++ b/mcp/reclass/classes/cluster/all-mcp-arch-common/opnfv/pod_config.yml.example @@ -10,6 +10,7 @@ parameters: _param: opnfv_infra_config_address: 10.167.4.100 + opnfv_infra_config_pxe_address: 192.168.11.2 opnfv_infra_maas_node01_address: 10.167.4.3 opnfv_infra_maas_node01_deploy_address: 192.168.11.3 opnfv_infra_kvm_address: 10.167.4.140 @@ -18,9 +19,8 @@ parameters: opnfv_infra_kvm_node03_address: 10.167.4.143 opnfv_infra_maas_pxe_network_address: 192.168.11.0 - opnfv_infra_maas_pxe_address: 192.168.11.3 - opnfv_infra_maas_pxe_start_address: 192.168.11.5 - opnfv_infra_maas_pxe_end_address: 192.168.11.250 + opnfv_infra_maas_pxe_start_address: 192.168.11.4 + opnfv_infra_maas_pxe_end_address: 192.168.11.100 opnfv_openstack_gateway_node01_address: 10.167.4.124 opnfv_openstack_gateway_node02_address: 10.167.4.125 @@ -28,11 +28,11 @@ parameters: opnfv_openstack_gateway_node01_tenant_address: 10.1.0.6 opnfv_openstack_gateway_node02_tenant_address: 10.1.0.7 opnfv_openstack_gateway_node03_tenant_address: 10.1.0.9 - opnfv_openstack_proxy_node01_control_address: 10.167.4.81 - opnfv_openstack_proxy_node02_control_address: 10.167.4.82 opnfv_openstack_proxy_address: 172.30.10.103 opnfv_openstack_proxy_node01_address: 172.30.10.104 opnfv_openstack_proxy_node02_address: 172.30.10.105 + opnfv_openstack_proxy_node01_control_address: 10.167.4.104 + opnfv_openstack_proxy_node02_control_address: 10.167.4.105 opnfv_openstack_control_address: 10.167.4.10 opnfv_openstack_control_node01_address: 10.167.4.11 opnfv_openstack_control_node02_address: 10.167.4.12 @@ -58,14 +58,15 @@ parameters: opnfv_openstack_compute_node01_tenant_address: 10.1.0.101 opnfv_openstack_compute_node02_tenant_address: 10.1.0.102 opnfv_openstack_compute_node03_tenant_address: 10.1.0.103 - opnfv_openstack_compute_node01_external_address: 172.30.10.2 - opnfv_openstack_compute_node02_external_address: 172.30.10.3 + opnfv_openstack_compute_node01_external_address: 172.30.10.101 + opnfv_openstack_compute_node02_external_address: 172.30.10.102 opnfv_opendaylight_server_node01_single_address: 10.167.4.111 opnfv_net_public_gw: 172.30.10.1 opnfv_name_servers: ['8.8.8.8', '8.8.4.4'] opnfv_dns_server01: '8.8.8.8' + opnfv_net_mgmt_vlan: 300 opnfv_net_tenant_vlan: 1000 diff --git a/mcp/reclass/classes/cluster/all-mcp-arch-common/opnfv/runtime.yml b/mcp/reclass/classes/cluster/all-mcp-arch-common/opnfv/runtime.yml index b8b8fb673..387b57f8b 100644 --- a/mcp/reclass/classes/cluster/all-mcp-arch-common/opnfv/runtime.yml +++ b/mcp/reclass/classes/cluster/all-mcp-arch-common/opnfv/runtime.yml @@ -8,7 +8,7 @@ --- parameters: _param: - reclass_config_master: 10.20.0.2 + opnfv_salt_master_ip: 10.20.0.2 opnfv_maas_mcp_address: 10.20.0.3 opnfv_net_mcpcontrol: 10.20.0.0 opnfv_net_mcpcontrol_mask: 255.255.255.0 diff --git a/mcp/reclass/classes/cluster/all-mcp-arch-common/opnfv/runtime.yml.template b/mcp/reclass/classes/cluster/all-mcp-arch-common/opnfv/runtime.yml.template index c00cafd75..64f75350c 100644 --- a/mcp/reclass/classes/cluster/all-mcp-arch-common/opnfv/runtime.yml.template +++ b/mcp/reclass/classes/cluster/all-mcp-arch-common/opnfv/runtime.yml.template @@ -8,7 +8,7 @@ --- parameters: _param: - reclass_config_master: ${SALT_MASTER} + opnfv_salt_master_ip: ${SALT_MASTER} opnfv_maas_mcp_address: ${MAAS_IP} opnfv_net_mcpcontrol: ${SALT_MASTER%.*}.0 opnfv_net_mcpcontrol_mask: 255.255.255.0 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 6cad47dfd..6b44be6a4 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 @@ -33,11 +33,13 @@ parameters: salt_master_environment_revision: master single_address: ${_param:infra_config_address} deploy_address: ${_param:infra_config_deploy_address} + pxe_address: ${_param:opnfv_infra_config_pxe_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} + pxe_nic: ${_param:opnfv_fn_vm_tertiary_interface} linux: network: interface: @@ -53,6 +55,13 @@ parameters: name: ${_param:single_nic} address: ${_param:single_address} netmask: 255.255.255.0 + pxe: + enabled: true + type: eth + proto: static + name: ${_param:pxe_nic} + address: ${_param:pxe_address} + netmask: 255.255.255.0 salt: master: accept_policy: open_mode 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 1725894fc..731602f12 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 @@ -19,15 +19,16 @@ parameters: cluster_domain: ${_param:cluster_name}.local # stacklight_environment: ${_param:cluster_domain} reclass_data_revision: master + reclass_config_master: ${_param:opnfv_infra_config_pxe_address} cluster_public_host: ${_param:openstack_proxy_address} infra_config_hostname: cfg01 infra_maas_database_password: opnfv_secret # infra service addresses infra_config_address: ${_param:opnfv_infra_config_address} - infra_config_deploy_address: ${_param:reclass_config_master} + infra_config_deploy_address: ${_param:opnfv_salt_master_ip} infra_maas_node01_address: ${_param:opnfv_infra_maas_node01_address} - infra_maas_node01_deploy_address: ${_param:opnfv_infra_maas_pxe_address} + infra_maas_node01_deploy_address: ${_param:opnfv_infra_maas_node01_deploy_address} infra_kvm_address: ${_param:opnfv_infra_kvm_address} infra_kvm_node01_address: ${_param:opnfv_infra_kvm_node01_address} 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 56cd96b5b..6332776d8 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 @@ -23,9 +23,10 @@ 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' maas: region: - salt_master_ip: ${_param:infra_config_deploy_address} + salt_master_ip: ${_param:reclass_config_master} domain: ${_param:cluster_domain} maas_config: commissioning_distro_series: 'xenial' @@ -36,7 +37,7 @@ parameters: dnssec_validation: 'no' enable_third_party_drivers: true network_discovery: 'enabled' - default_min_hwe_kernel: 'hwe-16.04' + default_min_hwe_kernel: ${_param:hwe_kernel} subnets: opnfv_maas_pxe: name: ${_param:opnfv_infra_maas_pxe_network_address}/24 @@ -62,7 +63,7 @@ parameters: power_user: ${_param:opnfv_maas_node01_power_user} architecture: ${_param:opnfv_maas_node01_architecture} distro_series: xenial - hwe_kernel: hwe-16.04 + hwe_kernel: ${_param:hwe_kernel} kvm02: interface: mac: ${_param:opnfv_maas_node02_interface_mac} @@ -73,7 +74,7 @@ parameters: power_user: ${_param:opnfv_maas_node02_power_user} architecture: ${_param:opnfv_maas_node02_architecture} distro_series: xenial - hwe_kernel: hwe-16.04 + hwe_kernel: ${_param:hwe_kernel} kvm03: interface: mac: ${_param:opnfv_maas_node03_interface_mac} @@ -84,7 +85,7 @@ parameters: power_user: ${_param:opnfv_maas_node03_power_user} architecture: ${_param:opnfv_maas_node03_architecture} distro_series: xenial - hwe_kernel: hwe-16.04 + hwe_kernel: ${_param:hwe_kernel} cmp001: interface: mac: ${_param:opnfv_maas_node04_interface_mac} @@ -95,7 +96,7 @@ parameters: power_user: ${_param:opnfv_maas_node04_power_user} architecture: ${_param:opnfv_maas_node04_architecture} distro_series: xenial - hwe_kernel: hwe-16.04 + hwe_kernel: ${_param:hwe_kernel} cmp002: interface: mac: ${_param:opnfv_maas_node05_interface_mac} @@ -106,7 +107,7 @@ parameters: power_user: ${_param:opnfv_maas_node05_power_user} architecture: ${_param:opnfv_maas_node05_architecture} distro_series: xenial - hwe_kernel: hwe-16.04 + hwe_kernel: ${_param:hwe_kernel} linux: network: interface: diff --git a/mcp/reclass/classes/cluster/baremetal-mcp-pike-common-ha/openstack_init.yml b/mcp/reclass/classes/cluster/baremetal-mcp-pike-common-ha/openstack_init.yml index fe4be9d60..0d4c66682 100644 --- a/mcp/reclass/classes/cluster/baremetal-mcp-pike-common-ha/openstack_init.yml +++ b/mcp/reclass/classes/cluster/baremetal-mcp-pike-common-ha/openstack_init.yml @@ -11,16 +11,6 @@ parameters: openstack_version: pike - 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_node01_control_address: ${_param:opnfv_openstack_proxy_node01_control_address} openstack_proxy_node02_control_address: ${_param:opnfv_openstack_proxy_node02_control_address} diff --git a/mcp/reclass/classes/cluster/baremetal-mcp-pike-ovs-ha/openstack/init.yml b/mcp/reclass/classes/cluster/baremetal-mcp-pike-ovs-ha/openstack/init.yml index 84ab1aa83..f1c8b93a4 100644 --- a/mcp/reclass/classes/cluster/baremetal-mcp-pike-ovs-ha/openstack/init.yml +++ b/mcp/reclass/classes/cluster/baremetal-mcp-pike-ovs-ha/openstack/init.yml @@ -16,16 +16,3 @@ parameters: compute_hugepages_count: 16 compute_hugepages_mount: /mnt/hugepages_1G compute_kernel_isolcpu: ${_param:nova_cpu_pinning} - linux: - network: - host: - 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} diff --git a/mcp/reclass/classes/cluster/virtual-mcp-pike-common-noha/infra/config.yml b/mcp/reclass/classes/cluster/virtual-mcp-pike-common-noha/infra/config.yml index 3c3d5260a..ada2c2545 100644 --- a/mcp/reclass/classes/cluster/virtual-mcp-pike-common-noha/infra/config.yml +++ b/mcp/reclass/classes/cluster/virtual-mcp-pike-common-noha/infra/config.yml @@ -22,6 +22,7 @@ parameters: _param: openstack_control_node01_hostname: ctl01 reclass_data_repository: local + reclass_config_master: ${_param:opnfv_salt_master_ip} salt_master_environment_repository: "https://github.com/tcpcloud" salt_master_environment_revision: master single_address: 172.16.10.100 diff --git a/mcp/salt-formulas/maas/pxe_route.sls b/mcp/salt-formulas/maas/pxe_route.sls deleted file mode 100644 index d1082cb48..000000000 --- a/mcp/salt-formulas/maas/pxe_route.sls +++ /dev/null @@ -1,15 +0,0 @@ -############################################################################## -# Copyright (c) 2017 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 -############################################################################## -routes: - network.routes: - - name: {{ salt['pillar.get']('_param:opnfv_fn_vm_primary_interface') }} - - routes: - - name: maas_mcp_to_pxe_network - ipaddr: {{ salt['pillar.get']('_param:opnfv_infra_maas_pxe_network_address') }} - netmask: 255.255.255.0 - gateway: {{ salt['pillar.get']('_param:opnfv_maas_mcp_address') }} diff --git a/mcp/scripts/lib.sh b/mcp/scripts/lib.sh index 3dee9c51f..982cc37fd 100644 --- a/mcp/scripts/lib.sh +++ b/mcp/scripts/lib.sh @@ -151,8 +151,9 @@ function cleanup_mounts { function cleanup_uefi { # Clean up Ubuntu boot entry if cfg01, kvm nodes online from previous deploy - # shellcheck disable=SC2086 - ssh ${SSH_OPTS} "${SSH_SALT}" "sudo salt -C 'kvm* or cmp*' cmd.run \ + local cmd_str="ssh ${SSH_OPTS} ${SSH_SALT}" + [ ! "$(hostname)" = 'cfg01' ] || cmd_str='eval' + ${cmd_str} "sudo salt -C 'kvm* or cmp*' cmd.run \ \"which efibootmgr > /dev/null 2>&1 && \ efibootmgr | grep -oP '(?<=Boot)[0-9]+(?=.*ubuntu)' | \ xargs -I{} efibootmgr --delete-bootnum --bootnum {}; \ @@ -220,8 +221,7 @@ function create_networks { # create required networks, including constant "mcpcontrol" # FIXME(alav): since we renamed "pxe" to "mcpcontrol", we need to make sure # we delete the old "pxe" virtual network, or it would cause IP conflicts. - # FIXME(alav): The same applies for "fuel1" virsh network. - for net in "fuel1" "pxe" "mcpcontrol" "${vnode_networks[@]}"; do + for net in "pxe" "mcpcontrol" "${vnode_networks[@]}"; do if virsh net-info "${net}" >/dev/null 2>&1; then virsh net-destroy "${net}" || true virsh net-undefine "${net}" @@ -255,8 +255,8 @@ function create_vms { # prepare network args net_args=" --network network=mcpcontrol,model=virtio" - if [ "${vnode_data[0]}" = "mas01" ]; then - # MaaS node's 3rd interface gets connected to PXE/Admin Bridge + if [ "${DEPLOY_TYPE:-}" = 'baremetal' ]; then + # 3rd interface gets connected to PXE/Admin Bridge (cfg01, mas01) vnode_networks[2]="${vnode_networks[0]}" fi for net in "${vnode_networks[@]:1}"; do diff --git a/mcp/scripts/pharos b/mcp/scripts/pharos -Subproject cf19f9ee69eacc1189cbeb746b30e3a09eaeac9 +Subproject 89d7cb905bf6f286648638f5865884ac5e332e5 diff --git a/mcp/scripts/salt.sh b/mcp/scripts/salt.sh index 25eb0ede8..d687e3efa 100755 --- a/mcp/scripts/salt.sh +++ b/mcp/scripts/salt.sh @@ -97,7 +97,7 @@ ssh ${SSH_OPTS} "${SSH_SALT}" bash -s -e << SALT_INSTALL_END salt -C "${NODE_MASK} or cfg01*" state.apply salt | \ grep -Fq 'No response' && salt -C "${NODE_MASK} or cfg01*" state.apply salt - salt -C 'I@salt:master' state.sls linux + salt-call state.sls linux || salt-call state.sls linux salt -C "${NODE_MASK} and not cfg01*" state.sls linux || true salt -C "${NODE_MASK} and not cfg01*" pkg.upgrade refresh=False |