diff options
| author |   Alexandru Avadanii <Alexandru.Avadanii@enea.com> | 2017-10-06 19:09:48 +0200 |
|---|---|---|
| committer | Alexandru Avadanii <Alexandru.Avadanii@enea.com> | 2017-10-06 23:23:36 +0000 |
| commit | 9ce690257dd8cfa83ad68b8d8bfb2789caef3cb8 (patch) | |
| tree | 265d2d0ae179af3fca063171332184cd8990365f | |
| parent | 33f1ab7edc6ea39ec661ce74c3e642561d00a782 (diff) | |
u/fuel: Bump & rebase for ODL Nitrogen
Change-Id: I69688a0bf657564d440fc6d4d93f3f7c16818a90
Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
(cherry picked from commit 8ac5a461c90545aa06538f5376cc929b2297f19a)
4 files changed, 4 insertions, 4 deletions
diff --git a/patches/opnfv-fuel/0003-mcp-salt-formulas-opendaylight-AArch64-leveldb.patch b/patches/opnfv-fuel/0003-mcp-salt-formulas-opendaylight-AArch64-leveldb.patch index 31308fd4..4d53b63d 100644 --- a/patches/opnfv-fuel/0003-mcp-salt-formulas-opendaylight-AArch64-leveldb.patch +++ b/patches/opnfv-fuel/0003-mcp-salt-formulas-opendaylight-AArch64-leveldb.patch @@ -33,10 +33,10 @@ Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com> 1 file changed, 5 insertions(+) diff --git a/mcp/salt-formulas/opendaylight/server.sls b/mcp/salt-formulas/opendaylight/server.sls -index 8c6c3b2..a2236ae 100644 +index f7a9741..adb9e8a 100644 --- a/mcp/salt-formulas/opendaylight/server.sls +++ b/mcp/salt-formulas/opendaylight/server.sls -@@ -58,4 +58,9 @@ opendaylight: +@@ -65,4 +65,9 @@ opendaylight: - service: opendaylight {%- endif %} diff --git a/patches/opnfv-fuel/0004-classes-baremetal-AArch64-virtio-NIC-names-sync.patch b/patches/opnfv-fuel/0004-classes-baremetal-AArch64-virtio-NIC-names-sync.patch index 67e7a951..49946eff 100644 --- a/patches/opnfv-fuel/0004-classes-baremetal-AArch64-virtio-NIC-names-sync.patch +++ b/patches/opnfv-fuel/0004-classes-baremetal-AArch64-virtio-NIC-names-sync.patch @@ -137,7 +137,7 @@ index 2e39588..e5c6573 100644 # MaaS has issues using MTU > 1500 for PXE interface pxe_interface_mtu: 1500 diff --git a/mcp/reclass/classes/cluster/baremetal-mcp-ocata-odl-ha/opendaylight/control.yml b/mcp/reclass/classes/cluster/baremetal-mcp-ocata-odl-ha/opendaylight/control.yml -index ce1bdfd..bbf4453 100644 +index ec25ad1..f00a775 100644 --- a/mcp/reclass/classes/cluster/baremetal-mcp-ocata-odl-ha/opendaylight/control.yml +++ b/mcp/reclass/classes/cluster/baremetal-mcp-ocata-odl-ha/opendaylight/control.yml @@ -10,7 +10,7 @@ parameters: diff --git a/patches/opnfv-fuel/0014-baremetal-virtual-Extend-arch-list-for-UCA-repo.patch b/patches/opnfv-fuel/0014-baremetal-virtual-Extend-arch-list-for-UCA-repo.patch index f3629f88..f343ce07 100644 --- a/patches/opnfv-fuel/0014-baremetal-virtual-Extend-arch-list-for-UCA-repo.patch +++ b/patches/opnfv-fuel/0014-baremetal-virtual-Extend-arch-list-for-UCA-repo.patch @@ -61,7 +61,7 @@ index 9fa69ba..3f3cdb4 100644 key_server: keyserver.ubuntu.com kernel: diff --git a/mcp/reclass/classes/cluster/virtual-mcp-ocata-common/openstack_compute.yml b/mcp/reclass/classes/cluster/virtual-mcp-ocata-common/openstack_compute.yml -index 58cad51..d55406d 100644 +index ddd804a..f989b6c 100644 --- a/mcp/reclass/classes/cluster/virtual-mcp-ocata-common/openstack_compute.yml +++ b/mcp/reclass/classes/cluster/virtual-mcp-ocata-common/openstack_compute.yml @@ -58,7 +58,7 @@ parameters: diff --git a/upstream/fuel b/upstream/fuel -Subproject f69a28ea02cc6a53d3b3d289576b17fbb31a67c +Subproject fca7d22742df82fc6e502b17ad45ebc11c0ba89 |