diff options
| author |   Alexandru Avadanii <Alexandru.Avadanii@enea.com> | 2018-01-29 23:52:57 +0100 |
|---|---|---|
| committer | Alexandru Avadanii <Alexandru.Avadanii@enea.com> | 2018-01-29 23:55:38 +0100 |
| commit | a5aa1b1a42bd9d067e535636e86cd5189d3fef53 (patch) | |
| tree | aeaff7e62f69df9a833235f82a97d0cf9c390397 /patches/opnfv-fuel | |
| parent | b8a5f2593d1c9a920e41bedec9ee3467200bedea (diff) | |
u/fuel: Bump & rebase for ODL fix after Pike mv
Upstream changed salt-formula-neutron to have custom, dedicated
configuration for Pike, silently breaking our ODL support.
Change-Id: Iaccfed65132699ca7d0c0bb5eee5c2ca13b1ce28
Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
Diffstat (limited to 'patches/opnfv-fuel')
3 files changed, 4 insertions, 4 deletions
diff --git a/patches/opnfv-fuel/0003-network-public-Use-arm-virtual2-POD-config.patch b/patches/opnfv-fuel/0003-network-public-Use-arm-virtual2-POD-config.patch index e0bc27d6..02a079f0 100644 --- a/patches/opnfv-fuel/0003-network-public-Use-arm-virtual2-POD-config.patch +++ b/patches/opnfv-fuel/0003-network-public-Use-arm-virtual2-POD-config.patch @@ -60,7 +60,7 @@ index 222a072..9bbc0ce 100755 # Print openstack status and setup network salt -C 'I@nova:controller and *01*' cmd.run ". /root/keystonercv3; \ diff --git a/mcp/reclass/classes/cluster/virtual-mcp-pike-common-noha/infra/config.yml b/mcp/reclass/classes/cluster/virtual-mcp-pike-common-noha/infra/config.yml -index 7e3a494..3a240b0 100644 +index 576925e..8530b10 100644 --- a/mcp/reclass/classes/cluster/virtual-mcp-pike-common-noha/infra/config.yml +++ b/mcp/reclass/classes/cluster/virtual-mcp-pike-common-noha/infra/config.yml @@ -61,9 +61,9 @@ parameters: @@ -99,7 +99,7 @@ index 8e38ff8..d7bf017 100644 - external_address: 10.16.0.110 + external_address: 10.0.9.110 diff --git a/mcp/reclass/classes/cluster/virtual-mcp-pike-ovs-dpdk-noha/infra/config.yml b/mcp/reclass/classes/cluster/virtual-mcp-pike-ovs-dpdk-noha/infra/config.yml -index e80c442..1df99b4 100644 +index abe13ef..ba3a6fc 100644 --- a/mcp/reclass/classes/cluster/virtual-mcp-pike-ovs-dpdk-noha/infra/config.yml +++ b/mcp/reclass/classes/cluster/virtual-mcp-pike-ovs-dpdk-noha/infra/config.yml @@ -25,4 +25,4 @@ parameters: diff --git a/patches/opnfv-fuel/0005-maas-Add-curtin_userdata_arm64_generic_xenial.patch b/patches/opnfv-fuel/0005-maas-Add-curtin_userdata_arm64_generic_xenial.patch index 30280b3c..85ee6b56 100644 --- a/patches/opnfv-fuel/0005-maas-Add-curtin_userdata_arm64_generic_xenial.patch +++ b/patches/opnfv-fuel/0005-maas-Add-curtin_userdata_arm64_generic_xenial.patch @@ -75,7 +75,7 @@ index 34d913a..01e3224 100644 /usr/share/salt-formulas/env: 0013-dpdk-Support-ovs-bridge-tagging.patch +/usr/share/salt-formulas/env: 0101-maas-Add-curtin_userdata_arm64_generic_xenial.patch diff --git a/mcp/reclass/classes/cluster/baremetal-mcp-pike-common-ha/infra/maas.yml b/mcp/reclass/classes/cluster/baremetal-mcp-pike-common-ha/infra/maas.yml -index da28abf..65e6557 100644 +index 3bf87dc..4954559 100644 --- a/mcp/reclass/classes/cluster/baremetal-mcp-pike-common-ha/infra/maas.yml +++ b/mcp/reclass/classes/cluster/baremetal-mcp-pike-common-ha/infra/maas.yml @@ -40,6 +40,42 @@ parameters: diff --git a/patches/opnfv-fuel/0014-Revert-Get-back-to-the-GA-kernel.patch b/patches/opnfv-fuel/0014-Revert-Get-back-to-the-GA-kernel.patch index 5b205113..cda9f2ae 100644 --- a/patches/opnfv-fuel/0014-Revert-Get-back-to-the-GA-kernel.patch +++ b/patches/opnfv-fuel/0014-Revert-Get-back-to-the-GA-kernel.patch @@ -16,7 +16,7 @@ This reverts commit d06bcfb72c44b507c3efee4de00f415869f48450. 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mcp/reclass/classes/cluster/baremetal-mcp-pike-common-ha/infra/maas.yml b/mcp/reclass/classes/cluster/baremetal-mcp-pike-common-ha/infra/maas.yml -index 65e6557..8794b85 100644 +index 4954559..d5528e3 100644 --- a/mcp/reclass/classes/cluster/baremetal-mcp-pike-common-ha/infra/maas.yml +++ b/mcp/reclass/classes/cluster/baremetal-mcp-pike-common-ha/infra/maas.yml @@ -24,7 +24,7 @@ parameters: |