aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAlexandru Avadanii <Alexandru.Avadanii@enea.com>2017-11-15 20:08:42 +0100
committerAlexandru Avadanii <Alexandru.Avadanii@enea.com>2017-11-18 15:00:41 +0000
commit53307aa1ab144f9ae62a19afa147cab14fe5701e (patch)
tree50acf8baf74d6082f34c02e05e49d69bae2c2544
parentfc7fb36396fe650d0f39c6bfb132e95495d84d7d (diff)
p/fuel: VCP: linux-image-generic-hwe-16.04-edge
JIRA: ARMBAND-330 Change-Id: I43cd814f2f60df76eabafcae3590628a5d68709d Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com> (cherry picked from commit 9b3121843a78026761a086581fc34589faed25af)
-rw-r--r--patches/opnfv-fuel/0014-baremetal-linux-image-generic-hwe-16.04-edge.patch18
1 files changed, 15 insertions, 3 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 4cc6f7b..510b96f 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
@@ -24,14 +24,15 @@ respectively to automatically pick up new kernel package names
in case of meta + kernel packages bump later.
JIRA: ARMBAND-280
+JIRA: ARMBAND-330
Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
---
- mcp/config/states/virtual_control_plane | 5 ++++-
- 1 file changed, 4 insertions(+), 1 deletion(-)
+ mcp/config/states/virtual_control_plane | 12 +++++++++++-
+ 1 file changed, 11 insertions(+), 1 deletion(-)
diff --git a/mcp/config/states/virtual_control_plane b/mcp/config/states/virtual_control_plane
-index 585a808..13bd63d 100755
+index 585a808..373281d 100755
--- a/mcp/config/states/virtual_control_plane
+++ b/mcp/config/states/virtual_control_plane
@@ -27,9 +27,12 @@ salt -C 'kvm* or cmp*' file.replace $debian_ip_source \
@@ -48,3 +49,14 @@ index 585a808..13bd63d 100755
salt -C 'kvm* or cmp*' system.reboot
wait_for 90 "! salt -C 'kvm* or cmp*' test.ping | " \
"tee /dev/stderr | grep -Fq 'Not connected'"
+@@ -69,3 +72,10 @@ wait_for 10 "! salt -C 'E@^(?!cfg01|mas01|kvm|cmp00).*' state.apply linux,ntp |
+
+ wait_for 10 "salt -C 'E@^(?!cfg01|mas01|kvm|cmp00).*' ssh.set_auth_key ${SUDO_USER} \
+ $(awk 'NR==1{print $2}' "$(eval echo "~${SUDO_USER}/.ssh/authorized_keys")")"
++
++# NOTE(armband): Should be later moved to reclass as system.kernel.version
++salt -C 'E@^(?!cfg01|mas01|kvm|cmp00).*' pkg.install \
++ linux-image-generic-hwe-16.04-edge,linux-headers-generic-hwe-16.04-edge
++salt -C 'E@^(?!cfg01|mas01|kvm|cmp00).*' system.reboot
++wait_for 90 "! salt -C 'E@^(?!cfg01|mas01|kvm|cmp00).*' test.ping | " \
++ "tee /dev/stderr | grep -Fq 'Not connected'"