diff options
| author |   Michael Polenchuk <mpolenchuk@mirantis.com> | 2016-11-23 15:23:54 +0000 |
|---|---|---|
| committer | Michael Polenchuk <mpolenchuk@mirantis.com> | 2016-11-23 15:23:54 +0000 |
| commit | 860e71785b244ba8e7c5a39c7f738302c5a957c7 (patch) | |
| tree | e7af0857c2d828e6dc009b71fbf9d690bbc197eb /fuel-plugin/deployment_scripts | |
| parent | 8647dbbe9db84d71610f42cec6ff619783d99800 (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/deployment_scripts')
| -rw-r--r-- | fuel-plugin/deployment_scripts/puppet/manifests/kvm-install.pp | 13 | ||||
| -rw-r--r-- | fuel-plugin/deployment_scripts/puppet/modules/.gitkeep | 0 |
2 files changed, 7 insertions, 6 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 |