diff options
Diffstat (limited to 'patches')
9 files changed, 18 insertions, 18 deletions
diff --git a/patches/opnfv-fuel/0002-salt-formulas-Add-enable-armband-formula.patch b/patches/opnfv-fuel/0002-salt-formulas-Add-enable-armband-formula.patch index 290ecbd6..279a802d 100644 --- a/patches/opnfv-fuel/0002-salt-formulas-Add-enable-armband-formula.patch +++ b/patches/opnfv-fuel/0002-salt-formulas-Add-enable-armband-formula.patch @@ -56,11 +56,11 @@ index 369e165..d2a0b63 100755 + +salt -I 'nova:compute' state.sls armband || true diff --git a/mcp/config/states/openstack_ha b/mcp/config/states/openstack_ha -index fbddc6e..6bad8da 100755 +index 1bd1a9d..f51e301 100755 --- a/mcp/config/states/openstack_ha +++ b/mcp/config/states/openstack_ha -@@ -52,6 +52,7 @@ salt -I 'neutron:server' state.sls neutron -b 1 - salt -I 'neutron:gateway' state.sls neutron.gateway +@@ -53,6 +53,7 @@ salt -I 'neutron:gateway' state.sls neutron.gateway + salt -I 'neutron:gateway' service.restart networking salt -I 'nova:compute' state.sls nova +salt -I 'nova:compute' state.sls armband || true @@ -68,7 +68,7 @@ index fbddc6e..6bad8da 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 c355126..99fb517 100755 +index b08a31c..5b519be 100755 --- a/mcp/config/states/virtual_control_plane +++ b/mcp/config/states/virtual_control_plane @@ -46,6 +46,7 @@ wait_for 90 "! salt -C 'kvm* or cmp*' test.ping | " \ 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 3e17f899..05ef0267 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 @@ -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 6358109..4f6cc56 100644 +index d0bb7c4..7c5bf15 100644 --- a/mcp/patches/patches.list +++ b/mcp/patches/patches.list -@@ -18,3 +18,4 @@ +@@ -17,3 +17,4 @@ + /usr/share/salt-formulas/env: 0010-maas-region-allow-timeout-override.patch /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/0007-libvirt-Use-libvirt-unix_sock_group.patch b/patches/opnfv-fuel/0007-libvirt-Use-libvirt-unix_sock_group.patch index 581cd71f..3411aad9 100644 --- a/patches/opnfv-fuel/0007-libvirt-Use-libvirt-unix_sock_group.patch +++ b/patches/opnfv-fuel/0007-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 4f6cc56..688a9af 100644 +index 7c5bf15..218ed51 100644 --- a/mcp/patches/patches.list +++ b/mcp/patches/patches.list -@@ -19,3 +19,4 @@ +@@ -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 +/usr/share/salt-formulas/env: 0102-libvirt-unix_sock_group-s-libvirtd-libvirt.patch diff --git a/patches/opnfv-fuel/0008-mcp-salt-formulas-armband-Extend-libvirt_domain.patch b/patches/opnfv-fuel/0008-mcp-salt-formulas-armband-Extend-libvirt_domain.patch index 1ea8f5af..34fe3c5d 100644 --- a/patches/opnfv-fuel/0008-mcp-salt-formulas-armband-Extend-libvirt_domain.patch +++ b/patches/opnfv-fuel/0008-mcp-salt-formulas-armband-Extend-libvirt_domain.patch @@ -41,7 +41,7 @@ Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com> create mode 100644 mcp/salt-formulas/armband/salt_minion.sls diff --git a/mcp/config/states/virtual_control_plane b/mcp/config/states/virtual_control_plane -index 99fb517..88a4488 100755 +index 5b519be..d8d2d02 100755 --- a/mcp/config/states/virtual_control_plane +++ b/mcp/config/states/virtual_control_plane @@ -40,6 +40,7 @@ salt -C 'kvm*' pkg.install bridge-utils diff --git a/patches/opnfv-fuel/0009-virtng.py-virt.sls-Extend-libvirt_domain.patch b/patches/opnfv-fuel/0009-virtng.py-virt.sls-Extend-libvirt_domain.patch index 562dc5d4..8561b963 100644 --- a/patches/opnfv-fuel/0009-virtng.py-virt.sls-Extend-libvirt_domain.patch +++ b/patches/opnfv-fuel/0009-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 688a9af..e618d57 100644 +index 218ed51..2f12b7f 100644 --- a/mcp/patches/patches.list +++ b/mcp/patches/patches.list -@@ -20,3 +20,5 @@ - /usr/share/salt-formulas/env: 0013-maas-region-Allow-subnets-without-fabrics.patch +@@ -19,3 +19,5 @@ + /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 /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/0013-Add-opnfv-user-to-the-deployment.patch b/patches/opnfv-fuel/0013-Add-opnfv-user-to-the-deployment.patch index 42fba2e0..3b4f7f31 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,7 +21,7 @@ Signed-off-by: Guillermo Herrero <Guillermo.Herrero@enea.com> 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 88a4488..298a9de 100755 +index d8d2d02..f326f4c 100755 --- a/mcp/config/states/virtual_control_plane +++ b/mcp/config/states/virtual_control_plane @@ -37,6 +37,7 @@ salt -C 'kvm* or cmp*' file.replace $debian_ip_source \ 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 6a131c20..7f9ccc5d 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 @@ -31,7 +31,7 @@ Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com> 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/mcp/config/states/virtual_control_plane b/mcp/config/states/virtual_control_plane -index 298a9de..f569ba2 100755 +index f326f4c..347b2b5 100755 --- a/mcp/config/states/virtual_control_plane +++ b/mcp/config/states/virtual_control_plane @@ -39,9 +39,12 @@ salt -C 'kvm* or cmp*' file.replace $debian_ip_source \ diff --git a/patches/opnfv-fuel/0015-Add-pre-install-purge-support-for-base-image.patch b/patches/opnfv-fuel/0015-Add-pre-install-purge-support-for-base-image.patch index 28a31396..b5096dd6 100644 --- a/patches/opnfv-fuel/0015-Add-pre-install-purge-support-for-base-image.patch +++ b/patches/opnfv-fuel/0015-Add-pre-install-purge-support-for-base-image.patch @@ -49,7 +49,7 @@ index 4e90f32..38b4440 100644 **/mcp/scripts/net_mcpcontrol.xml +**/mcp/scripts/*.img diff --git a/ci/deploy.sh b/ci/deploy.sh -index b13e18e..427850f 100755 +index 0f42396..b88d2ba 100755 --- a/ci/deploy.sh +++ b/ci/deploy.sh @@ -15,6 +15,7 @@ diff --git a/patches/opnfv-fuel/0016-AArch64-base-image-pre-install-salt-minion.patch b/patches/opnfv-fuel/0016-AArch64-base-image-pre-install-salt-minion.patch index 78cacc70..1162b137 100644 --- a/patches/opnfv-fuel/0016-AArch64-base-image-pre-install-salt-minion.patch +++ b/patches/opnfv-fuel/0016-AArch64-base-image-pre-install-salt-minion.patch @@ -23,7 +23,7 @@ Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com> 4 files changed, 12 insertions(+), 4 deletions(-) diff --git a/ci/deploy.sh b/ci/deploy.sh -index 427850f..e2e4a1c 100755 +index b88d2ba..8e1c3a5 100755 --- a/ci/deploy.sh +++ b/ci/deploy.sh @@ -272,10 +272,10 @@ pushd "${DEPLOY_DIR}" > /dev/null |