[openstack-tripleo-image-elements] Add additional patches needed
slagle
slagle at fedoraproject.org
Wed Apr 2 18:09:48 UTC 2014
commit 32817efd3ec12a402b8aad56ceb7cd55cc4c20df
Author: James Slagle <jslagle at redhat.com>
Date: Wed Apr 2 14:09:29 2014 -0400
Add additional patches needed
0002-Fix-tgt-target-in-cinder-element.patch | 33 ++++++++++++++++++++
0011-ovs-neutron-plugin-ini-neutron-group | 27 +++++++++++++++++
0012-cinder-install-tgt.patch | 23 ++++++++++++++
0013-Expose-dnsmasq-options.patch | 43 +++++++++++++++++++++++++++
0014-Cinder-conf-patch.patch | 32 ++++++++++++++++++++
openstack-tripleo-image-elements.spec | 38 +++++++++++++++++++++++-
6 files changed, 195 insertions(+), 1 deletions(-)
---
diff --git a/0002-Fix-tgt-target-in-cinder-element.patch b/0002-Fix-tgt-target-in-cinder-element.patch
index e69de29..896d25b 100644
--- a/0002-Fix-tgt-target-in-cinder-element.patch
+++ b/0002-Fix-tgt-target-in-cinder-element.patch
@@ -0,0 +1,33 @@
+From 8b86ab0731522f969a47be545ef3457760f58926 Mon Sep 17 00:00:00 2001
+From: Ryan Brady <rbrady at redhat.com>
+Date: Thu, 20 Mar 2014 09:04:33 -0400
+Subject: [PATCH] Fix tgt target in cinder element
+
+The package install version creates a file at /etc/tgt/conf.d/cinder.conf
+and the cinder element has been adding an additional file. This would have
+the effect of the source install working properly, but the package install
+would end up creating volumes in /etc/cinder/volume instead of /mnt/state.
+
+This patch changes the tgt target to be written to the existing file to
+bring both the source and package installs to behave the same.
+
+Change-Id: Ieeaa9518d6ed50595fbd70f1bbf0a17e3b5b1894
+---
+ elements/cinder/install.d/73-cinder | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/elements/cinder/install.d/73-cinder b/elements/cinder/install.d/73-cinder
+index 3d0260b..fd03d2e 100755
+--- a/elements/cinder/install.d/73-cinder
++++ b/elements/cinder/install.d/73-cinder
+@@ -6,5 +6,5 @@ mkdir -p /etc/tgt/conf.d
+ install -d -o root -g cinder -m 0770 /var/lib/cinder/volumes
+ install -d -o root -g cinder -m 0770 /var/lib/cinder/nfs
+ register-state-path /var/lib/cinder
+-echo 'include /etc/tgt/conf.d/cinder_tgt.conf' > /etc/tgt/targets.conf
+-echo 'include /mnt/state/var/lib/cinder/volumes/*' > /etc/tgt/conf.d/cinder_tgt.conf
++echo 'include /etc/tgt/conf.d/cinder.conf' > /etc/tgt/targets.conf
++echo 'include /mnt/state/var/lib/cinder/volumes/*' > /etc/tgt/conf.d/cinder.conf
+--
+1.8.5.3
+
diff --git a/0011-ovs-neutron-plugin-ini-neutron-group b/0011-ovs-neutron-plugin-ini-neutron-group
new file mode 100644
index 0000000..5cb6f81
--- /dev/null
+++ b/0011-ovs-neutron-plugin-ini-neutron-group
@@ -0,0 +1,27 @@
+From c7a32feed0110e61e8f12333f36b2298a7947a79 Mon Sep 17 00:00:00 2001
+From: James Slagle <jslagle at redhat.com>
+Date: Tue, 25 Mar 2014 16:22:48 -0400
+Subject: [PATCH] Neutron patch
+
+Change-Id: I51626012237dcc3eed3b0c1e8427d23594277fc9
+---
+ .../install.d/neutron-package-install/80-neutron-openvswitch-agent | 6 ++++++
+ 1 file changed, 6 insertions(+)
+
+diff --git a/elements/neutron-openvswitch-agent/install.d/neutron-package-install/80-neutron-openvswitch-agent b/elements/neutron-openvswitch-agent/install.d/neutron-package-install/80-neutron-openvswitch-agent
+index 3c14c42..5b63d58 100755
+--- a/elements/neutron-openvswitch-agent/install.d/neutron-package-install/80-neutron-openvswitch-agent
++++ b/elements/neutron-openvswitch-agent/install.d/neutron-package-install/80-neutron-openvswitch-agent
+@@ -5,3 +5,9 @@ set -eux
+ install-packages openstack-neutron-openvswitch
+
+ os-svc-daemon -n neutron-openvswitch-agent -u neutron -c noop -d
++
++# Workaround for:
++# https://bugzilla.redhat.com/show_bug.cgi?id=1080438
++# /etc/neutron/plugins/openvswitch/ovs_neutron_plugin.ini should be in the
++# neutron group.
++chgrp neutron /etc/neutron/plugins/openvswitch/ovs_neutron_plugin.ini
+--
+1.8.5.3
+
diff --git a/0012-cinder-install-tgt.patch b/0012-cinder-install-tgt.patch
new file mode 100644
index 0000000..3de3cfc
--- /dev/null
+++ b/0012-cinder-install-tgt.patch
@@ -0,0 +1,23 @@
+From 2afd7139c064d4b79948b14450c5457bd6d5ca21 Mon Sep 17 00:00:00 2001
+From: James Slagle <jslagle at redhat.com>
+Date: Tue, 25 Mar 2014 13:17:19 -0400
+Subject: [PATCH] Cinder patch
+
+Change-Id: I9bb951f93b47128fc94c137faccd742c17d4e094
+---
+ elements/cinder/install.d/cinder-package-install/72-cinder | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/elements/cinder/install.d/cinder-package-install/72-cinder b/elements/cinder/install.d/cinder-package-install/72-cinder
+index 969513a..fdbd792 100755
+--- a/elements/cinder/install.d/cinder-package-install/72-cinder
++++ b/elements/cinder/install.d/cinder-package-install/72-cinder
+@@ -3,4 +3,4 @@
+ set -eux
+
+ # lvm2 is needed by the 72-cinder-resize-volume-groups os-refresh-config script
+-install-packages openstack-cinder lvm2
++install-packages openstack-cinder lvm2 tgt
+--
+1.8.5.3
+
diff --git a/0013-Expose-dnsmasq-options.patch b/0013-Expose-dnsmasq-options.patch
new file mode 100644
index 0000000..62062c3
--- /dev/null
+++ b/0013-Expose-dnsmasq-options.patch
@@ -0,0 +1,43 @@
+From 1f3d64e5a21f0a9e32d76d0fb1cdf6c68f0b5614 Mon Sep 17 00:00:00 2001
+From: James Slagle <jslagle at redhat.com>
+Date: Tue, 25 Mar 2014 08:32:33 -0400
+Subject: [PATCH] Expose dnsmasq options
+
+Expose the ability to set dnsmasq options for neutron dhcp agent. This
+will allow us to configure mtu to be 1400 for tenant instances on the
+overcloud. This should help with poor network performance and vm's that
+are just plain unreachable via ssh due to the GRE tunnel overhead.
+
+This will use a corresponding change to tripleo-heat-templates:
+If24326045987b5a484ba2f71f591092987966536
+
+Change-Id: I7dba10406a8560b5e177b5a983485d637cca3105
+Partial-Bug: #1270646
+---
+ elements/neutron/os-apply-config/etc/neutron/dhcp_agent.ini | 4 ++++
+ elements/neutron/os-apply-config/etc/neutron/dnsmasq-neutron.conf | 1 +
+ 2 files changed, 5 insertions(+)
+ create mode 100644 elements/neutron/os-apply-config/etc/neutron/dnsmasq-neutron.conf
+
+diff --git a/elements/neutron/os-apply-config/etc/neutron/dhcp_agent.ini b/elements/neutron/os-apply-config/etc/neutron/dhcp_agent.ini
+index e8cc602..1b07e33 100644
+--- a/elements/neutron/os-apply-config/etc/neutron/dhcp_agent.ini
++++ b/elements/neutron/os-apply-config/etc/neutron/dhcp_agent.ini
+@@ -8,3 +8,7 @@ state_path = /var/run/neutron
+ interface_driver = neutron.agent.linux.interface.OVSInterfaceDriver
+ dhcp_driver = neutron.agent.linux.dhcp.Dnsmasq
+ use_namespaces = True
++
++{{#neutron.dnsmasq-options}}
++dnsmasq_config_file=/etc/neutron/dnsmasq-neutron.conf
++{{/neutron.dnsmasq-options}}
+diff --git a/elements/neutron/os-apply-config/etc/neutron/dnsmasq-neutron.conf b/elements/neutron/os-apply-config/etc/neutron/dnsmasq-neutron.conf
+new file mode 100644
+index 0000000..03ca340
+--- /dev/null
++++ b/elements/neutron/os-apply-config/etc/neutron/dnsmasq-neutron.conf
+@@ -0,0 +1 @@
++{{neutron.dnsmasq-options}}
+--
+1.8.5.3
+
diff --git a/0014-Cinder-conf-patch.patch b/0014-Cinder-conf-patch.patch
new file mode 100644
index 0000000..3815d09
--- /dev/null
+++ b/0014-Cinder-conf-patch.patch
@@ -0,0 +1,32 @@
+From c34cf1a55b4a2e4da1cd7d43c7ae3201c9f0a709 Mon Sep 17 00:00:00 2001
+From: James Slagle <jslagle at redhat.com>
+Date: Thu, 27 Mar 2014 07:31:44 -0400
+Subject: [PATCH] Cinder conf patch
+
+Change-Id: I0301d8d51a64e96e12499dd0dcc3aba52369dd41
+---
+ elements/cinder/os-apply-config/etc/cinder/cinder.conf | 6 +++++-
+ 1 file changed, 5 insertions(+), 1 deletion(-)
+
+diff --git a/elements/cinder/os-apply-config/etc/cinder/cinder.conf b/elements/cinder/os-apply-config/etc/cinder/cinder.conf
+index 3812cbe..f30fd19 100644
+--- a/elements/cinder/os-apply-config/etc/cinder/cinder.conf
++++ b/elements/cinder/os-apply-config/etc/cinder/cinder.conf
+@@ -12,9 +12,13 @@ verbose={{cinder.verbose}}
+ debug={{cinder.debug}}
+ {{/cinder.debug}}
+
+-state_path = /mnt/state/var/lib/cinder
+ api_paste_config = /etc/cinder/api-paste.ini
+
++state_path = /mnt/state/var/lib/cinder
++lock_path = /mnt/state/var/lib/cinder
++volumes_dir = /mnt/state/var/lib/cinder/volumes
++iscsi_helper = tgtadm
++
+ {{#cinder.include_nfs_backend}}
+ nfs_shares_config=/etc/cinder/shares.txt
+ nfs_mount_point_base=/mnt/state/var/lib/cinder/nfs
+--
+1.8.5.3
+
diff --git a/openstack-tripleo-image-elements.spec b/openstack-tripleo-image-elements.spec
index ce3117f..4f1cb44 100644
--- a/openstack-tripleo-image-elements.spec
+++ b/openstack-tripleo-image-elements.spec
@@ -4,7 +4,7 @@
Name: openstack-tripleo-image-elements
Summary: OpenStack TripleO Image Elements for diskimage-builder
Version: 0.6.3
-Release: 2%{?dist}
+Release: 5%{?dist}
License: ASL 2.0
Group: System Environment/Base
URL: https://wiki.openstack.org/wiki/TripleO
@@ -52,8 +52,30 @@ Patch0009: 0009-Create-and-use-libvirtd-group-for-package-install.patch
# No service for swift-container-sync exists in rdo, temporarily patch the
# enable and restart for this service out until we figure out the right fix.
+# https://review.openstack.org/#/c/82625/
Patch0010: 0010-No-swift-continer-sync-service.patch
+# Workaround for:
+# https://bugzilla.redhat.com/show_bug.cgi?id=1080438
+# /etc/neutron/plugins/openvswitch/ovs_neutron_plugin.ini should be in the neutron group.
+# Should probably be submitted upstream if we don't get a fixed RDO package.
+Patch0011: 0011-ovs-neutron-plugin-ini-neutron-group
+
+# openstack-cinder no longer requires scsi-target-utils, so we must install the
+# package manually.
+# Once upstream is refactored into cinder-tgt and cinder-lio support, we can
+# just build images with the element we need:
+# https://review.openstack.org/#/c/78462/
+Patch0012: 0012-cinder-install-tgt.patch
+
+# https://review.openstack.org/#/c/82804/
+# git format-patch -1 1f3d64e5a21f0a9e32d76d0fb1cdf6c68f0b5614
+Patch0013: 0013-Expose-dnsmasq-options.patch
+
+# Patch cinder.conf to set lock_path, volumes_dir, iscsi_helper.
+# Needs to be submitted upstream.
+Patch0014: 0014-Cinder-conf-patch.patch
+
BuildArch: noarch
BuildRequires: python
BuildRequires: python2-devel
@@ -81,6 +103,10 @@ program.
%patch0008 -p1
%patch0009 -p1
%patch0010 -p1
+%patch0011 -p1
+%patch0012 -p1
+%patch0013 -p1
+%patch0014 -p1
%build
%{__python} setup.py build
@@ -100,6 +126,16 @@ find %{buildroot} -name .git-keep-empty | xargs rm -f
%{_datadir}/tripleo-image-elements
%changelog
+* Thu Mar 27 2014 James Slagle <jslagle at redhat.com> - 0.6.3-5
+- Add patch for cinder.conf
+
+* Wed Mar 26 2014 James Slagle <jslagle at redhat.com> - 0.6.3-4
+- Fix 0002-Fix-tgt-target-in-cinder-element.patch, which was misgenerated
+ before
+
+* Tue Mar 25 2014 James Slagle <jslagle at redhat.com> - 0.6.3-3
+- Add additional patches for some needed workarounds.
+
* Sun Mar 23 2014 James Slagle <jslagle at redhat.com> - 0.6.3-2
- Add Patch 0008-Add-missing-x.patch
- Add Patch 0009-Create-and-use-libvirtd-group-for-package-install.patch
More information about the scm-commits
mailing list