diff options
| author |   Alexandru Avadanii <Alexandru.Avadanii@enea.com> | 2017-12-07 21:02:02 +0100 |
|---|---|---|
| committer | Alexandru Avadanii <Alexandru.Avadanii@enea.com> | 2017-12-07 22:30:43 +0100 |
| commit | fbea9fae7a16f1375f7413ccd46146b015fc87ff (patch) | |
| tree | 96487395efd167ace4056617a6b3590775708d3f /mcp/patches/pharos/0005-Re-assign-mgmt-network-to-proxy-nodes.patch | |
| parent | f8898b437e3ff5e8c64ff17441377f4cbe1a7a33 (diff) | |
patches: pharos: Drop patches merged upstream
Also, remove redundant pharos patch that adds prx mgmt IPs:
- "Re-assign mgmt network to proxy nodes"
as those values are set already (to different values!) by patch:
+ "extend public gateway support"
While at it, `make patches-export` should clean the patch dir first.
Change-Id: Ice106e5d48c7b4cd90ffc6af7441199034d4f546
Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
Diffstat (limited to 'mcp/patches/pharos/0005-Re-assign-mgmt-network-to-proxy-nodes.patch')
| -rw-r--r-- | mcp/patches/pharos/0005-Re-assign-mgmt-network-to-proxy-nodes.patch | 30 |
1 files changed, 0 insertions, 30 deletions
diff --git a/mcp/patches/pharos/0005-Re-assign-mgmt-network-to-proxy-nodes.patch b/mcp/patches/pharos/0005-Re-assign-mgmt-network-to-proxy-nodes.patch deleted file mode 100644 index fe7c3c79c..000000000 --- a/mcp/patches/pharos/0005-Re-assign-mgmt-network-to-proxy-nodes.patch +++ /dev/null @@ -1,30 +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: Alexandru Avadanii <Alexandru.Avadanii@enea.com> -Date: Mon, 13 Nov 2017 21:09:33 +0100 -Subject: [PATCH] Re-assign mgmt network to proxy nodes - -Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com> ---- - config/installers/fuel/pod_config.yml.j2 | 2 ++ - 1 file changed, 2 insertions(+) - -diff --git a/config/installers/fuel/pod_config.yml.j2 b/config/installers/fuel/pod_config.yml.j2 -index abded17..bd815d5 100644 ---- a/config/installers/fuel/pod_config.yml.j2 -+++ b/config/installers/fuel/pod_config.yml.j2 -@@ -50,6 +50,8 @@ parameters: - opnfv_openstack_gateway_node01_tenant_address: {{ net_private | ipaddr_index('6') }} - opnfv_openstack_gateway_node02_tenant_address: {{ net_private | ipaddr_index('7') }} - opnfv_openstack_gateway_node03_tenant_address: {{ net_private | ipaddr_index('9') }} -+ opnfv_openstack_proxy_node01_control_address: {{ net_mgmt | ipaddr_index('81') }} -+ opnfv_openstack_proxy_node02_control_address: {{ net_mgmt | ipaddr_index('82') }} - 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') }} |