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 +++++----- mcp/config/scenario/os-nosdn-nofeature-ha.yaml.j2 | 10 ++-------- mcp/config/scenario/os-nosdn-nofeature-noha.yaml | 4 ++-- mcp/config/scenario/os-nosdn-ovs-ha.yaml.j2 | 10 ++-------- mcp/config/scenario/os-nosdn-ovs-noha.yaml | 8 ++++---- mcp/config/scenario/os-odl-nofeature-ha.yaml.j2 | 10 ++-------- mcp/config/scenario/os-odl-nofeature-noha.yaml | 4 ++-- mcp/config/scenario/os-ovn-nofeature-ha.yaml.j2 | 10 ++-------- mcp/config/scenario/os-ovn-nofeature-noha.yaml | 8 ++++---- mcp/config/states/baremetal_init | 4 ---- mcp/config/states/virtual_control_plane | 3 --- 12 files changed, 27 insertions(+), 56 deletions(-) (limited to 'mcp/config') 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 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) #} diff --git a/mcp/config/scenario/os-nosdn-nofeature-noha.yaml b/mcp/config/scenario/os-nosdn-nofeature-noha.yaml index 1926d4977..5c5e77ceb 100644 --- a/mcp/config/scenario/os-nosdn-nofeature-noha.yaml +++ b/mcp/config/scenario/os-nosdn-nofeature-noha.yaml @@ -16,8 +16,8 @@ virtual: nodes: - cfg01 - ctl01 - - cmp01 - - cmp02 + - cmp001 + - cmp002 - gtw01 ctl01: vcpus: 4 diff --git a/mcp/config/scenario/os-nosdn-ovs-ha.yaml.j2 b/mcp/config/scenario/os-nosdn-ovs-ha.yaml.j2 index f43433014..f9ab7c3fb 100644 --- a/mcp/config/scenario/os-nosdn-ovs-ha.yaml.j2 +++ b/mcp/config/scenario/os-nosdn-ovs-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-dpdk-ha.local states: -{%- if cluster.has_baremetal_nodes %} +{%- if nm.cluster.has_baremetal_nodes %} - maas - baremetal_init {%- endif %} @@ -29,7 +23,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) #} diff --git a/mcp/config/scenario/os-nosdn-ovs-noha.yaml b/mcp/config/scenario/os-nosdn-ovs-noha.yaml index b44647c25..19e7946d1 100644 --- a/mcp/config/scenario/os-nosdn-ovs-noha.yaml +++ b/mcp/config/scenario/os-nosdn-ovs-noha.yaml @@ -17,17 +17,17 @@ virtual: nodes: - cfg01 - ctl01 - - cmp01 - - cmp02 + - cmp001 + - cmp002 - gtw01 ctl01: vcpus: 4 ram: 14336 gtw01: ram: 2048 - cmp01: + cmp001: vcpus: 4 ram: 8192 - cmp02: + cmp002: vcpus: 4 ram: 8192 diff --git a/mcp/config/scenario/os-odl-nofeature-ha.yaml.j2 b/mcp/config/scenario/os-odl-nofeature-ha.yaml.j2 index 9018adb87..c48f18c51 100644 --- a/mcp/config/scenario/os-odl-nofeature-ha.yaml.j2 +++ b/mcp/config/scenario/os-odl-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-odl-ha.local states: -{%- if cluster.has_baremetal_nodes %} +{%- if nm.cluster.has_baremetal_nodes %} - maas - baremetal_init {%- endif %} @@ -29,7 +23,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) #} diff --git a/mcp/config/scenario/os-odl-nofeature-noha.yaml b/mcp/config/scenario/os-odl-nofeature-noha.yaml index c61abd539..ec04ee87a 100644 --- a/mcp/config/scenario/os-odl-nofeature-noha.yaml +++ b/mcp/config/scenario/os-odl-nofeature-noha.yaml @@ -17,8 +17,8 @@ virtual: nodes: - cfg01 - ctl01 - - cmp01 - - cmp02 + - cmp001 + - cmp002 - gtw01 - odl01 ctl01: diff --git a/mcp/config/scenario/os-ovn-nofeature-ha.yaml.j2 b/mcp/config/scenario/os-ovn-nofeature-ha.yaml.j2 index 2f6bd86dc..218b5dece 100644 --- a/mcp/config/scenario/os-ovn-nofeature-ha.yaml.j2 +++ b/mcp/config/scenario/os-ovn-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-ovn-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) #} diff --git a/mcp/config/scenario/os-ovn-nofeature-noha.yaml b/mcp/config/scenario/os-ovn-nofeature-noha.yaml index d2015754e..7036340bf 100644 --- a/mcp/config/scenario/os-ovn-nofeature-noha.yaml +++ b/mcp/config/scenario/os-ovn-nofeature-noha.yaml @@ -15,14 +15,14 @@ virtual: nodes: - cfg01 - ctl01 - - cmp01 - - cmp02 + - cmp001 + - cmp002 ctl01: vcpus: 4 ram: 14336 - cmp01: + cmp001: vcpus: 5 ram: 8192 - cmp02: + cmp002: vcpus: 5 ram: 8192 diff --git a/mcp/config/states/baremetal_init b/mcp/config/states/baremetal_init index c02333894..6a44b788b 100755 --- a/mcp/config/states/baremetal_init +++ b/mcp/config/states/baremetal_init @@ -31,10 +31,6 @@ wait_for 5.0 "salt -C 'kvm* or cmp*' state.apply opnfv.route_wrapper" wait_for 5.0 "salt -C 'cmp*' state.apply linux.network" wait_for 30.0 "salt -C 'kvm* or cmp*' test.ping" -# disable dhcp offered routes on compute nodes -salt -C 'cmp*' file.write /etc/dhcp/dhclient-enter-hooks.d/no-default-route \ - args='unset new_routers' - salt -C 'kvm* or cmp*' system.reboot wait_for 90.0 "salt -C 'kvm* or cmp*' test.ping" diff --git a/mcp/config/states/virtual_control_plane b/mcp/config/states/virtual_control_plane index c391cfe6f..18e6d1cd2 100755 --- a/mcp/config/states/virtual_control_plane +++ b/mcp/config/states/virtual_control_plane @@ -54,9 +54,6 @@ wait_for 10.0 "salt -C 'E@^(?!cfg01|mas01|kvm|cmp00).*' state.apply linux,ntp" wait_for 10.0 "salt -C 'E@^(?!cfg01|mas01|kvm|cmp00).*' ssh.set_auth_key ${SUDO_USER} \ $(awk 'NR==1{print $2}' "$(eval echo "~${SUDO_USER}/.ssh/authorized_keys")")" -# Disable proxy dhcp routes after installation -salt -C 'prx*' file.write /etc/dhcp/dhclient-enter-hooks.d/no-default-route \ - args='unset new_routers' salt -C 'prx*' state.apply opnfv.route_wrapper salt -C 'prx*' system.reboot wait_for 30.0 "salt -C 'prx*' test.ping" -- cgit