diff options
| author |   davidjchou <david.j.chou@intel.com> | 2016-06-03 17:47:59 -0700 |
|---|---|---|
| committer | davidjchou <david.j.chou@intel.com> | 2016-06-03 21:11:45 -0700 |
| commit | 7b0d298c1826ff7210b859223d42136dffe7b3ce (patch) | |
| tree | 77238fd32abdd494013f5d18994ae66f40ab4aa8 | |
| parent | 0e68cb048bb8aadb14675f5d4286d8ab2fc35449 (diff) | |
Update the files in fuel-plugin to match the upstream
Since the upstream kvmfornfv kernel version and OVS changed, updated
the related files in fuel-plugin, so it can build fuel-plugin-kvm with
latest kvmfornfv kernel and OVS module.
Upstream status: kvmfornfv kernel 4.4.6-rt14nfv
Change-Id: I6a7c312f7527acae4d2de64c7b43da4fbec41504
Signed-off-by: davidjchou <david.j.chou@intel.com>
| -rw-r--r-- | fuel-plugin/Dockerfile | 2 | ||||
| -rwxr-xr-x | fuel-plugin/build_kvm.sh | 7 | ||||
| -rw-r--r-- | fuel-plugin/deployment_scripts/puppet/manifests/kvm-install.pp | 4 | ||||
| -rwxr-xr-x | fuel-plugin/pre_build_hook | 4 |
4 files changed, 9 insertions, 8 deletions
diff --git a/fuel-plugin/Dockerfile b/fuel-plugin/Dockerfile index 9b3fd5cea..b71a09271 100644 --- 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 e4af1023e..a26532d69 100755 --- 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 2b93a13a0..23902cc37 100644 --- 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 9b3b93116..0dfc36cbc 100755 --- 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 |