summaryrefslogtreecommitdiffstats
path: root/fuel-plugin
diff options
context:
space:
mode:
authorMichael Polenchuk <mpolenchuk@mirantis.com>2016-11-23 15:23:54 +0000
committerMichael Polenchuk <mpolenchuk@mirantis.com>2016-11-23 15:23:54 +0000
commit860e71785b244ba8e7c5a39c7f738302c5a957c7 (patch)
treee7af0857c2d828e6dc009b71fbf9d690bbc197eb /fuel-plugin
parent8647dbbe9db84d71610f42cec6ff619783d99800 (diff)
Revert "Revert "[Fuel-plugin] Install kernel in post-deployment.""
This reverts commit 8647dbbe9db84d71610f42cec6ff619783d99800. Get required fix back in. Change-Id: Ia7ef03d4bcedce922c68098bc74207f37b0d15cb Signed-off-by: Michael Polenchuk <mpolenchuk@mirantis.com>
Diffstat (limited to 'fuel-plugin')
-rw-r--r--fuel-plugin/deployment_scripts/puppet/manifests/kvm-install.pp13
-rw-r--r--fuel-plugin/deployment_scripts/puppet/modules/.gitkeep0
-rw-r--r--fuel-plugin/deployment_tasks.yaml8
-rwxr-xr-xfuel-plugin/pre_build_hook8
4 files changed, 19 insertions, 10 deletions
diff --git a/fuel-plugin/deployment_scripts/puppet/manifests/kvm-install.pp b/fuel-plugin/deployment_scripts/puppet/manifests/kvm-install.pp
index a396e9472..4c04aa0a6 100644
--- a/fuel-plugin/deployment_scripts/puppet/manifests/kvm-install.pp
+++ b/fuel-plugin/deployment_scripts/puppet/manifests/kvm-install.pp
@@ -1,15 +1,16 @@
-$fuel_settings = parseyaml(file('/etc/astute.yaml'))
+$kvm_settings = hiera('fuel-plugin-kvm')
if $operatingsystem == 'Ubuntu' {
- if $fuel_settings['fuel-plugin-kvm']['use_kvm'] {
+ if $kvm_settings['use_kvm'] {
package { 'linux-headers-4.4.6-rt14nfv':
ensure => "1.0.OPNFV",
+ notify => Reboot['after_run'],
} ->
package { 'linux-image-4.4.6-rt14nfv':
ensure => "1.0.OPNFV",
- } ->
- exec {'reboot':
- command => "reboot",
- path => "/usr/bin:/usr/sbin:/bin:/sbin",
+ notify => Reboot['after_run'],
+ }
+ reboot { 'after_run':
+ apply => finished,
}
} else {
}
diff --git a/fuel-plugin/deployment_scripts/puppet/modules/.gitkeep b/fuel-plugin/deployment_scripts/puppet/modules/.gitkeep
new file mode 100644
index 000000000..e69de29bb
--- /dev/null
+++ b/fuel-plugin/deployment_scripts/puppet/modules/.gitkeep
diff --git a/fuel-plugin/deployment_tasks.yaml b/fuel-plugin/deployment_tasks.yaml
index f6e31e3ee..0aee295c1 100644
--- a/fuel-plugin/deployment_tasks.yaml
+++ b/fuel-plugin/deployment_tasks.yaml
@@ -1,10 +1,10 @@
- id: kvm_install
type: puppet
version: 2.0.0
- groups: [compute]
- required_for: [firewall]
- requires: [tools]
+ role: [compute]
+ required_for: [post_deployment_end]
+ requires: [post_deployment_start]
parameters:
puppet_manifest: puppet/manifests/kvm-install.pp
puppet_modules: puppet/modules:/etc/puppet/modules
- timeout: 720
+ timeout: 1200
diff --git a/fuel-plugin/pre_build_hook b/fuel-plugin/pre_build_hook
index a3c883283..259862f8f 100755
--- a/fuel-plugin/pre_build_hook
+++ b/fuel-plugin/pre_build_hook
@@ -4,6 +4,10 @@ set -eux
BUILD_FOR=${BUILD_FOR:-ubuntu}
DIR="$(dirname `readlink -f $0`)"
+MODULES="${DIR}/deployment_scripts/puppet/modules"
+
+REBOOT_VER='1.2.1'
+REBOOT_URL="https://github.com/puppetlabs/puppetlabs-reboot/archive/${REBOOT_VER}.tar.gz"
function build_pkg {
case $1 in
@@ -25,3 +29,7 @@ for system in $BUILD_FOR
do
build_pkg $system
done
+
+rm -rf ${MODULES}/reboot
+mkdir -p ${MODULES}/reboot
+wget -qO- ${REBOOT_URL} | tar -C ${MODULES}/reboot --strip-components=1 -zxvf -