aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAlexandru Avadanii <Alexandru.Avadanii@enea.com>2017-11-12 19:47:41 +0100
committerAlexandru Avadanii <Alexandru.Avadanii@enea.com>2017-11-12 18:50:13 +0000
commit7165de92fe49627194cf2fabc0474fb28464f2b0 (patch)
treee712a2c9a17f9834ebfbc04f53d3ffea68ba47ce
parent78b7f67ae15d1985a03852a7eef16bf7d7970ee5 (diff)
p/fuel: kvm nodes: Configure repos before new krn
Armband requires a custom kernel on baremetal nodes (kvm, cmp). However, the repos (configured as part of `linux.system` high state) were added before installing the kernel only for cmp nodes. Change-Id: Ie8d6e9cf4eaa84c459a70112ef002d09be9c4cf4 Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com> (cherry picked from commit 80f5ef39fb9057f42370333bb4d465349efe52b3)
-rw-r--r--patches/opnfv-fuel/0014-baremetal-linux-image-generic-hwe-16.04-edge.patch14
1 files changed, 9 insertions, 5 deletions
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 670ac70..4cc6f7b 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
@@ -27,15 +27,19 @@ JIRA: ARMBAND-280
Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
---
- mcp/config/states/virtual_control_plane | 3 +++
- 1 file changed, 3 insertions(+)
+ mcp/config/states/virtual_control_plane | 5 ++++-
+ 1 file changed, 4 insertions(+), 1 deletion(-)
diff --git a/mcp/config/states/virtual_control_plane b/mcp/config/states/virtual_control_plane
-index 585a808..b4e25a0 100755
+index 585a808..13bd63d 100755
--- a/mcp/config/states/virtual_control_plane
+++ b/mcp/config/states/virtual_control_plane
-@@ -30,6 +30,9 @@ salt -C 'kvm*' state.apply linux.network
- salt -C 'cmp*' state.apply linux.system
+@@ -27,9 +27,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
+-salt -C 'cmp*' state.apply linux.system
++salt -C 'kvm* or cmp*' state.apply linux.system
salt -C 'cmp*' state.apply linux.network || true
salt -C 'kvm*' state.apply armband.bootstrap_script_arm64 || true
+# NOTE(armband): Should be later moved to reclass as system.kernel.version