diff options
| author |   Alexandru Avadanii <Alexandru.Avadanii@enea.com> | 2017-03-29 17:41:45 +0200 |
|---|---|---|
| committer | Alexandru Avadanii <Alexandru.Avadanii@enea.com> | 2017-03-29 18:25:58 +0200 |
| commit | 17bda8d52856bece72bf2b446a30ffe4be8e2535 (patch) | |
| tree | 3a41901d8a4fd3ea95dc65a3ae7cc854a759533f /patches/opnfv-fuel/upstream-backports | |
| parent | 502b6c79b1a5787e76d2dc4291ef76075a1a06d5 (diff) | |
fuel: deploy: SFC scenarios: 4.8 krn, no vhost_net
FIXME: Put patch in `upstream-backports` dir for now, so we don't
have to edit other patches, to be moved to a more fit location later.
Change-Id: Ia2e6e4800844dda0abc19347768a0927e0c3db9f
Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
Diffstat (limited to 'patches/opnfv-fuel/upstream-backports')
| -rw-r--r-- | patches/opnfv-fuel/upstream-backports/0006-deploy-SFC-scenarios-Pin-4.9-krn-no-vhost_net.patch | 261 |
1 files changed, 261 insertions, 0 deletions
diff --git a/patches/opnfv-fuel/upstream-backports/0006-deploy-SFC-scenarios-Pin-4.9-krn-no-vhost_net.patch b/patches/opnfv-fuel/upstream-backports/0006-deploy-SFC-scenarios-Pin-4.9-krn-no-vhost_net.patch new file mode 100644 index 00000000..4a59ab80 --- /dev/null +++ b/patches/opnfv-fuel/upstream-backports/0006-deploy-SFC-scenarios-Pin-4.9-krn-no-vhost_net.patch @@ -0,0 +1,261 @@ +:::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::: +: Copyright (c) 2017 Enea AB and others. +: +: All rights reserved. This program and the accompanying materials +: are made available under the terms of the Apache License, Version 2.0 +: which accompanies this distribution, and is available at +: http://www.apache.org/licenses/LICENSE-2.0 +:::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::: +From: Alexandru Avadanii <Alexandru.Avadanii@enea.com> +Date: Wed, 29 Mar 2017 17:39:57 +0200 +Subject: [PATCH] deploy: SFC scenarios: Pin 4.9 krn, no vhost_net + +Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com> +--- + .../ha_odl-l2_sfc_heat_ceilometer_scenario.yaml | 111 +++++++++++++++++++++ + .../no-ha_odl-l2_sfc_heat_ceilometer_scenario.yaml | 110 ++++++++++++++++++++ + 2 files changed, 221 insertions(+) + +diff --git a/deploy/scenario/ha_odl-l2_sfc_heat_ceilometer_scenario.yaml b/deploy/scenario/ha_odl-l2_sfc_heat_ceilometer_scenario.yaml +index 1b5ddf2..8d59201 100644 +--- a/deploy/scenario/ha_odl-l2_sfc_heat_ceilometer_scenario.yaml ++++ b/deploy/scenario/ha_odl-l2_sfc_heat_ceilometer_scenario.yaml +@@ -93,6 +93,117 @@ dea-override-config: + - id: 5 + interfaces: interfaces_1 + role: ceph-osd,compute ++ settings: ++ editable: ++ provision: ++ metadata: ++ group: general ++ label: Provision ++ restrictions: ++ - action: hide ++ condition: 'false' ++ weight: 80 ++ method: ++ type: hidden ++ value: image ++ packages: ++ label: Initial packages ++ type: textarea ++ value: 'acl ++ ++ anacron ++ ++ armband-vhost-net-blacklist ++ ++ bash-completion ++ ++ bridge-utils ++ ++ bsdmainutils ++ ++ build-essential ++ ++ cloud-init ++ ++ curl ++ ++ daemonize ++ ++ debconf-utils ++ ++ gdisk ++ ++ grub-efi-arm64 ++ ++ hwloc ++ ++ linux-firmware ++ ++ linux-headers-4.8.0-9944-generic ++ ++ linux-image-4.8.0-9944-generic ++ ++ linux-image-extra-4.8.0-9944-generic ++ ++ lvm2 ++ ++ mcollective ++ ++ mdadm ++ ++ multipath-tools ++ ++ multipath-tools-boot ++ ++ nailgun-agent ++ ++ nailgun-mcagents ++ ++ network-checker ++ ++ ntp ++ ++ ntpdate ++ ++ openssh-client ++ ++ openssh-server ++ ++ puppet ++ ++ python-amqp ++ ++ ruby-augeas ++ ++ ruby-ipaddress ++ ++ ruby-json ++ ++ ruby-netaddr ++ ++ ruby-openstack ++ ++ ruby-shadow ++ ++ ruby-stomp ++ ++ telnet ++ ++ ubuntu-minimal ++ ++ ubuntu-standard ++ ++ uuid-runtime ++ ++ vim ++ ++ virt-what ++ ++ vlan ++ ++ ' ++ weight: 10 ++ + dha-override-config: + nodes: + - id: 1 +diff --git a/deploy/scenario/no-ha_odl-l2_sfc_heat_ceilometer_scenario.yaml b/deploy/scenario/no-ha_odl-l2_sfc_heat_ceilometer_scenario.yaml +index 495d109..038f548 100644 +--- a/deploy/scenario/no-ha_odl-l2_sfc_heat_ceilometer_scenario.yaml ++++ b/deploy/scenario/no-ha_odl-l2_sfc_heat_ceilometer_scenario.yaml +@@ -95,6 +95,116 @@ dea-override-config: + interfaces: interfaces_1 + role: ceph-osd,compute + transformations: transformations_2 ++ settings: ++ editable: ++ provision: ++ metadata: ++ group: general ++ label: Provision ++ restrictions: ++ - action: hide ++ condition: 'false' ++ weight: 80 ++ method: ++ type: hidden ++ value: image ++ packages: ++ label: Initial packages ++ type: textarea ++ value: 'acl ++ ++ anacron ++ ++ armband-vhost-net-blacklist ++ ++ bash-completion ++ ++ bridge-utils ++ ++ bsdmainutils ++ ++ build-essential ++ ++ cloud-init ++ ++ curl ++ ++ daemonize ++ ++ debconf-utils ++ ++ gdisk ++ ++ grub-efi-arm64 ++ ++ hwloc ++ ++ linux-firmware ++ ++ linux-headers-4.8.0-9944-generic ++ ++ linux-image-4.8.0-9944-generic ++ ++ linux-image-extra-4.8.0-9944-generic ++ ++ lvm2 ++ ++ mcollective ++ ++ mdadm ++ ++ multipath-tools ++ ++ multipath-tools-boot ++ ++ nailgun-agent ++ ++ nailgun-mcagents ++ ++ network-checker ++ ++ ntp ++ ++ ntpdate ++ ++ openssh-client ++ ++ openssh-server ++ ++ puppet ++ ++ python-amqp ++ ++ ruby-augeas ++ ++ ruby-ipaddress ++ ++ ruby-json ++ ++ ruby-netaddr ++ ++ ruby-openstack ++ ++ ruby-shadow ++ ++ ruby-stomp ++ ++ telnet ++ ++ ubuntu-minimal ++ ++ ubuntu-standard ++ ++ uuid-runtime ++ ++ vim ++ ++ virt-what ++ ++ vlan ++ ++ ' ++ weight: 10 + + dha-override-config: + nodes: |