diff options
| -rw-r--r-- | .gitignore | 4 | ||||
| -rw-r--r-- | fuel-plugin/deployment_scripts/puppet/manifests/kvm-install.pp | 13 | ||||
| -rw-r--r-- | fuel-plugin/deployment_scripts/puppet/modules/.gitkeep | 0 | ||||
| -rw-r--r-- | fuel-plugin/deployment_tasks.yaml | 8 | ||||
| -rwxr-xr-x | fuel-plugin/pre_build_hook | 8 |
5 files changed, 10 insertions, 23 deletions
diff --git a/.gitignore b/.gitignore deleted file mode 100644 index 23e440920..000000000 --- a/.gitignore +++ /dev/null @@ -1,4 +0,0 @@ -*.rpm -*.deb -fuel-plugin/.build/ -fuel-plugin/deployment_scripts/puppet/modules/reboot 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 diff --git a/fuel-plugin/deployment_tasks.yaml b/fuel-plugin/deployment_tasks.yaml index 0aee295c1..f6e31e3ee 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 - 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 - timeout: 1200 + timeout: 720 diff --git a/fuel-plugin/pre_build_hook b/fuel-plugin/pre_build_hook index 259862f8f..a3c883283 100755 --- a/fuel-plugin/pre_build_hook +++ b/fuel-plugin/pre_build_hook @@ -4,10 +4,6 @@ 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 @@ -29,7 +25,3 @@ 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 - |