summary |
shortlog |
log |
commit | commitdiff |
review |
tree
raw |
patch |
inline | side by side (from parent 1:
6846305)
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)
+++ /dev/null
-*.rpm
-*.deb
-fuel-plugin/.build/
-fuel-plugin/deployment_scripts/puppet/modules/reboot
-$kvm_settings = hiera('fuel-plugin-kvm')
+$fuel_settings = parseyaml(file('/etc/astute.yaml'))
if $operatingsystem == 'Ubuntu' {
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",
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",
} ->
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",
- id: kvm_install
type: puppet
version: 2.0.0
- id: kvm_install
type: puppet
version: 2.0.0
- role: [compute]
- required_for: [post_deployment_end]
- requires: [post_deployment_start]
+ groups: [compute]
+ required_for: [firewall]
+ requires: [tools]
parameters:
puppet_manifest: puppet/manifests/kvm-install.pp
puppet_modules: puppet/modules:/etc/puppet/modules
parameters:
puppet_manifest: puppet/manifests/kvm-install.pp
puppet_modules: puppet/modules:/etc/puppet/modules
BUILD_FOR=${BUILD_FOR:-ubuntu}
DIR="$(dirname `readlink -f $0`)"
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
function build_pkg {
case $1 in
do
build_pkg $system
done
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 -