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/0003-network-public-Use-arm-virtual2-POD-config.patch | |
| 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/0003-network-public-Use-arm-virtual2-POD-config.patch')
| -rw-r--r-- | patches/opnfv-fuel/0003-network-public-Use-arm-virtual2-POD-config.patch | 4 |
1 files changed, 2 insertions, 2 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: |