summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAlexandru Avadanii <Alexandru.Avadanii@enea.com>2018-06-04 15:57:06 +0000
committerGerrit Code Review <gerrit@opnfv.org>2018-06-04 15:57:06 +0000
commit05ee61db7286648062a4acec3c665192504c8464 (patch)
tree6d0bde99f8988d566a9d2b3bfd601a67cc071ad8
parent9d0cc8d93c6d9a90062e5418f739b7e53e25a039 (diff)
parentf0819335628c5cf2bcb812291bb502b438866ae0 (diff)
Merge "[patch] Drop upstream reclass formula patches" into stable/fraser
-rw-r--r--mcp/patches/0012-routes-Skip-network-restart-on-noifupdown.patch37
-rw-r--r--mcp/patches/0014-reclass.storage.node-Merge-duplicate-nodes.patch44
-rw-r--r--mcp/patches/patches.list1
-rw-r--r--mcp/patches/patches_init.list8
-rw-r--r--mcp/patches/scripts/0002-salt-master-init.sh-Apply-OPNFV-Fuel-patches.patch35
5 files changed, 0 insertions, 125 deletions
diff --git a/mcp/patches/0012-routes-Skip-network-restart-on-noifupdown.patch b/mcp/patches/0012-routes-Skip-network-restart-on-noifupdown.patch
deleted file mode 100644
index fb42512ea..000000000
--- a/mcp/patches/0012-routes-Skip-network-restart-on-noifupdown.patch
+++ /dev/null
@@ -1,37 +0,0 @@
-::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::
-: Copyright (c) 2018 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, 8 Jan 2018 05:09:11 +0100
-Subject: [PATCH] routes: Skip network restart on 'noifupdown'
-
-Previously, setting up routes did not allow passing 'require_reboot',
-so each route change would lead to a networking service restart,
-rendering interface configuration options like 'noifupdown' useless.
-Allow disabling network restart per-interface using the existing
-'noifupdown' option.
-
-Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
----
- linux/network/interface.sls | 3 +++
- 1 file changed, 3 insertions(+)
-
-diff --git a/linux/network/interface.sls b/linux/network/interface.sls
-index 921ceac..6ebc670 100644
---- a/linux/network/interface.sls
-+++ b/linux/network/interface.sls
-@@ -338,6 +338,9 @@ linux_network_{{ interface_name }}_routes:
- gateway: {{ route.gateway }}
- {%- endif %}
- {%- endfor %}
-+ {%- if interface.noifupdown is defined %}
-+ - require_reboot: {{ interface.noifupdown }}
-+ {%- endif %}
-
- {%- endif %}
-
diff --git a/mcp/patches/0014-reclass.storage.node-Merge-duplicate-nodes.patch b/mcp/patches/0014-reclass.storage.node-Merge-duplicate-nodes.patch
deleted file mode 100644
index a9d5b6589..000000000
--- a/mcp/patches/0014-reclass.storage.node-Merge-duplicate-nodes.patch
+++ /dev/null
@@ -1,44 +0,0 @@
-::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::
-: Copyright (c) 2018 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: Sun, 03 Dec 2017 22:03:01 +0200
-Subject: [PATCH] reclass.storage.node: Merge duplicate nodes
-
-Reclass does not support duplicate nodes in top pillar, so merge all
-nodes with the same name into a single node, inheriting classes from
-all instances.
-
-This allows using multiple "system.reclass.storage.system.*_cluster"
-classes for the same node, based on re-using the name (hostname).
-
-NOTE: defaults.merge module does not merge lists (e.g. for classes),
-so handle that case separately.
-
-Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
----
-
-diff --git a/reclass/storage/node.sls b/reclass/storage/node.sls
---- a/reclass/storage/node.sls
-+++ b/reclass/storage/node.sls
-@@ -1,7 +1,15 @@
- {%- from "reclass/map.jinja" import storage with context %}
- {%- if storage.enabled %}
-
-+{%- set storage_by_name = {} %}
- {%- for node_name, node in storage.get('node', {}).iteritems() %}
-+{%- set new_node_name = node.get('name', node_name) %}
-+{%- set new_node = storage_by_name.get(new_node_name, {'classes': []}) %}
-+{%- do salt['defaults.merge'](node, {'classes': new_node.classes + node.classes}) %}
-+{%- do salt['defaults.merge'](storage_by_name, {new_node_name: node}) %}
-+{%- endfor %}
-+
-+{%- for node_name, node in storage_by_name.iteritems() %}
-
- {%- if node.repeat is defined %}
-
diff --git a/mcp/patches/patches.list b/mcp/patches/patches.list
index ce59395c5..b00a1d194 100644
--- a/mcp/patches/patches.list
+++ b/mcp/patches/patches.list
@@ -13,6 +13,5 @@
/usr/share/salt-formulas/env: 0008-Handle-extra-environment-variables.patch
/usr/share/salt-formulas/env: 0010-maas-region-allow-timeout-override.patch
/usr/share/salt-formulas/env: 0011-system.repo-Debian-Add-keyserver-proxy-support.patch
-/usr/share/salt-formulas/env: 0012-routes-Skip-network-restart-on-noifupdown.patch
/usr/share/salt-formulas/env: 0015-Set-ovs-bridges-as-L3-interfaces.patch
/usr/share/salt-formulas/env: 0016-Set-boot-source-selections.patch
diff --git a/mcp/patches/patches_init.list b/mcp/patches/patches_init.list
deleted file mode 100644
index 94488cf9a..000000000
--- a/mcp/patches/patches_init.list
+++ /dev/null
@@ -1,8 +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
-##############################################################################
-/usr/share/salt-formulas/env: 0014-reclass.storage.node-Merge-duplicate-nodes.patch
diff --git a/mcp/patches/scripts/0002-salt-master-init.sh-Apply-OPNFV-Fuel-patches.patch b/mcp/patches/scripts/0002-salt-master-init.sh-Apply-OPNFV-Fuel-patches.patch
deleted file mode 100644
index 6c7cbb6e8..000000000
--- a/mcp/patches/scripts/0002-salt-master-init.sh-Apply-OPNFV-Fuel-patches.patch
+++ /dev/null
@@ -1,35 +0,0 @@
-::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::
-: Copyright (c) 2018 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, 8 Dec 2017 20:30:46 +0100
-Subject: [PATCH] salt-master-init.sh: Apply OPNFV Fuel patches
-
-Some of Fuel@OPNFV patches need to be applied before the reclass
-storage.node state is ran for Salt Master, i.e. between installing
-salt-formula-* packages and configuring the Salt Master salt services.
-
-JIRA: FUEL-310
-
-Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
----
- salt-master-init.sh | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/salt-master-init.sh b/salt-master-init.sh
-index 343324c..a4ec138 100755
---- a/salt-master-init.sh
-+++ b/salt-master-init.sh
-@@ -284,6 +284,7 @@ options
- system_config
-
- saltmaster_bootstrap &&\
-+ /root/fuel/mcp/patches/patch.sh /root/fuel/mcp/patches/patches_init.list formulas &&\
- saltmaster_init &&\
-
- verify_salt_minions