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-08 16:04:55 +0000 |
commit | 8007028f48b57243c428cdc9ebbbc168c2e373cc (patch) | |
tree | edb25210c8c460c9343435fbeba458c693d5619e /mcp/patches/pharos/0001-Add-IDF-mappings-to-installer-adapter.patch | |
parent | e770336f88637e6c0b51ba230b54837f9258414d (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>
(cherry picked from commit fbea9fae7a16f1375f7413ccd46146b015fc87ff)
Diffstat (limited to 'mcp/patches/pharos/0001-Add-IDF-mappings-to-installer-adapter.patch')
-rw-r--r-- | mcp/patches/pharos/0001-Add-IDF-mappings-to-installer-adapter.patch | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/mcp/patches/pharos/0001-Add-IDF-mappings-to-installer-adapter.patch b/mcp/patches/pharos/0001-Add-IDF-mappings-to-installer-adapter.patch index 30b52af9d..4c3693bf5 100644 --- a/mcp/patches/pharos/0001-Add-IDF-mappings-to-installer-adapter.patch +++ b/mcp/patches/pharos/0001-Add-IDF-mappings-to-installer-adapter.patch @@ -16,7 +16,7 @@ Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com> 1 file changed, 7 insertions(+) diff --git a/config/installers/fuel/pod_config.yml.j2 b/config/installers/fuel/pod_config.yml.j2 -index c2f1403..19e5d0d 100644 +index 28c0b47..abded17 100644 --- a/config/installers/fuel/pod_config.yml.j2 +++ b/config/installers/fuel/pod_config.yml.j2 @@ -26,6 +26,13 @@ |