From feb3b54f39d9710e50b9e0a29036d1dd69f4f3cd Mon Sep 17 00:00:00 2001 From: Alexandru Avadanii Date: Tue, 13 Mar 2018 21:10:04 +0100 Subject: u/fuel: Bump & rebase for salt state retry JIRA: FUEL-358 Change-Id: Ia1e422fd037c1dd1c689b535d2b430c533d9562d Signed-off-by: Alexandru Avadanii --- .../opnfv-fuel/0002-salt-formulas-Add-enable-armband-formula.patch | 6 +++--- .../0005-maas-Add-curtin_userdata_arm64_generic_xenial.patch | 4 ++-- .../opnfv-fuel/0008-virtng.py-virt.sls-Extend-libvirt_domain.patch | 4 ++-- patches/opnfv-fuel/0009-seedng-module-Add-AArch64-repo.patch | 4 ++-- patches/opnfv-fuel/0011-Add-opnfv-user-to-the-deployment.patch | 2 +- patches/opnfv-fuel/0012-glusterfs-Use-3.12-for-AArch64.patch | 2 +- 6 files changed, 11 insertions(+), 11 deletions(-) (limited to 'patches') 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 c1f1b03e..0f15f447 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,10 +56,10 @@ index 4f3760f6..115a56c1 100755 salt -C 'I@mongodb:server and *01*' state.sls mongodb || true wait_for 10 "salt -C 'I@mongodb:server and *01*' cmd.run 'mongo localhost:27017/admin'" diff --git a/mcp/config/states/openstack_noha b/mcp/config/states/openstack_noha -index 9fc30bbf..998fc6b4 100755 +index 4c8cbcf8..1cf54240 100755 --- a/mcp/config/states/openstack_noha +++ b/mcp/config/states/openstack_noha -@@ -52,6 +52,8 @@ salt -I 'ceilometer:agent' state.sls ceilometer +@@ -53,6 +53,8 @@ salt -I 'ceilometer:agent' state.sls ceilometer salt -I 'horizon:server' state.sls horizon @@ -69,7 +69,7 @@ index 9fc30bbf..998fc6b4 100755 salt -I 'horizon:server' file.symlink \ /var/lib/openstack-dashboard/static \ diff --git a/mcp/config/states/virtual_control_plane b/mcp/config/states/virtual_control_plane -index 80c0c87e..144245f9 100755 +index c391cfe6..02a813c9 100755 --- a/mcp/config/states/virtual_control_plane +++ b/mcp/config/states/virtual_control_plane @@ -27,6 +27,7 @@ if [ "${ERASE_ENV}" -eq 1 ]; then 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 40dce3bc..8799cd7c 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,10 +66,10 @@ index 00000000..0368937d + file.managed: + - source: salt://maas/files/pgpass diff --git a/mcp/patches/patches.list b/mcp/patches/patches.list -index e0ad1f70..59b617dd 100644 +index 9c460f8e..ad1e7456 100644 --- a/mcp/patches/patches.list +++ b/mcp/patches/patches.list -@@ -16,3 +16,4 @@ +@@ -18,3 +18,4 @@ /usr/share/salt-formulas/env: 0011-system.repo-Debian-Add-keyserver-proxy-support.patch /usr/share/salt-formulas/env: 0012-routes-Skip-network-restart-on-noifupdown.patch /usr/share/salt-formulas/env: 0015-Set-ovs-bridges-as-L3-interfaces.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 4e2d522b..e84c6269 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 00000000..78eb0bff + + #salt_control_seed_{{ cluster_name }}_{{ node_name }}: diff --git a/mcp/patches/patches.list b/mcp/patches/patches.list -index 59b617dd..520a2756 100644 +index ad1e7456..5c6bb653 100644 --- a/mcp/patches/patches.list +++ b/mcp/patches/patches.list -@@ -17,3 +17,5 @@ +@@ -19,3 +19,5 @@ /usr/share/salt-formulas/env: 0012-routes-Skip-network-restart-on-noifupdown.patch /usr/share/salt-formulas/env: 0015-Set-ovs-bridges-as-L3-interfaces.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 b9800d78..7c87d604 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 00000000..d40e63b2 + 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 520a2756..f7d25d3b 100644 +index 5c6bb653..482a053a 100644 --- a/mcp/patches/patches.list +++ b/mcp/patches/patches.list -@@ -19,3 +19,4 @@ +@@ -21,3 +21,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-Add-opnfv-user-to-the-deployment.patch b/patches/opnfv-fuel/0011-Add-opnfv-user-to-the-deployment.patch index d9577cdd..083cf37d 100644 --- a/patches/opnfv-fuel/0011-Add-opnfv-user-to-the-deployment.patch +++ b/patches/opnfv-fuel/0011-Add-opnfv-user-to-the-deployment.patch @@ -34,7 +34,7 @@ index 0c41557d..799a9419 100755 salt -C 'kvm* or cmp*' state.apply salt.minion salt -C 'cmp*' state.apply linux.system diff --git a/mcp/config/states/virtual_control_plane b/mcp/config/states/virtual_control_plane -index 144245f9..8ea75f17 100755 +index 02a813c9..a179b22c 100755 --- a/mcp/config/states/virtual_control_plane +++ b/mcp/config/states/virtual_control_plane @@ -39,6 +39,7 @@ vcp_nodes=$(salt --out yaml 'kvm01*' pillar.get salt:control:cluster:internal:no diff --git a/patches/opnfv-fuel/0012-glusterfs-Use-3.12-for-AArch64.patch b/patches/opnfv-fuel/0012-glusterfs-Use-3.12-for-AArch64.patch index 4c74200d..7e6517b1 100644 --- a/patches/opnfv-fuel/0012-glusterfs-Use-3.12-for-AArch64.patch +++ b/patches/opnfv-fuel/0012-glusterfs-Use-3.12-for-AArch64.patch @@ -47,7 +47,7 @@ index 5c08d6d2..e6e5ebf3 100644 client: volumes: diff --git a/mcp/reclass/classes/cluster/mcp-pike-common-ha/openstack_control.yml.j2 b/mcp/reclass/classes/cluster/mcp-pike-common-ha/openstack_control.yml.j2 -index c487e342..62c1ab28 100644 +index 6f7b33e3..795c0383 100644 --- a/mcp/reclass/classes/cluster/mcp-pike-common-ha/openstack_control.yml.j2 +++ b/mcp/reclass/classes/cluster/mcp-pike-common-ha/openstack_control.yml.j2 @@ -66,7 +66,7 @@ parameters: -- cgit 1.2.3-korg