diff options
Diffstat (limited to 'patches/fuel-library/0010-nova-Fix-inject-for-direct-boot-with-part-table.patch')
| -rw-r--r-- | patches/fuel-library/0010-nova-Fix-inject-for-direct-boot-with-part-table.patch | 12 |
1 files changed, 5 insertions, 7 deletions
diff --git a/patches/fuel-library/0010-nova-Fix-inject-for-direct-boot-with-part-table.patch b/patches/fuel-library/0010-nova-Fix-inject-for-direct-boot-with-part-table.patch index 571bcb70..4a242b90 100644 --- a/patches/fuel-library/0010-nova-Fix-inject-for-direct-boot-with-part-table.patch +++ b/patches/fuel-library/0010-nova-Fix-inject-for-direct-boot-with-part-table.patch @@ -13,7 +13,7 @@ Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com> Signed-off-by: Stanislaw Kardach <stanislaw.kardach@caviumnetworks.com> --- .../openstack/files/nova-libvirt-inject.patch | 44 ++++++++++++++++++++++ - deployment/puppet/openstack/manifests/compute.pp | 12 ++++++ + deployment/puppet/openstack_tasks/manifests/roles/compute.pp | 12 ++++++ 2 files changed, 56 insertions(+) create mode 100644 deployment/puppet/openstack/files/nova-libvirt-inject.patch @@ -67,13 +67,11 @@ index 0000000..9cbfe5f + target_partition = CONF.libvirt.inject_partition + if target_partition == 0: + target_partition = None -diff --git a/deployment/puppet/openstack/manifests/compute.pp b/deployment/puppet/openstack/manifests/compute.pp +diff --git a/deployment/puppet/openstack_tasks/manifests/roles/compute.pp b/deployment/puppet/openstack_tasks/manifests/roles/compute.pp index 46b1801..d42d6a1 100644 ---- a/deployment/puppet/openstack/manifests/compute.pp -+++ b/deployment/puppet/openstack/manifests/compute.pp -@@ -281,6 +281,18 @@ class openstack::compute ( - notify_on_state_change => $notify_on_state_change, - memcached_servers => $memcached_addresses, +--- a/deployment/puppet/openstack_tasks/manifests/roles/compute.pp ++++ b/deployment/puppet/openstack_tasks/manifests/roles/compute.pp +@@ -281,4 +281,16 @@ class openstack::compute ( } -> + # FIXME(armband): Fix inject for part image direct boot (bug LP #1469308) + file { "${nova_path}/libvirt-inject.patch": |