diff options
| author |   Yunhong Jiang <yunhong.jiang@linux.intel.com> | 2016-09-21 14:05:24 -0700 |
|---|---|---|
| committer |   Jiang, Yunhong <yunhong.jiang@intel.com> | 2016-09-21 21:55:57 +0000 |
| commit | bda39fb65e89813f4f9a69bfa3aecd5c03e60360 (patch) | |
| tree | 9cb15489974acff1b54c29db7008b04359604699 /fuel-plugin/deployment_scripts | |
| parent | 68463055b0a8d8a577fd111a94eb1c7eee1c4eef (diff) | |
Revert "[Fuel-plugin] Install kernel in post-deployment."colorado.1.0stable/colorado
This reverts commit a10a10b373f17dc423800e6bb8d1a8e99450090d.
According to Fuel team, this patch will be included into C-2 release
instead of C-1 release, so we have to revert it to the C stable branch.
To revert from C stable branch requires cherry-picking from master
branch, so here it is.
Change-Id: I32e1148e5c1cd24e5696270f1aa328630ef42dd0
Signed-off-by: Yunhong Jiang <yunhong.jiang@linux.intel.com>
(cherry picked from commit 8647dbbe9db84d71610f42cec6ff619783d99800)
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, 6 insertions, 7 deletions
diff --git a/fuel-plugin/deployment_scripts/puppet/manifests/kvm-install.pp b/fuel-plugin/deployment_scripts/puppet/manifests/kvm-install.pp index 4c04aa0a6..a396e9472 100644 --- a/fuel-plugin/deployment_scripts/puppet/manifests/kvm-install.pp +++ b/fuel-plugin/deployment_scripts/puppet/manifests/kvm-install.pp @@ -1,16 +1,15 @@ -$kvm_settings = hiera('fuel-plugin-kvm') +$fuel_settings = parseyaml(file('/etc/astute.yaml')) if $operatingsystem == 'Ubuntu' { - if $kvm_settings['use_kvm'] { + if $fuel_settings['fuel-plugin-kvm']['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", - notify => Reboot['after_run'], - } - reboot { 'after_run': - apply => finished, + } -> + exec {'reboot': + command => "reboot", + path => "/usr/bin:/usr/sbin:/bin:/sbin", } } else { } diff --git a/fuel-plugin/deployment_scripts/puppet/modules/.gitkeep b/fuel-plugin/deployment_scripts/puppet/modules/.gitkeep deleted file mode 100644 index e69de29bb..000000000 --- a/fuel-plugin/deployment_scripts/puppet/modules/.gitkeep +++ /dev/null |