mcp/patches/pharos/0001-Update-MaaS-PXE-config.patch

   1 ::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::
   2 : Copyright (c) 2017 Mirantis Inc., Enea AB and others.
   3 :
   4 : All rights reserved. This program and the accompanying materials
   5 : are made available under the terms of the Apache License, Version 2.0
   6 : which accompanies this distribution, and is available at
   7 : http://www.apache.org/licenses/LICENSE-2.0
   8 ::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::
   9 From: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
  10 Date: Sat, 16 Dec 2017 21:14:35 +0100
  11 Subject: [PATCH] Update MaaS PXE config
  12
  13 - reduce DHCP range to silence a dummy MaaS warning about address exhaustion;
  14 - define PXE/admin address for Salt Master node;
  15 - drop obsolete opnfv_infra_maas_pxe_address;
  16
  17 JIRA: FUEL-316
  18
  19 Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
  20 ---
  21  config/installers/fuel/pod_config.yml.j2 | 6 +++---
  22  1 file changed, 3 insertions(+), 3 deletions(-)
  23
  24 diff --git a/config/installers/fuel/pod_config.yml.j2 b/config/installers/fuel/pod_config.yml.j2
  25 index 28c6188..f380535 100644
  26 --- a/config/installers/fuel/pod_config.yml.j2
  27 +++ b/config/installers/fuel/pod_config.yml.j2
  28 @@ -40,6 +40,7 @@ parameters:
  29  {%- endif %}
  30
  31      opnfv_infra_config_address: {{ net_mgmt | ipaddr_index('100') }}
  32 +    opnfv_infra_config_pxe_address: {{ net_admin | ipaddr_index('2') }}
  33      opnfv_infra_maas_node01_address: {{ net_mgmt | ipaddr_index('3') }}
  34      opnfv_infra_maas_node01_deploy_address: {{ net_admin | ipaddr_index('3') }}
  35      opnfv_infra_kvm_address: {{ net_mgmt | ipaddr_index('140') }}
  36 @@ -48,9 +49,8 @@ parameters:
  37      opnfv_infra_kvm_node03_address: {{ net_mgmt | ipaddr_index('143') }}
  38
  39      opnfv_infra_maas_pxe_network_address: {{ net_admin }}
  40 -    opnfv_infra_maas_pxe_address: {{ net_admin | ipaddr_index('3') }}
  41 -    opnfv_infra_maas_pxe_start_address: {{ net_admin | ipaddr_index('5') }}
  42 -    opnfv_infra_maas_pxe_end_address: {{ net_admin | ipaddr_index('250') }}
  43 +    opnfv_infra_maas_pxe_start_address: {{ net_admin | ipaddr_index('4') }}
  44 +    opnfv_infra_maas_pxe_end_address: {{ net_admin | ipaddr_index('100') }}
  45
  46      opnfv_openstack_gateway_node01_address: {{ net_mgmt | ipaddr_index('124') }}
  47      opnfv_openstack_gateway_node02_address: {{ net_mgmt | ipaddr_index('125') }}