From 0bc1111a2d7dba9593d0a00804dba41d37b15481 Mon Sep 17 00:00:00 2001 From: Alexandru Avadanii Date: Fri, 5 Jan 2018 00:30:14 +0100 Subject: u/fuel: Bump & rebase for MaaS prx et al Change-Id: Ib2fa3af6c1336ad31868a812abe2b8257f69895c Signed-off-by: Alexandru Avadanii --- ...7-mcp-salt-formulas-armband-Extend-libvirt_domain.patch | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) (limited to 'patches/opnfv-fuel/0007-mcp-salt-formulas-armband-Extend-libvirt_domain.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 34fe3c5d..b6443988 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 @@ -33,19 +33,19 @@ to pick up the changes, so we'll run it before rebooting kvm nodes. Signed-off-by: Alexandru Avadanii --- - mcp/config/states/virtual_control_plane | 1 + + mcp/config/states/baremetal_init | 1 + .../armband/files/salt-minion-aarch64-rollup.diff | 101 +++++++++++++++++++++ mcp/salt-formulas/armband/salt_minion.sls | 7 ++ 3 files changed, 109 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/mcp/config/states/virtual_control_plane b/mcp/config/states/virtual_control_plane -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 - salt -C 'kvm*' state.apply linux.network +diff --git a/mcp/config/states/baremetal_init b/mcp/config/states/baremetal_init +index 5674e62..121dc8d 100755 +--- a/mcp/config/states/baremetal_init ++++ b/mcp/config/states/baremetal_init +@@ -28,6 +28,7 @@ salt -C 'kvm* or cmp*' state.apply salt.minion + salt -C 'kvm* or cmp*' service.force_reload salt-minion salt -C 'cmp*' state.apply linux.system salt -C 'cmp*' state.apply linux.network || true +salt -C 'kvm*' state.apply armband.salt_minion || true -- cgit 1.2.3-korg