From b1849f630a8de3dfce2e91fc375d9e901b90843b Mon Sep 17 00:00:00 2001 From: Alexandru Avadanii Date: Tue, 2 Jan 2018 19:11:24 +0100 Subject: [patch] Fix OVS ifup workaround Do not assume routes are on the same OVS port as the one currently being configured. Instead, apply the `unless` ifup condition for any OVS port. Change-Id: Iea8084f9e50401d300feb7ed16f90b430680cac5 Signed-off-by: Alexandru Avadanii --- ...rk.interface-Fix-ifup-OVS-port-with-route.patch | 17 +++++++---- ...0003-Use-keystone-v3-endpoints-by-default.patch | 34 ++++++++++++++++++++++ ...0004-Use-keystone-v3-endpoints-by-default.patch | 31 -------------------- 3 files changed, 46 insertions(+), 36 deletions(-) create mode 100644 mcp/patches/reclass-system-salt-model/0003-Use-keystone-v3-endpoints-by-default.patch delete mode 100644 mcp/patches/reclass-system-salt-model/0004-Use-keystone-v3-endpoints-by-default.patch 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 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 --- - 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 '\' -+ {% endif %} {%- endif %} diff --git a/mcp/patches/reclass-system-salt-model/0003-Use-keystone-v3-endpoints-by-default.patch b/mcp/patches/reclass-system-salt-model/0003-Use-keystone-v3-endpoints-by-default.patch new file mode 100644 index 000000000..6f860bcce --- /dev/null +++ b/mcp/patches/reclass-system-salt-model/0003-Use-keystone-v3-endpoints-by-default.patch @@ -0,0 +1,34 @@ +:::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::: +: 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: Michael Polenchuk +Date: Thu, 28 Dec 2017 12:49:33 +0400 +Subject: [PATCH] Use keystone v3 endpoints by default + +The v2.0 auth API has been already marked as deprecated in the +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 ebf5b5f..8007710 100644 +--- a/keystone/client/single.yml ++++ b/keystone/client/single.yml +@@ -4,7 +4,7 @@ classes: + - system.keystone.client.service.glance + - system.keystone.client.service.heat + - system.keystone.client.service.heat-cfn +-- system.keystone.client.service.keystone ++- system.keystone.client.service.keystone3 + - system.keystone.client.service.neutron + parameters: + linux: diff --git a/mcp/patches/reclass-system-salt-model/0004-Use-keystone-v3-endpoints-by-default.patch b/mcp/patches/reclass-system-salt-model/0004-Use-keystone-v3-endpoints-by-default.patch deleted file mode 100644 index 73fafdb3f..000000000 --- a/mcp/patches/reclass-system-salt-model/0004-Use-keystone-v3-endpoints-by-default.patch +++ /dev/null @@ -1,31 +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: Michael Polenchuk -Date: Thu, 28 Dec 2017 12:49:33 +0400 -Subject: [PATCH] Use keystone v3 endpoints by default - -The v2.0 auth API has been already marked as deprecated in the -Mitaka release and will be removed in the "T" release. -The v3 API should be used instead. - -Change-Id: I7e9a1b180f4e0ddb24ec72ed9f08c9e2580c7897 - -diff --git a/keystone/client/single.yml b/keystone/client/single.yml -index ebf5b5ff..80077105 100644 ---- a/keystone/client/single.yml -+++ b/keystone/client/single.yml -@@ -4,7 +4,7 @@ classes: - - system.keystone.client.service.glance - - system.keystone.client.service.heat - - system.keystone.client.service.heat-cfn --- system.keystone.client.service.keystone -+- system.keystone.client.service.keystone3 - - system.keystone.client.service.neutron - parameters: - linux: -- cgit 1.2.3-korg