From 33c017d388bf0f9cef5199c186bec5b4fd01f767 Mon Sep 17 00:00:00 2001
From: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
Date: Sat, 7 Apr 2018 05:27:48 +0200
Subject: Enforce static configuration instead of DHCP

- noha: 'accept_policy: open_mode' to align with ha scenarios;
- s/cmp01/cmp001/g to align all scenarios and allow code reuse;
- rename network params: s/dhcp/mcpcontrol/g, cleanup;
- computes XDF data: drop 'opnfv_*' layer of params, cleanup;
- local vPDF: add comments with default roles by node index;
- parameterize all netmasks;
- drop unused address/netmask for 'proto: manual' interfaces;
- virsh_net: cleanup definitions, remove hardcodes, align IP on
  jumpserver and DHCP range with MaaS for pxebr;
- maas: parameterize hardcoded '/24' cidr for PXE/admin, refactor
  maas.region.machines parameterization;
- merge <all-mcp-arch-common/infra/config_*pdf.yaml.j2> templates;
- move reclass.storage definitions of compute nodes to common dir;
- drop 'openstack_compute_*' reclass params in favor of expanding
  them via j2 directly in reclass.storage params;
- adopt `nm.cluster.has_*_nodes` where possible;
- obsolete `runtime.yml` from reclass model;
- refactor arch-specific reclass param selection;
- remove unused defaults in favor of mandatory IDF properties;
- noha: prepare for baremetal node support in cinder_lvm_devices;
- interfaces: add interface_mtu and 'noifupdown: true' everywhere;
- interfaces: use j2 macros to generate eth/vlan config;
- states cleanup: remove DHCP route disable workaround on prx/cmp;
- allow configuring NTP servers via:
  `idf.fuel.network.ntp_strata_host{1,2}`;
- ovs_bridge: Allow setting gateway, dns-nameservers
- apache: Adjust module list for novcp class inheritance;
- glusterfs PPA: pin with same prio of MCP repos for novcp scenario;

JIRA: FUEL-319
JIRA: FUEL-326
JIRA: FUEL-337

Change-Id: Ia6ad64ba8cade85a75fb22c9a2505decc3834360
Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
---
 mcp/config/scenario/os-nosdn-nofeature-ha.yaml.j2 | 10 ++--------
 1 file changed, 2 insertions(+), 8 deletions(-)

(limited to 'mcp/config/scenario/os-nosdn-nofeature-ha.yaml.j2')

diff --git a/mcp/config/scenario/os-nosdn-nofeature-ha.yaml.j2 b/mcp/config/scenario/os-nosdn-nofeature-ha.yaml.j2
index a6a641c63..26938262e 100644
--- a/mcp/config/scenario/os-nosdn-nofeature-ha.yaml.j2
+++ b/mcp/config/scenario/os-nosdn-nofeature-ha.yaml.j2
@@ -6,17 +6,11 @@
 # http://www.apache.org/licenses/LICENSE-2.0
 ##############################################################################
 {%- import 'net_map.j2' as nm with context %}
-{%- set cluster = {'has_virtual_nodes': False} %}
-{%- for node in conf.nodes %}
-  {%- if not cluster.has_virtual_nodes and node.node.type == 'baremetal' %}
-    {%- do cluster.update({'has_baremetal_nodes': True}) %}
-  {%- endif %}
-{%- endfor %}
 ---
 cluster:
   domain: mcp-ovs-ha.local
   states:
-{%- if cluster.has_baremetal_nodes %}
+{%- if nm.cluster.has_baremetal_nodes %}
     - maas
     - baremetal_init
 {%- endif %}
@@ -28,7 +22,7 @@ cluster:
 virtual:
   nodes:
     - cfg01
-{%- if cluster.has_baremetal_nodes %}
+{%- if nm.cluster.has_baremetal_nodes %}
     - mas01
 {%- endif %}
 {#- Most likely, controllers will always have the same type and number (3) #}
-- 
cgit 1.2.3-korg