Merge "Update the files in fuel-plugin to match the upstream"

diff --git a/fuel-plugin/Dockerfile b/fuel-plugin/Dockerfile
index 9b3fd5c..b71a092 100644 (file)
--- a/fuel-plugin/Dockerfile
+++ b/fuel-plugin/Dockerfile
@@ -7,4 +7,4 @@ RUN echo "ALL ALL=NOPASSWD: ALL" > /etc/sudoers.d/open-sudo
 RUN chmod 0440 /etc/sudoers.d/open-sudo
 ADD ./build_kvm.sh /root/build_kvm.sh
 RUN chmod +x /root/build_kvm.sh
-RUN /root/build_kvm.sh -c 00bbfcd8 -o 2f8932e8
+RUN /root/build_kvm.sh

diff --git a/fuel-plugin/build_kvm.sh b/fuel-plugin/build_kvm.sh
index e4af102..a26532d 100755 (executable)
--- a/fuel-plugin/build_kvm.sh
+++ b/fuel-plugin/build_kvm.sh
@@ -1,5 +1,9 @@
 #!/bin/bash
 
+KVM_COMMIT="0e68cb048bb8aadb14675f5d4286d8ab2fc35449"
+OVS_COMMIT="4ff6642f3c1dd8949c2f42b3310ee2523ee970a6"
+KEEP=no
+
 quirks() {
        # Workaround build bug on Ubuntu 14.04
        cat <<EOF > arch/x86/boot/install.sh
@@ -37,9 +41,6 @@ index 65a4537..b73ca67 100644
 EOF
 }
 
-KVM_COMMIT=""
-OVS_COMMIT="4ff6642f3c1dd8949c2f42b3310ee2523ee970a6"
-KEEP=no
 for i
 do
        case $i in

diff --git a/fuel-plugin/deployment_scripts/puppet/manifests/kvm-install.pp b/fuel-plugin/deployment_scripts/puppet/manifests/kvm-install.pp
index 2b93a13..23902cc 100644 (file)
--- a/fuel-plugin/deployment_scripts/puppet/manifests/kvm-install.pp
+++ b/fuel-plugin/deployment_scripts/puppet/manifests/kvm-install.pp
@@ -1,10 +1,10 @@
 $fuel_settings = parseyaml(file('/etc/compute.yaml'))
 if $operatingsystem == 'Ubuntu' {
         if $fuel_settings['fuel-plugin-kvm']['use_kvm'] {
-                package { 'linux-headers-4.1.10-rt10nfv':
+                package { 'linux-headers-4.4.6-rt14nfv':
                         ensure => "1.0.OPNFV",
                 } ->
-                package { 'linux-image-4.1.10-rt10nfv':
+                package { 'linux-image-4.4.6-rt14nfv':
                         ensure => "1.0.OPNFV",
                 } ->
                 exec {'reboot':

diff --git a/fuel-plugin/pre_build_hook b/fuel-plugin/pre_build_hook
index 9b3b931..0dfc36c 100755 (executable)
--- a/fuel-plugin/pre_build_hook
+++ b/fuel-plugin/pre_build_hook
@@ -10,8 +10,8 @@ function build_pkg {
     ubuntu)
       sudo docker build -t kvm .
       container_id=`sudo docker run -d kvm`
-      sudo docker cp $container_id:/linux-headers-4.1.10-rt10nfv_1.0.OPNFV_amd64.deb ${DIR}/repositories/ubuntu/
-      sudo docker cp $container_id:/linux-image-4.1.10-rt10nfv_1.0.OPNFV_amd64.deb ${DIR}/repositories/ubuntu/
+      sudo docker cp $container_id:/linux-headers-4.4.6-rt14nfv_1.0.OPNFV_amd64.deb ${DIR}/repositories/ubuntu/
+      sudo docker cp $container_id:/linux-image-4.4.6-rt14nfv_1.0.OPNFV_amd64.deb ${DIR}/repositories/ubuntu/
     ;;
     *) echo "Not supported system"; exit 1;;
   esac