From 8670d1557a20d9aab1cdaeacf820f275689d34c9 Mon Sep 17 00:00:00 2001 From: Alexandru Avadanii Date: Tue, 2 Jan 2018 06:10:27 +0100 Subject: u/fuel: Bump & rebase for mas01 NAT removal Change-Id: I0ba6eec175a4b4f1eac0c085dcf25b43589259a7 Signed-off-by: Alexandru Avadanii --- .../0005-maas-Add-curtin_userdata_arm64_generic_xenial.patch | 6 +++--- .../0008-virtng.py-virt.sls-Extend-libvirt_domain.patch | 4 ++-- patches/opnfv-fuel/0009-seedng-module-Add-AArch64-repo.patch | 4 ++-- .../0011-baremetal-virtual-Extend-arch-list-for-UCA-repo.patch | 4 ++-- patches/opnfv-fuel/0013-glusterfs-Use-3.12-for-AArch64.patch | 8 ++++---- upstream/fuel | 2 +- 6 files changed, 14 insertions(+), 14 deletions(-) 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 1514b149..724cafc1 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 @@ -66,11 +66,11 @@ index 0000000..0368937 + file.managed: + - source: salt://maas/files/pgpass diff --git a/mcp/patches/patches.list b/mcp/patches/patches.list -index cc17666..00a4828 100644 +index 284f1bc..533500d 100644 --- a/mcp/patches/patches.list +++ b/mcp/patches/patches.list -@@ -15,3 +15,4 @@ - /usr/share/salt-formulas/env: 0008-Handle-file_recv-option.patch +@@ -16,3 +16,4 @@ + /usr/share/salt-formulas/env: 0009-controller-Use-keystoneclient-to-check-project-ID.patch /usr/share/salt-formulas/env: 0010-maas-region-allow-timeout-override.patch /usr/share/salt-formulas/env: 0012-linux.storage.lvm-Disable-filter.patch +/usr/share/salt-formulas/env: 0101-maas-Add-curtin_userdata_arm64_generic_xenial.patch diff --git a/patches/opnfv-fuel/0008-virtng.py-virt.sls-Extend-libvirt_domain.patch b/patches/opnfv-fuel/0008-virtng.py-virt.sls-Extend-libvirt_domain.patch index 650dc80c..bdbe52bd 100644 --- a/patches/opnfv-fuel/0008-virtng.py-virt.sls-Extend-libvirt_domain.patch +++ b/patches/opnfv-fuel/0008-virtng.py-virt.sls-Extend-libvirt_domain.patch @@ -150,10 +150,10 @@ index 0000000..a9fe11b + + #salt_control_seed_{{ cluster_name }}_{{ node_name }}: diff --git a/mcp/patches/patches.list b/mcp/patches/patches.list -index 00a4828..c69567b 100644 +index 533500d..6b202e7 100644 --- a/mcp/patches/patches.list +++ b/mcp/patches/patches.list -@@ -16,3 +16,5 @@ +@@ -17,3 +17,5 @@ /usr/share/salt-formulas/env: 0010-maas-region-allow-timeout-override.patch /usr/share/salt-formulas/env: 0012-linux.storage.lvm-Disable-filter.patch /usr/share/salt-formulas/env: 0101-maas-Add-curtin_userdata_arm64_generic_xenial.patch diff --git a/patches/opnfv-fuel/0009-seedng-module-Add-AArch64-repo.patch b/patches/opnfv-fuel/0009-seedng-module-Add-AArch64-repo.patch index 3054acb5..2f05c286 100644 --- a/patches/opnfv-fuel/0009-seedng-module-Add-AArch64-repo.patch +++ b/patches/opnfv-fuel/0009-seedng-module-Add-AArch64-repo.patch @@ -49,10 +49,10 @@ index 0000000..d40e63b + cmd += 'else sh {0} -c /tmp {1}; fi'.format( + os.path.join(tmppath, 'bootstrap-salt.sh'), arg) diff --git a/mcp/patches/patches.list b/mcp/patches/patches.list -index c69567b..a322439 100644 +index 6b202e7..3a1d815 100644 --- a/mcp/patches/patches.list +++ b/mcp/patches/patches.list -@@ -18,3 +18,4 @@ +@@ -19,3 +19,4 @@ /usr/share/salt-formulas/env: 0101-maas-Add-curtin_userdata_arm64_generic_xenial.patch /usr/share/salt-formulas/env: 0103-virtng-module-Extend-libvirt_domain.patch /usr/share/salt-formulas/env: 0104-salt-control-virt-Extend-libvirt_domain.patch diff --git a/patches/opnfv-fuel/0011-baremetal-virtual-Extend-arch-list-for-UCA-repo.patch b/patches/opnfv-fuel/0011-baremetal-virtual-Extend-arch-list-for-UCA-repo.patch index db415ec8..fcde8e3b 100644 --- a/patches/opnfv-fuel/0011-baremetal-virtual-Extend-arch-list-for-UCA-repo.patch +++ b/patches/opnfv-fuel/0011-baremetal-virtual-Extend-arch-list-for-UCA-repo.patch @@ -19,10 +19,10 @@ Signed-off-by: Alexandru Avadanii 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/mcp/reclass/classes/cluster/baremetal-mcp-pike-common-ha/openstack_init.yml b/mcp/reclass/classes/cluster/baremetal-mcp-pike-common-ha/openstack_init.yml -index 0d4c666..57af635 100644 +index 8f4edef..6a75099 100644 --- a/mcp/reclass/classes/cluster/baremetal-mcp-pike-common-ha/openstack_init.yml +++ b/mcp/reclass/classes/cluster/baremetal-mcp-pike-common-ha/openstack_init.yml -@@ -189,7 +189,7 @@ parameters: +@@ -190,7 +190,7 @@ parameters: repo: uca: source: "deb http://ubuntu-cloud.archive.canonical.com/ubuntu xenial-updates/${_param:openstack_version} main" diff --git a/patches/opnfv-fuel/0013-glusterfs-Use-3.12-for-AArch64.patch b/patches/opnfv-fuel/0013-glusterfs-Use-3.12-for-AArch64.patch index 9b21add2..34099545 100644 --- a/patches/opnfv-fuel/0013-glusterfs-Use-3.12-for-AArch64.patch +++ b/patches/opnfv-fuel/0013-glusterfs-Use-3.12-for-AArch64.patch @@ -47,7 +47,7 @@ index 9e8ad09..ddff3db 100644 client: volumes: diff --git a/mcp/reclass/classes/cluster/baremetal-mcp-pike-common-ha/openstack_control.yml b/mcp/reclass/classes/cluster/baremetal-mcp-pike-common-ha/openstack_control.yml -index c332542..7a2288f 100644 +index cf09a41..0b6256f 100644 --- a/mcp/reclass/classes/cluster/baremetal-mcp-pike-common-ha/openstack_control.yml +++ b/mcp/reclass/classes/cluster/baremetal-mcp-pike-common-ha/openstack_control.yml @@ -38,7 +38,7 @@ parameters: @@ -56,6 +56,6 @@ index c332542..7a2288f 100644 nova_vncproxy_url: https://${_param:cluster_public_host}:6080 - glusterfs_version: '3.13' + glusterfs_version: '3.12' - nova: - controller: - pkgs: + heat: + server: + metadata: diff --git a/upstream/fuel b/upstream/fuel index bb3a642e..6e0e518d 160000 --- a/upstream/fuel +++ b/upstream/fuel @@ -1 +1 @@ -Subproject commit bb3a642e783b59ae2decb3b73d91f5bfca3afaef +Subproject commit 6e0e518d43cecfb8f981dbd51326d8eae103720c -- cgit 1.2.3-korg