From 1d42906057483865e5e8344fc186ea6299c7daf4 Mon Sep 17 00:00:00 2001 From: Alexandru Avadanii Date: Thu, 23 Nov 2017 19:16:30 +0100 Subject: u/fuel: Bump & rebase for MaaS fabrics fix Change-Id: I58bacd2b8f9d210fd9e144cd8db6239ca0b8949d Signed-off-by: Alexandru Avadanii (cherry picked from commit 812d2f0ef3b7f638a29f10770007ef249d609c2c) --- .../0001-salt-formulas-Add-enable-armband-formula.patch | 8 ++++---- .../0004-maas-Add-curtin_userdata_arm64_generic_xenial.patch | 6 +++--- patches/opnfv-fuel/0006-libvirt-Use-libvirt-unix_sock_group.patch | 6 +++--- .../0007-mcp-salt-formulas-armband-Extend-libvirt_domain.patch | 4 ++-- .../0008-virtng.py-virt.sls-Extend-libvirt_domain.patch | 6 +++--- .../0009-mcp-salt-formulas-armband-AArch64-bootstrap.patch | 4 ++-- patches/opnfv-fuel/0010-seedng-module-Add-AArch64-repo.patch | 4 ++-- patches/opnfv-fuel/0013-Add-opnfv-user-to-the-deployment.patch | 6 +++--- .../0014-baremetal-linux-image-generic-hwe-16.04-edge.patch | 6 +++--- upstream/fuel | 2 +- 10 files changed, 26 insertions(+), 26 deletions(-) diff --git a/patches/opnfv-fuel/0001-salt-formulas-Add-enable-armband-formula.patch b/patches/opnfv-fuel/0001-salt-formulas-Add-enable-armband-formula.patch index e4fcfc07..2fef9ae3 100644 --- a/patches/opnfv-fuel/0001-salt-formulas-Add-enable-armband-formula.patch +++ b/patches/opnfv-fuel/0001-salt-formulas-Add-enable-armband-formula.patch @@ -46,10 +46,10 @@ Signed-off-by: Alexandru Avadanii create mode 100644 mcp/salt-formulas/armband/vgabios.sls diff --git a/mcp/config/states/openstack b/mcp/config/states/openstack -index 19cd417..73983d2 100755 +index 369e165..d2a0b63 100755 --- a/mcp/config/states/openstack +++ b/mcp/config/states/openstack -@@ -43,3 +43,5 @@ salt -I 'ceilometer:server' state.sls ceilometer +@@ -47,3 +47,5 @@ salt -I 'ceilometer:server' state.sls ceilometer salt -I 'ceilometer:agent' state.sls ceilometer salt -I 'horizon:server' state.sls horizon @@ -68,10 +68,10 @@ index e1fdf73..e1f705c 100755 salt -I 'mongodb:server' state.sls mongodb || true wait_for 90 "salt -C 'I@mongodb:server and *01*' cmd.run 'mongo localhost:27017/admin'" diff --git a/mcp/config/states/virtual_control_plane b/mcp/config/states/virtual_control_plane -index cfd5e42..27614d0 100755 +index c355126..99fb517 100755 --- a/mcp/config/states/virtual_control_plane +++ b/mcp/config/states/virtual_control_plane -@@ -31,6 +31,7 @@ wait_for 90 "! salt -C 'kvm* or cmp*' test.ping | " \ +@@ -46,6 +46,7 @@ wait_for 90 "! salt -C 'kvm* or cmp*' test.ping | " \ salt -C '* and not cfg01* and not mas01*' state.apply linux,ntp diff --git a/patches/opnfv-fuel/0004-maas-Add-curtin_userdata_arm64_generic_xenial.patch b/patches/opnfv-fuel/0004-maas-Add-curtin_userdata_arm64_generic_xenial.patch index 05ef0267..3e17f899 100644 --- a/patches/opnfv-fuel/0004-maas-Add-curtin_userdata_arm64_generic_xenial.patch +++ b/patches/opnfv-fuel/0004-maas-Add-curtin_userdata_arm64_generic_xenial.patch @@ -64,13 +64,13 @@ index 0000000..0368937 + file.managed: + - source: salt://maas/files/pgpass diff --git a/mcp/patches/patches.list b/mcp/patches/patches.list -index d0bb7c4..7c5bf15 100644 +index 6358109..4f6cc56 100644 --- a/mcp/patches/patches.list +++ b/mcp/patches/patches.list -@@ -17,3 +17,4 @@ - /usr/share/salt-formulas/env: 0010-maas-region-allow-timeout-override.patch +@@ -18,3 +18,4 @@ /usr/share/salt-formulas/reclass: 0011-service.horizon.server.cluster-Default-to-v2-API.patch /usr/share/salt-formulas/env: 0012-linux.storage.lvm-Disable-filter.patch + /usr/share/salt-formulas/env: 0013-maas-region-Allow-subnets-without-fabrics.patch +/usr/share/salt-formulas/env: 0101-maas-Add-curtin_userdata_arm64_generic_xenial.patch diff --git a/mcp/reclass/classes/cluster/baremetal-mcp-ocata-common/infra/maas.yml b/mcp/reclass/classes/cluster/baremetal-mcp-ocata-common/infra/maas.yml index e8c2965..b15f9cb 100644 diff --git a/patches/opnfv-fuel/0006-libvirt-Use-libvirt-unix_sock_group.patch b/patches/opnfv-fuel/0006-libvirt-Use-libvirt-unix_sock_group.patch index 3411aad9..581cd71f 100644 --- a/patches/opnfv-fuel/0006-libvirt-Use-libvirt-unix_sock_group.patch +++ b/patches/opnfv-fuel/0006-libvirt-Use-libvirt-unix_sock_group.patch @@ -48,11 +48,11 @@ index 0000000..003b249 + # Set the UNIX socket permissions for the R/O socket. This is used + # for monitoring VM status only diff --git a/mcp/patches/patches.list b/mcp/patches/patches.list -index 7c5bf15..218ed51 100644 +index 4f6cc56..688a9af 100644 --- a/mcp/patches/patches.list +++ b/mcp/patches/patches.list -@@ -18,3 +18,4 @@ - /usr/share/salt-formulas/reclass: 0011-service.horizon.server.cluster-Default-to-v2-API.patch +@@ -19,3 +19,4 @@ /usr/share/salt-formulas/env: 0012-linux.storage.lvm-Disable-filter.patch + /usr/share/salt-formulas/env: 0013-maas-region-Allow-subnets-without-fabrics.patch /usr/share/salt-formulas/env: 0101-maas-Add-curtin_userdata_arm64_generic_xenial.patch +/usr/share/salt-formulas/env: 0102-libvirt-unix_sock_group-s-libvirtd-libvirt.patch diff --git a/patches/opnfv-fuel/0007-mcp-salt-formulas-armband-Extend-libvirt_domain.patch b/patches/opnfv-fuel/0007-mcp-salt-formulas-armband-Extend-libvirt_domain.patch index ee298bdb..a7144f08 100644 --- a/patches/opnfv-fuel/0007-mcp-salt-formulas-armband-Extend-libvirt_domain.patch +++ b/patches/opnfv-fuel/0007-mcp-salt-formulas-armband-Extend-libvirt_domain.patch @@ -29,10 +29,10 @@ Signed-off-by: Alexandru Avadanii create mode 100644 mcp/salt-formulas/armband/libvirt_domain_template.sls diff --git a/mcp/config/states/virtual_control_plane b/mcp/config/states/virtual_control_plane -index 27614d0..ec3d5ac 100755 +index 99fb517..abf46ce 100755 --- a/mcp/config/states/virtual_control_plane +++ b/mcp/config/states/virtual_control_plane -@@ -32,6 +32,7 @@ wait_for 90 "! salt -C 'kvm* or cmp*' test.ping | " \ +@@ -47,6 +47,7 @@ wait_for 90 "! salt -C 'kvm* or cmp*' test.ping | " \ salt -C '* and not cfg01* and not mas01*' state.apply linux,ntp salt -C 'kvm*' state.sls armband || true 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 6ab94073..6b84b840 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,11 +150,11 @@ index 0000000..a9fe11b + + #salt_control_seed_{{ cluster_name }}_{{ node_name }}: diff --git a/mcp/patches/patches.list b/mcp/patches/patches.list -index 218ed51..2f12b7f 100644 +index 688a9af..e618d57 100644 --- a/mcp/patches/patches.list +++ b/mcp/patches/patches.list -@@ -19,3 +19,5 @@ - /usr/share/salt-formulas/env: 0012-linux.storage.lvm-Disable-filter.patch +@@ -20,3 +20,5 @@ + /usr/share/salt-formulas/env: 0013-maas-region-Allow-subnets-without-fabrics.patch /usr/share/salt-formulas/env: 0101-maas-Add-curtin_userdata_arm64_generic_xenial.patch /usr/share/salt-formulas/env: 0102-libvirt-unix_sock_group-s-libvirtd-libvirt.patch +/usr/share/salt-formulas/env: 0103-virtng-module-Extend-libvirt_domain.patch diff --git a/patches/opnfv-fuel/0009-mcp-salt-formulas-armband-AArch64-bootstrap.patch b/patches/opnfv-fuel/0009-mcp-salt-formulas-armband-AArch64-bootstrap.patch index 1fe9f782..cdc988ff 100644 --- a/patches/opnfv-fuel/0009-mcp-salt-formulas-armband-AArch64-bootstrap.patch +++ b/patches/opnfv-fuel/0009-mcp-salt-formulas-armband-AArch64-bootstrap.patch @@ -32,10 +32,10 @@ Signed-off-by: Alexandru Avadanii create mode 100644 mcp/salt-formulas/armband/files/cloud.py.diff diff --git a/mcp/config/states/virtual_control_plane b/mcp/config/states/virtual_control_plane -index ec3d5ac..44d7c6d 100755 +index abf46ce..1657d3c 100755 --- a/mcp/config/states/virtual_control_plane +++ b/mcp/config/states/virtual_control_plane -@@ -25,6 +25,7 @@ salt -C 'kvm*' pkg.install bridge-utils +@@ -40,6 +40,7 @@ salt -C 'kvm*' pkg.install bridge-utils salt -C 'kvm*' state.apply linux.network salt -C 'cmp*' state.apply linux.system salt -C 'cmp*' state.apply linux.network || true diff --git a/patches/opnfv-fuel/0010-seedng-module-Add-AArch64-repo.patch b/patches/opnfv-fuel/0010-seedng-module-Add-AArch64-repo.patch index 86a6b1d5..c865f078 100644 --- a/patches/opnfv-fuel/0010-seedng-module-Add-AArch64-repo.patch +++ b/patches/opnfv-fuel/0010-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 2f12b7f..6ba59aa 100644 +index e618d57..62e3cc6 100644 --- a/mcp/patches/patches.list +++ b/mcp/patches/patches.list -@@ -21,3 +21,4 @@ +@@ -22,3 +22,4 @@ /usr/share/salt-formulas/env: 0102-libvirt-unix_sock_group-s-libvirtd-libvirt.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/0013-Add-opnfv-user-to-the-deployment.patch b/patches/opnfv-fuel/0013-Add-opnfv-user-to-the-deployment.patch index 16d58cbc..7c58ec3d 100644 --- a/patches/opnfv-fuel/0013-Add-opnfv-user-to-the-deployment.patch +++ b/patches/opnfv-fuel/0013-Add-opnfv-user-to-the-deployment.patch @@ -21,10 +21,10 @@ Signed-off-by: Guillermo Herrero create mode 100644 mcp/salt-formulas/opnfv/adduser.sls diff --git a/mcp/config/states/virtual_control_plane b/mcp/config/states/virtual_control_plane -index 44d7c6d..8fc03d4 100755 +index 1657d3c..4b3ec42 100755 --- a/mcp/config/states/virtual_control_plane +++ b/mcp/config/states/virtual_control_plane -@@ -22,6 +22,7 @@ salt -C 'kvm* or cmp*' file.replace $debian_ip_source \ +@@ -37,6 +37,7 @@ salt -C 'kvm* or cmp*' file.replace $debian_ip_source \ repl="\n if not __salt__['pkg.version']('vlan'):\n __salt__['pkg.install']('vlan')" salt -C 'kvm*' pkg.install bridge-utils @@ -32,7 +32,7 @@ index 44d7c6d..8fc03d4 100755 salt -C 'kvm*' state.apply linux.network salt -C 'cmp*' state.apply linux.system salt -C 'cmp*' state.apply linux.network || true -@@ -52,6 +53,7 @@ while [ $rc -ne 0 ] && [ ${attempt} -lt ${total_attempts} ]; do +@@ -67,6 +68,7 @@ while [ $rc -ne 0 ] && [ ${attempt} -lt ${total_attempts} ]; do rc=0 for node in $vcp_nodes; do salt "$node" test.ping 2>/dev/null || { rc=$?; break; }; diff --git a/patches/opnfv-fuel/0014-baremetal-linux-image-generic-hwe-16.04-edge.patch b/patches/opnfv-fuel/0014-baremetal-linux-image-generic-hwe-16.04-edge.patch index 35e7b8be..9ba9a67a 100644 --- a/patches/opnfv-fuel/0014-baremetal-linux-image-generic-hwe-16.04-edge.patch +++ b/patches/opnfv-fuel/0014-baremetal-linux-image-generic-hwe-16.04-edge.patch @@ -32,10 +32,10 @@ Signed-off-by: Alexandru Avadanii 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/mcp/config/states/virtual_control_plane b/mcp/config/states/virtual_control_plane -index 8fc03d4..b79cc85 100755 +index 4b3ec42..ad8218e 100755 --- a/mcp/config/states/virtual_control_plane +++ b/mcp/config/states/virtual_control_plane -@@ -24,9 +24,12 @@ salt -C 'kvm* or cmp*' file.replace $debian_ip_source \ +@@ -39,9 +39,12 @@ salt -C 'kvm* or cmp*' file.replace $debian_ip_source \ salt -C 'kvm*' pkg.install bridge-utils salt -C '*' state.apply opnfv.adduser salt -C 'kvm*' state.apply linux.network @@ -49,7 +49,7 @@ index 8fc03d4..b79cc85 100755 salt -C 'kvm* or cmp*' system.reboot wait_for 90 "! salt -C 'kvm* or cmp*' test.ping | " \ "tee /dev/stderr | grep -Fq 'Not connected'" -@@ -70,3 +73,10 @@ wait_for 10 "salt -C 'E@^(?!cfg01|mas01|kvm|cmp00).*' ssh.set_auth_key ${SUDO_US +@@ -85,3 +88,10 @@ wait_for 10 "salt -C 'E@^(?!cfg01|mas01|kvm|cmp00).*' ssh.set_auth_key ${SUDO_US # Disable proxy dhcp routes after installation salt -C 'prx*' file.write /etc/dhcp/dhclient-enter-hooks.d/no-default-route \ args='unset new_routers' diff --git a/upstream/fuel b/upstream/fuel index 77609e7f..0adbe359 160000 --- a/upstream/fuel +++ b/upstream/fuel @@ -1 +1 @@ -Subproject commit 77609e7fcebc76f4e10a133354787ad5086c0450 +Subproject commit 0adbe359a0e448e0a8007b0041890e33a612a4dc -- cgit 1.2.3-korg