summaryrefslogtreecommitdiffstats
path: root/mcp/patches
diff options
context:
space:
mode:
Diffstat (limited to 'mcp/patches')
-rw-r--r--mcp/patches/0007-network.interface-Fix-ifup-OVS-port-with-route.patch17
-rw-r--r--mcp/patches/reclass-system-salt-model/0003-Use-keystone-v3-endpoints-by-default.patch (renamed from mcp/patches/reclass-system-salt-model/0004-Use-keystone-v3-endpoints-by-default.patch)5
2 files changed, 16 insertions, 6 deletions
diff --git a/mcp/patches/0007-network.interface-Fix-ifup-OVS-port-with-route.patch b/mcp/patches/0007-network.interface-Fix-ifup-OVS-port-with-route.patch
index c36631aea..49b2b88cc 100644
--- a/mcp/patches/0007-network.interface-Fix-ifup-OVS-port-with-route.patch
+++ b/mcp/patches/0007-network.interface-Fix-ifup-OVS-port-with-route.patch
@@ -1,3 +1,11 @@
+::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::
+: 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: Sun, 31 Dec 2017 16:06:30 +0100
Subject: [PATCH] network.interface: Fix ifup OVS port with route
@@ -13,20 +21,19 @@ the OVS port in UP state, so `ifup` would fail.
Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
---
- linux/network/interface.sls | 4 ++++
- 1 file changed, 4 insertions(+)
+ linux/network/interface.sls | 2 ++
+ 1 file changed, 2 insertions(+)
diff --git a/linux/network/interface.sls b/linux/network/interface.sls
+index 921ceac..3bba64e 100644
--- a/linux/network/interface.sls
+++ b/linux/network/interface.sls
-@@ -146,6 +146,10 @@ ovs_port_up_{{ interface_name }}:
+@@ -146,6 +146,8 @@ ovs_port_up_{{ interface_name }}:
- file: ovs_port_{{ interface_name }}_line2
- openvswitch_bridge: ovs_bridge_{{ interface.bridge }}
- file: linux_interfaces_final_include
-+ {%- if interface.route is defined %}
+ - unless:
+ - ip link show {{ interface_name }} | grep -q '\<UP\>'
-+ {% endif %}
{%- endif %}
diff --git a/mcp/patches/reclass-system-salt-model/0004-Use-keystone-v3-endpoints-by-default.patch b/mcp/patches/reclass-system-salt-model/0003-Use-keystone-v3-endpoints-by-default.patch
index 73fafdb3f..6f860bcce 100644
--- a/mcp/patches/reclass-system-salt-model/0004-Use-keystone-v3-endpoints-by-default.patch
+++ b/mcp/patches/reclass-system-salt-model/0003-Use-keystone-v3-endpoints-by-default.patch
@@ -15,9 +15,12 @@ Mitaka release and will be removed in the "T" release.
The v3 API should be used instead.
Change-Id: I7e9a1b180f4e0ddb24ec72ed9f08c9e2580c7897
+---
+ keystone/client/single.yml | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/keystone/client/single.yml b/keystone/client/single.yml
-index ebf5b5ff..80077105 100644
+index ebf5b5f..8007710 100644
--- a/keystone/client/single.yml
+++ b/keystone/client/single.yml
@@ -4,7 +4,7 @@ classes: