diff options
Diffstat (limited to 'mcp/patches')
| -rw-r--r-- | mcp/patches/0015-Set-ovs-bridges-as-L3-interfaces.patch | 8 | ||||
| -rw-r--r-- | mcp/patches/reclass-system-salt-model/0003-system.repo-Pin-glusterfs-with-higher-prio.patch | 33 |
2 files changed, 40 insertions, 1 deletions
diff --git a/mcp/patches/0015-Set-ovs-bridges-as-L3-interfaces.patch b/mcp/patches/0015-Set-ovs-bridges-as-L3-interfaces.patch index d840e9f80..a7b366b94 100644 --- a/mcp/patches/0015-Set-ovs-bridges-as-L3-interfaces.patch +++ b/mcp/patches/0015-Set-ovs-bridges-as-L3-interfaces.patch @@ -17,7 +17,7 @@ new file mode 100644 index 0000000..c609e45 --- /dev/null +++ b/linux/files/ovs_bridge -@@ -0,0 +1,13 @@ +@@ -0,0 +1,19 @@ +auto {{ bridge_name }} +allow-ovs {{ bridge_name }} +iface {{ bridge_name }} inet static @@ -31,6 +31,12 @@ index 0000000..c609e45 + {%- if bridge.datapath_type is defined %} + ovs_extra set Bridge ${IFACE} datapath_type={{ bridge.datapath_type }} + {%- endif %} ++ {%- if bridge.gateway is defined %} ++ gateway {{ bridge.gateway }} ++ {%- endif %} ++ {%- if bridge.name_servers is defined %} ++ dns-nameservers {{ bridge.name_servers | join(' ') }} ++ {%- endif %} diff --git a/linux/files/ovs_port b/linux/files/ovs_port index 222ca8e..efb0307 100644 --- a/linux/files/ovs_port diff --git a/mcp/patches/reclass-system-salt-model/0003-system.repo-Pin-glusterfs-with-higher-prio.patch b/mcp/patches/reclass-system-salt-model/0003-system.repo-Pin-glusterfs-with-higher-prio.patch new file mode 100644 index 000000000..91219f6fa --- /dev/null +++ b/mcp/patches/reclass-system-salt-model/0003-system.repo-Pin-glusterfs-with-higher-prio.patch @@ -0,0 +1,33 @@ +:::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::: +: 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, 18 Jun 2018 15:53:31 +0200 +Subject: [PATCH] system.repo: Pin glusterfs with higher prio + +When both glusterfs PPA repo and MCP repos are used on the same node, +the MCP repos used to take priority and install a predefined version +no matter the configuration for GlusterFS PPA. + +Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com> +--- + linux/system/repo/glusterfs.yml | 4 ++++ + 1 file changed, 4 insertions(+) + +diff --git a/linux/system/repo/glusterfs.yml b/linux/system/repo/glusterfs.yml +index fb331f0f..71d063ac 100644 +--- a/linux/system/repo/glusterfs.yml ++++ b/linux/system/repo/glusterfs.yml +@@ -9,3 +9,7 @@ parameters: + architectures: amd64 + key_id: 3FE869A9 + key_server: keyserver.ubuntu.com ++ pin: ++ - package: '*' ++ pin: release o=LP-PPA-gluster-glusterfs-${_param:glusterfs_version} ++ priority: 1100 |