diff options
Diffstat (limited to 'mcp')
| -rw-r--r-- | mcp/patches/Makefile | 1 | ||||
| -rw-r--r-- | mcp/patches/pharos/0001-Add-IDF-mappings-to-installer-adapter.patch | 2 | ||||
| -rw-r--r-- | mcp/patches/pharos/0002-PDF-generate_config-Fix-abspath-for-j-arg.patch | 39 | ||||
| -rw-r--r-- | mcp/patches/pharos/0002-extend-public-gateway-support.patch (renamed from mcp/patches/pharos/0006-extend-public-gateway-support.patch) | 6 | ||||
| -rw-r--r-- | mcp/patches/pharos/0003-IPMI-Trim-netmask-from-IP-passed-to-MaaS.patch | 63 | ||||
| -rw-r--r-- | mcp/patches/pharos/0004-Use-PXE-interface-index-from-net_config.patch | 48 | ||||
| -rw-r--r-- | mcp/patches/pharos/0005-Re-assign-mgmt-network-to-proxy-nodes.patch | 30 | ||||
| m--------- | mcp/scripts/pharos | 0 |
8 files changed, 5 insertions, 184 deletions
diff --git a/mcp/patches/Makefile b/mcp/patches/Makefile index 5814e7fe8..be3eb9ee5 100644 --- a/mcp/patches/Makefile +++ b/mcp/patches/Makefile @@ -59,6 +59,7 @@ sub: .cachefuelinfo patches-export: sub @git submodule -q foreach ' \ SUB_DIR=${F_PATCH_DIR}/$$name; \ + rm -rf $$SUB_DIR/*; \ git tag | awk "!/root/ && /${F_OPNFV_TAG}-fuel/" | while read F_TAG; do \ SUB_FEATURE=`dirname $${F_TAG#${F_OPNFV_TAG}-fuel/}`; \ echo "`tput setaf 2`-- exporting $$name ($$F_TAG)`tput sgr0`"; \ diff --git a/mcp/patches/pharos/0001-Add-IDF-mappings-to-installer-adapter.patch b/mcp/patches/pharos/0001-Add-IDF-mappings-to-installer-adapter.patch index 30b52af9d..4c3693bf5 100644 --- a/mcp/patches/pharos/0001-Add-IDF-mappings-to-installer-adapter.patch +++ b/mcp/patches/pharos/0001-Add-IDF-mappings-to-installer-adapter.patch @@ -16,7 +16,7 @@ Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com> 1 file changed, 7 insertions(+) diff --git a/config/installers/fuel/pod_config.yml.j2 b/config/installers/fuel/pod_config.yml.j2 -index c2f1403..19e5d0d 100644 +index 28c0b47..abded17 100644 --- a/config/installers/fuel/pod_config.yml.j2 +++ b/config/installers/fuel/pod_config.yml.j2 @@ -26,6 +26,13 @@ diff --git a/mcp/patches/pharos/0002-PDF-generate_config-Fix-abspath-for-j-arg.patch b/mcp/patches/pharos/0002-PDF-generate_config-Fix-abspath-for-j-arg.patch deleted file mode 100644 index da6e2166b..000000000 --- a/mcp/patches/pharos/0002-PDF-generate_config-Fix-abspath-for-j-arg.patch +++ /dev/null @@ -1,39 +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 -:::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::: -From: Alexandru Avadanii <Alexandru.Avadanii@enea.com> -Date: Tue, 17 Oct 2017 18:21:07 +0200 -Subject: [PATCH] PDF: generate_config: Fix abspath for '-j' arg - -Change-Id: I8a9076e7965bfd2bee7d298eb8e3b11e62ae66e7 -Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com> ---- - config/utils/generate_config.py | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git a/config/utils/generate_config.py b/config/utils/generate_config.py -index 18af98d..22a27d3 100755 ---- a/config/utils/generate_config.py -+++ b/config/utils/generate_config.py -@@ -38,7 +38,7 @@ def dpkg_arch(arch, to_dpkg=True): - else: - return ARCH_DPKG_TABLE[arch] - --ENV = Environment(loader=FileSystemLoader('./')) -+ENV = Environment(loader=FileSystemLoader(os.path.dirname(ARGS.jinja2))) - ENV.filters['ipaddr_index'] = ipaddr_index - ENV.filters['dpkg_arch'] = dpkg_arch - -@@ -56,6 +56,6 @@ if os.path.exists(IDF_PATH): - # print(DICT) - - # Render template and print generated conf to console --TEMPLATE = ENV.get_template(ARGS.jinja2) -+TEMPLATE = ENV.get_template(os.path.basename(ARGS.jinja2)) - #pylint: disable=superfluous-parens - print(TEMPLATE.render(conf=DICT)) diff --git a/mcp/patches/pharos/0006-extend-public-gateway-support.patch b/mcp/patches/pharos/0002-extend-public-gateway-support.patch index d7b6ae77e..240f4a09b 100644 --- a/mcp/patches/pharos/0006-extend-public-gateway-support.patch +++ b/mcp/patches/pharos/0002-extend-public-gateway-support.patch @@ -19,7 +19,7 @@ Signed-off-by: Guillermo Herrero <guillermo.herrero@enea.com> 1 file changed, 10 insertions(+) diff --git a/config/installers/fuel/pod_config.yml.j2 b/config/installers/fuel/pod_config.yml.j2 -index bd815d5..e42e3d5 100644 +index abded17..cda5fc0 100644 --- a/config/installers/fuel/pod_config.yml.j2 +++ b/config/installers/fuel/pod_config.yml.j2 @@ -8,6 +8,9 @@ @@ -43,7 +43,7 @@ index bd815d5..e42e3d5 100644 --- parameters: _param: -@@ -55,6 +62,8 @@ parameters: +@@ -53,6 +60,8 @@ parameters: opnfv_openstack_proxy_address: {{ net_public | ipaddr_index('103') }} opnfv_openstack_proxy_node01_address: {{ net_public | ipaddr_index('104') }} opnfv_openstack_proxy_node02_address: {{ net_public | ipaddr_index('105') }} @@ -52,7 +52,7 @@ index bd815d5..e42e3d5 100644 opnfv_openstack_control_address: {{ net_mgmt | ipaddr_index('10') }} opnfv_openstack_control_node01_address: {{ net_mgmt | ipaddr_index('11') }} opnfv_openstack_control_node02_address: {{ net_mgmt | ipaddr_index('12') }} -@@ -85,6 +94,7 @@ parameters: +@@ -83,6 +92,7 @@ parameters: opnfv_opendaylight_server_node01_single_address: {{ net_mgmt | ipaddr_index('111') }} diff --git a/mcp/patches/pharos/0003-IPMI-Trim-netmask-from-IP-passed-to-MaaS.patch b/mcp/patches/pharos/0003-IPMI-Trim-netmask-from-IP-passed-to-MaaS.patch deleted file mode 100644 index 2684eda4c..000000000 --- a/mcp/patches/pharos/0003-IPMI-Trim-netmask-from-IP-passed-to-MaaS.patch +++ /dev/null @@ -1,63 +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 -:::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::: -From: Alexandru Avadanii <Alexandru.Avadanii@enea.com> -Date: Fri, 27 Oct 2017 19:17:37 +0200 -Subject: [PATCH] IPMI: Trim netmask from IP passed to MaaS - -Change-Id: I683788846a716f1af6ae8aa3b25cc3a866ae0045 -Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com> ---- - config/installers/fuel/pod_config.yml.j2 | 10 +++++----- - 1 file changed, 5 insertions(+), 5 deletions(-) - -diff --git a/config/installers/fuel/pod_config.yml.j2 b/config/installers/fuel/pod_config.yml.j2 -index 19e5d0d..890b380 100644 ---- a/config/installers/fuel/pod_config.yml.j2 -+++ b/config/installers/fuel/pod_config.yml.j2 -@@ -90,35 +90,35 @@ parameters: - opnfv_net_tenant_vlan: {{ vlan_private }} - - opnfv_maas_node01_architecture: '{{ conf['nodes'][0]['node']['arch'] | dpkg_arch }}/generic' -- opnfv_maas_node01_power_address: {{ conf['nodes'][0]['remote_management']['address'] }} -+ opnfv_maas_node01_power_address: {{ conf['nodes'][0]['remote_management']['address'].rsplit('/')[0]}} - opnfv_maas_node01_power_type: {{ conf['nodes'][0]['remote_management']['type'] }} - opnfv_maas_node01_power_user: {{ conf['nodes'][0]['remote_management']['user'] }} - opnfv_maas_node01_power_password: {{ conf['nodes'][0]['remote_management']['pass'] }} - opnfv_maas_node01_interface_mac: '{{ conf['nodes'][0]['interfaces'][pxe_interface]['mac_address'] }}' - - opnfv_maas_node02_architecture: '{{ conf['nodes'][1]['node']['arch'] | dpkg_arch }}/generic' -- opnfv_maas_node02_power_address: {{ conf['nodes'][1]['remote_management']['address'] }} -+ opnfv_maas_node02_power_address: {{ conf['nodes'][1]['remote_management']['address'].rsplit('/')[0] }} - opnfv_maas_node02_power_type: {{ conf['nodes'][1]['remote_management']['type'] }} - opnfv_maas_node02_power_user: {{ conf['nodes'][1]['remote_management']['user'] }} - opnfv_maas_node02_power_password: {{ conf['nodes'][1]['remote_management']['pass'] }} - opnfv_maas_node02_interface_mac: '{{ conf['nodes'][1]['interfaces'][pxe_interface]['mac_address'] }}' - - opnfv_maas_node03_architecture: '{{ conf['nodes'][2]['node']['arch'] | dpkg_arch }}/generic' -- opnfv_maas_node03_power_address: {{ conf['nodes'][2]['remote_management']['address'] }} -+ opnfv_maas_node03_power_address: {{ conf['nodes'][2]['remote_management']['address'].rsplit('/')[0] }} - opnfv_maas_node03_power_type: {{ conf['nodes'][2]['remote_management']['type'] }} - opnfv_maas_node03_power_user: {{ conf['nodes'][2]['remote_management']['user'] }} - opnfv_maas_node03_power_password: {{ conf['nodes'][2]['remote_management']['pass'] }} - opnfv_maas_node03_interface_mac: '{{ conf['nodes'][2]['interfaces'][pxe_interface]['mac_address'] }}' - - opnfv_maas_node04_architecture: '{{ conf['nodes'][3]['node']['arch'] | dpkg_arch }}/generic' -- opnfv_maas_node04_power_address: {{ conf['nodes'][3]['remote_management']['address'] }} -+ opnfv_maas_node04_power_address: {{ conf['nodes'][3]['remote_management']['address'].rsplit('/')[0] }} - opnfv_maas_node04_power_type: {{ conf['nodes'][3]['remote_management']['type'] }} - opnfv_maas_node04_power_user: {{ conf['nodes'][3]['remote_management']['user'] }} - opnfv_maas_node04_power_password: {{ conf['nodes'][3]['remote_management']['pass'] }} - opnfv_maas_node04_interface_mac: '{{ conf['nodes'][3]['interfaces'][pxe_interface]['mac_address'] }}' - - opnfv_maas_node05_architecture: '{{ conf['nodes'][4]['node']['arch'] | dpkg_arch }}/generic' -- opnfv_maas_node05_power_address: {{ conf['nodes'][4]['remote_management']['address'] }} -+ opnfv_maas_node05_power_address: {{ conf['nodes'][4]['remote_management']['address'].rsplit('/')[0] }} - opnfv_maas_node05_power_type: {{ conf['nodes'][4]['remote_management']['type'] }} - opnfv_maas_node05_power_user: {{ conf['nodes'][4]['remote_management']['user'] }} - opnfv_maas_node05_power_password: {{ conf['nodes'][4]['remote_management']['pass'] }} diff --git a/mcp/patches/pharos/0004-Use-PXE-interface-index-from-net_config.patch b/mcp/patches/pharos/0004-Use-PXE-interface-index-from-net_config.patch deleted file mode 100644 index b0529a825..000000000 --- a/mcp/patches/pharos/0004-Use-PXE-interface-index-from-net_config.patch +++ /dev/null @@ -1,48 +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 -:::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::: -From: Alexandru Avadanii <Alexandru.Avadanii@enea.com> -Date: Fri, 27 Oct 2017 21:00:03 +0200 -Subject: [PATCH] Use PXE interface index from net_config - -Instead of assuming the PXE network interface is always the first, -read its index from 'net_config' section. - -Change-Id: I0b4e9fc89297f4bd718a2e5336746917347c89e1 -Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com> ---- - config/installers/fuel/pod_config.yml.j2 | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git a/config/installers/fuel/pod_config.yml.j2 b/config/installers/fuel/pod_config.yml.j2 -index 890b380..abded17 100644 ---- a/config/installers/fuel/pod_config.yml.j2 -+++ b/config/installers/fuel/pod_config.yml.j2 -@@ -8,6 +8,7 @@ - {%- if conf.net_config.public.dns is defined -%} - {%- set dns_public = conf['net_config']['public']['dns'] -%} - {%- endif -%} -+ {%- set pxe_interface = conf['net_config']['admin']['interface'] -%} - {%- else -%} - {%- set net_admin = '192.168.11.0' -%} - {%- set net_mgmt = '172.16.10.0' -%} -@@ -15,13 +16,12 @@ - {%- set net_public = '172.30.10.0' -%} - {%- set vlan_mgmt = '300' -%} - {%- set vlan_private = '1000' -%} -+ {%- set pxe_interface = 0 -%} - {%- endif -%} - - {%- if dns_public is not defined -%} - {%- set dns_public = [ '8.8.8.8', '8.8.4.4' ] -%} - {%- endif -%} -- --{%- set pxe_interface = 0 -%} - --- - parameters: - _param: diff --git a/mcp/patches/pharos/0005-Re-assign-mgmt-network-to-proxy-nodes.patch b/mcp/patches/pharos/0005-Re-assign-mgmt-network-to-proxy-nodes.patch deleted file mode 100644 index fe7c3c79c..000000000 --- a/mcp/patches/pharos/0005-Re-assign-mgmt-network-to-proxy-nodes.patch +++ /dev/null @@ -1,30 +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 -:::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::: -From: Alexandru Avadanii <Alexandru.Avadanii@enea.com> -Date: Mon, 13 Nov 2017 21:09:33 +0100 -Subject: [PATCH] Re-assign mgmt network to proxy nodes - -Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com> ---- - config/installers/fuel/pod_config.yml.j2 | 2 ++ - 1 file changed, 2 insertions(+) - -diff --git a/config/installers/fuel/pod_config.yml.j2 b/config/installers/fuel/pod_config.yml.j2 -index abded17..bd815d5 100644 ---- a/config/installers/fuel/pod_config.yml.j2 -+++ b/config/installers/fuel/pod_config.yml.j2 -@@ -50,6 +50,8 @@ parameters: - opnfv_openstack_gateway_node01_tenant_address: {{ net_private | ipaddr_index('6') }} - opnfv_openstack_gateway_node02_tenant_address: {{ net_private | ipaddr_index('7') }} - opnfv_openstack_gateway_node03_tenant_address: {{ net_private | ipaddr_index('9') }} -+ opnfv_openstack_proxy_node01_control_address: {{ net_mgmt | ipaddr_index('81') }} -+ opnfv_openstack_proxy_node02_control_address: {{ net_mgmt | ipaddr_index('82') }} - opnfv_openstack_proxy_address: {{ net_public | ipaddr_index('103') }} - opnfv_openstack_proxy_node01_address: {{ net_public | ipaddr_index('104') }} - opnfv_openstack_proxy_node02_address: {{ net_public | ipaddr_index('105') }} diff --git a/mcp/scripts/pharos b/mcp/scripts/pharos -Subproject af9e2a904ad7f1e44ba26cf9cebbc8bb3f7d884 +Subproject f1bbaf60dec3f1f1c1958a7711e432594d671af |