diff options
Diffstat (limited to 'mcp/patches')
| -rw-r--r-- | mcp/patches/pharos/0002-Add-proxy-node-management-network-VIP.patch | 29 | ||||
| -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, 33 insertions, 1 deletions
diff --git a/mcp/patches/pharos/0002-Add-proxy-node-management-network-VIP.patch b/mcp/patches/pharos/0002-Add-proxy-node-management-network-VIP.patch new file mode 100644 index 000000000..346d7505c --- /dev/null +++ b/mcp/patches/pharos/0002-Add-proxy-node-management-network-VIP.patch @@ -0,0 +1,29 @@ +:::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::: +: 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, 1 Jan 2018 17:06:59 +0100 +Subject: [PATCH] Add proxy node management network VIP + +Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com> +--- + config/installers/fuel/pod_config.yml.j2 | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/config/installers/fuel/pod_config.yml.j2 b/config/installers/fuel/pod_config.yml.j2 +index f380535..2d0cdee 100644 +--- a/config/installers/fuel/pod_config.yml.j2 ++++ b/config/installers/fuel/pod_config.yml.j2 +@@ -61,6 +61,7 @@ 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') }} ++ opnfv_openstack_proxy_control_address: {{ net_mgmt | ipaddr_index('103') }} + opnfv_openstack_proxy_node01_control_address: {{ net_mgmt | ipaddr_index('104') }} + opnfv_openstack_proxy_node02_control_address: {{ net_mgmt | ipaddr_index('105') }} + opnfv_openstack_control_address: {{ net_mgmt | ipaddr_index('10') }} 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: |