From d6ff3a19ef707db95e38589598c5fcbc194d6032 Mon Sep 17 00:00:00 2001 From: Cristina Pauna Date: Tue, 21 Aug 2018 17:23:41 +0300 Subject: u/fuel: Bump & rebase for glance signature and vpp Change-Id: I20256794b1ef31410527329e0e4a9a730d93ce03 Signed-off-by: Cristina Pauna --- ...0001-salt-formulas-Add-enable-armband-formula.patch | 18 +++++++++--------- ...p-salt-formulas-armband-Extend-libvirt_domain.patch | 6 +++--- ...0003-virtng.py-virt.sls-Extend-libvirt_domain.patch | 16 ++++++++-------- .../0004-Add-opnfv-user-to-the-deployment.patch | 8 ++++---- .../0005-Set-volume-name-in-source-file-to-sdX.patch | 4 ++-- upstream/fuel | 2 +- 6 files changed, 27 insertions(+), 27 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 0c9bb2c0..abf5f7ad 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 @@ -24,15 +24,15 @@ Signed-off-by: Guillermo Herrero Signed-off-by: Charalampos Kominos Signed-off-by: Alexandru Avadanii --- - mcp/config/states/openstack_ha | 1 + - mcp/config/states/openstack_noha | 2 ++ - mcp/config/states/virtual_control_plane | 1 + - .../files/nova-libvirt-aarch64-rollup.diff | 27 ++++++++++++++ - mcp/salt-formulas/armband/init.sls | 7 ++++ - mcp/salt-formulas/armband/nova_config.sls | 35 +++++++++++++++++++ - mcp/salt-formulas/armband/nova_libvirt.sls | 7 ++++ - mcp/salt-formulas/armband/qemu_efi.sls | 2 ++ - mcp/salt-formulas/armband/vgabios.sls | 7 ++++ + mcp/config/states/openstack_ha | 1 + + mcp/config/states/openstack_noha | 2 ++ + mcp/config/states/virtual_control_plane | 1 + + .../armband/files/nova-libvirt-aarch64-rollup.diff | 27 +++++++++++++++++ + mcp/salt-formulas/armband/init.sls | 7 +++++ + mcp/salt-formulas/armband/nova_config.sls | 35 ++++++++++++++++++++++ + mcp/salt-formulas/armband/nova_libvirt.sls | 7 +++++ + mcp/salt-formulas/armband/qemu_efi.sls | 2 ++ + mcp/salt-formulas/armband/vgabios.sls | 7 +++++ 9 files changed, 89 insertions(+) create mode 100644 mcp/salt-formulas/armband/files/nova-libvirt-aarch64-rollup.diff create mode 100644 mcp/salt-formulas/armband/init.sls diff --git a/patches/opnfv-fuel/0002-mcp-salt-formulas-armband-Extend-libvirt_domain.patch b/patches/opnfv-fuel/0002-mcp-salt-formulas-armband-Extend-libvirt_domain.patch index 998a5aba..84e6cc4b 100644 --- a/patches/opnfv-fuel/0002-mcp-salt-formulas-armband-Extend-libvirt_domain.patch +++ b/patches/opnfv-fuel/0002-mcp-salt-formulas-armband-Extend-libvirt_domain.patch @@ -33,9 +33,9 @@ to pick up the changes, so we'll run it before rebooting kvm nodes. Signed-off-by: Alexandru Avadanii --- - mcp/config/states/baremetal_init | 1 + - .../files/salt-minion-aarch64-rollup.diff | 70 +++++++++++++++++++ - mcp/salt-formulas/armband/salt_minion.sls | 7 ++ + mcp/config/states/baremetal_init | 1 + + .../armband/files/salt-minion-aarch64-rollup.diff | 70 ++++++++++++++++++++++ + mcp/salt-formulas/armband/salt_minion.sls | 7 +++ 3 files changed, 78 insertions(+) create mode 100644 mcp/salt-formulas/armband/files/salt-minion-aarch64-rollup.diff create mode 100644 mcp/salt-formulas/armband/salt_minion.sls diff --git a/patches/opnfv-fuel/0003-virtng.py-virt.sls-Extend-libvirt_domain.patch b/patches/opnfv-fuel/0003-virtng.py-virt.sls-Extend-libvirt_domain.patch index 3b366e41..a7014219 100644 --- a/patches/opnfv-fuel/0003-virtng.py-virt.sls-Extend-libvirt_domain.patch +++ b/patches/opnfv-fuel/0003-virtng.py-virt.sls-Extend-libvirt_domain.patch @@ -23,11 +23,11 @@ specific values. Signed-off-by: Alexandru Avadanii --- - ...-virtng-module-Extend-libvirt_domain.patch | 54 +++++++++++++++++++ - ...t-control-virt-Extend-libvirt_domain.patch | 51 ++++++++++++++++++ - mcp/patches/patches.list | 2 + - .../cluster/mcp-common-ha/infra/kvm.yml | 15 ++++++ - .../cluster/mcp-odl-ha/infra/kvm.yml.j2 | 3 ++ + .../0103-virtng-module-Extend-libvirt_domain.patch | 54 ++++++++++++++++++++++ + ...4-salt-control-virt-Extend-libvirt_domain.patch | 51 ++++++++++++++++++++ + mcp/patches/patches.list | 2 + + .../classes/cluster/mcp-common-ha/infra/kvm.yml | 15 ++++++ + .../classes/cluster/mcp-odl-ha/infra/kvm.yml.j2 | 3 ++ 5 files changed, 125 insertions(+) create mode 100644 mcp/patches/0103-virtng-module-Extend-libvirt_domain.patch create mode 100644 mcp/patches/0104-salt-control-virt-Extend-libvirt_domain.patch @@ -150,13 +150,13 @@ index 00000000..78eb0bff + + #salt_control_seed_{{ cluster_name }}_{{ node_name }}: diff --git a/mcp/patches/patches.list b/mcp/patches/patches.list -index 2f910715..5ebc1d30 100644 +index baa15d79..c9dbe24a 100644 --- a/mcp/patches/patches.list +++ b/mcp/patches/patches.list -@@ -11,3 +11,5 @@ +@@ -10,3 +10,5 @@ + /usr/share/salt-formulas/env: 0010-maas-region-allow-timeout-override.patch /usr/share/salt-formulas/env: 0011-system.repo-Debian-Add-keyserver-proxy-support.patch /usr/share/salt-formulas/env: 0015-Set-ovs-bridges-as-L3-interfaces.patch - /usr/share/salt-formulas/env: 0016-Disable-glance-signature-verification.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/mcp/reclass/classes/cluster/mcp-common-ha/infra/kvm.yml b/mcp/reclass/classes/cluster/mcp-common-ha/infra/kvm.yml diff --git a/patches/opnfv-fuel/0004-Add-opnfv-user-to-the-deployment.patch b/patches/opnfv-fuel/0004-Add-opnfv-user-to-the-deployment.patch index a3e66370..c8c7fe84 100644 --- a/patches/opnfv-fuel/0004-Add-opnfv-user-to-the-deployment.patch +++ b/patches/opnfv-fuel/0004-Add-opnfv-user-to-the-deployment.patch @@ -14,10 +14,10 @@ Signed-off-by: Alexandru Avadanii Signed-off-by: Charalampos Kominos Signed-off-by: Guillermo Herrero --- - mcp/config/states/baremetal_init | 1 + - mcp/config/states/virtual_control_plane | 1 + - .../classes/cluster/all-mcp-arch-common/init.yml.j2 | 3 +++ - mcp/salt-formulas/opnfv/adduser.sls | 7 +++++++ + mcp/config/states/baremetal_init | 1 + + mcp/config/states/virtual_control_plane | 1 + + mcp/reclass/classes/cluster/all-mcp-arch-common/init.yml.j2 | 3 +++ + mcp/salt-formulas/opnfv/adduser.sls | 7 +++++++ 4 files changed, 12 insertions(+) create mode 100644 mcp/salt-formulas/opnfv/adduser.sls diff --git a/patches/opnfv-fuel/0005-Set-volume-name-in-source-file-to-sdX.patch b/patches/opnfv-fuel/0005-Set-volume-name-in-source-file-to-sdX.patch index 246ebdc9..27a92ff8 100644 --- a/patches/opnfv-fuel/0005-Set-volume-name-in-source-file-to-sdX.patch +++ b/patches/opnfv-fuel/0005-Set-volume-name-in-source-file-to-sdX.patch @@ -12,8 +12,8 @@ Subject: [PATCH] Set volume name in source file to sdX Signed-off-by: Charalampos Kominos --- - .../classes/cluster/mcp-common-ha/openstack_control.yml.j2 | 2 +- - .../classes/cluster/mcp-common-noha/openstack_control.yml | 2 +- + mcp/reclass/classes/cluster/mcp-common-ha/openstack_control.yml.j2 | 2 +- + mcp/reclass/classes/cluster/mcp-common-noha/openstack_control.yml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/mcp/reclass/classes/cluster/mcp-common-ha/openstack_control.yml.j2 b/mcp/reclass/classes/cluster/mcp-common-ha/openstack_control.yml.j2 diff --git a/upstream/fuel b/upstream/fuel index 0568ff25..aac1f872 160000 --- a/upstream/fuel +++ b/upstream/fuel @@ -1 +1 @@ -Subproject commit 0568ff25749577fc7ef718b4e60d890365396fa6 +Subproject commit aac1f872a3cbe8d55d80a242bb0cab144ab58a4e -- cgit 1.2.3-korg