summaryrefslogtreecommitdiffstats
path: root/patches/fuel-library/0010-nova-Fix-inject-for-direct-boot-with-part-table.patch
diff options
context:
space:
mode:
authorAlexandru Avadanii <Alexandru.Avadanii@enea.com>2016-05-13 19:37:20 +0200
committerAlexandru Avadanii <Alexandru.Avadanii@enea.com>2016-05-16 12:01:02 +0000
commit2741c6e75c660727177b9d32d5cf29c60b40eb25 (patch)
treeaa0c68d520701d58380fd6fa7989576ba0406200 /patches/fuel-library/0010-nova-Fix-inject-for-direct-boot-with-part-table.patch
parent85c96cb879081b3b13a6d53c50866637d09f9f42 (diff)
Rebase: p/fuel-library: Update after 96da5b4a.
Refresh patches after: "Move openstack specific tasks to their own folder structure" NOTE: The qemu-kvm change patch (0003-Make-qemu-kvm-architecture-aware.patch) only affects RedHat systems, so it is optional, at least for the current stage. [1] https://github.com/openstack/fuel-library/commit/ 96da5b4a1eb82a76fb416d93f5249dc32e2499f2 Change-Id: Ibd1fd3f7e45d7947c90336bbe7e2ace101b5802b
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.patch12
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":