From 33c017d388bf0f9cef5199c186bec5b4fd01f767 Mon Sep 17 00:00:00 2001 From: Alexandru Avadanii 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 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 --- mcp/config/labs/local/idf-virtual1.yaml | 2 ++ mcp/config/labs/local/virtual1.yaml | 10 +++++----- 2 files changed, 7 insertions(+), 5 deletions(-) (limited to 'mcp/config/labs/local') diff --git a/mcp/config/labs/local/idf-virtual1.yaml b/mcp/config/labs/local/idf-virtual1.yaml index 79a5fa044..402af9852 100644 --- a/mcp/config/labs/local/idf-virtual1.yaml +++ b/mcp/config/labs/local/idf-virtual1.yaml @@ -57,6 +57,8 @@ idf: private: ~ public: ~ network: + ntp_strata_host1: 1.se.pool.ntp.org + ntp_strata_host2: 0.se.pool.ntp.org node: # Ordered-list, index should be in sync with node index in PDF - interfaces: &interfaces diff --git a/mcp/config/labs/local/virtual1.yaml b/mcp/config/labs/local/virtual1.yaml index e46a2c6c9..b293b9775 100644 --- a/mcp/config/labs/local/virtual1.yaml +++ b/mcp/config/labs/local/virtual1.yaml @@ -58,7 +58,7 @@ jumphost: vlan: native ############################################################################## nodes: - - name: node-1 + - name: node-1 # noha ctl01 or ha (novcp) kvm01 node: &nodeparams # Fuel overrides certain params (e.g. cpus, mem) based on node role later type: virtual @@ -102,25 +102,25 @@ nodes: mac_address: "00:00:00:00:00:00" vlan: native ############################################################################ - - name: node-2 + - name: node-2 # noha gtw01 or ha (novcp) kvm02 node: *nodeparams disks: *disks remote_management: *remotemgmt interfaces: *interfaces ############################################################################ - - name: node-3 + - name: node-3 # noha odl01 / unused or ha (novcp) kvm02 node: *nodeparams disks: *disks remote_management: *remotemgmt interfaces: *interfaces ############################################################################ - - name: node-4 + - name: node-4 # cmp001 node: *nodeparams disks: *disks remote_management: *remotemgmt interfaces: *interfaces ############################################################################ - - name: node-5 + - name: node-5 # cmp002 node: *nodeparams disks: *disks remote_management: *remotemgmt -- cgit 1.2.3-korg