[openstack-tripleo-image-elements] Updated patches from master-patches
slagle
slagle at fedoraproject.org
Mon Dec 1 20:36:21 UTC 2014
commit 5809661de4af0550a74e4a9d0f7d08277ecece4f
Author: James Slagle <jslagle at redhat.com>
Date: Mon Dec 1 15:36:04 2014 -0500
Updated patches from master-patches
...o-set-lock_path-and-volumes_dir.-We-need-.patch | 16 +++++++++-------
0002-Change-default-swift-bind_ports.patch | 2 +-
...-Fix-mnt-state-var-log-keepalived-context.patch | 2 +-
...-neutron-rootwrap.d-symlink-is-not-nested.patch | 2 +-
0005-Add-package-install-support-for-tuskar.patch | 2 +-
...Add-package-install-support-for-tuskar-ui.patch | 2 +-
0007-Make-rdo-release-install-safe.patch | 2 +-
...-Change-how-SELinux-policies-are-compiled.patch | 2 +-
0009-Simplify-keepalived-custom-policy.patch | 2 +-
...ombine-policy-installs-into-one-operation.patch | 2 +-
0011-Make-101-tuskar-ui-re-runnable.patch | 2 +-
0012-Copy-static-files-for-packaged-installs.patch | 2 +-
0013-Increase-rabbitmq-timeout.patch | 2 +-
openstack-tripleo-image-elements.spec | 2 +-
14 files changed, 22 insertions(+), 20 deletions(-)
---
diff --git a/0001-Cinder-conf-patch.patch b/0001-Add-patch-to-set-lock_path-and-volumes_dir.-We-need-.patch
similarity index 56%
rename from 0001-Cinder-conf-patch.patch
rename to 0001-Add-patch-to-set-lock_path-and-volumes_dir.-We-need-.patch
index 9575cef..eead858 100644
--- a/0001-Cinder-conf-patch.patch
+++ b/0001-Add-patch-to-set-lock_path-and-volumes_dir.-We-need-.patch
@@ -1,23 +1,25 @@
-From 2303f8310159be69f5a817f92d03ef1af48fd0f7 Mon Sep 17 00:00:00 2001
+From de40b941fbe7109577d4e9f7c4a26458dc52a0e4 Mon Sep 17 00:00:00 2001
From: James Slagle <jslagle at redhat.com>
Date: Wed, 3 Sep 2014 13:20:59 -0400
-Subject: [PATCH] Cinder conf patch
+Subject: [PATCH] Add patch to set lock_path and volumes_dir. We need to set
+ these paths to the TripleO values, otherwise the default paths from
+ cinder-dist.conf are used. We can't use the paths from cinder-dist.conf
+ because they will not be created by os-refresh-config.
---
- elements/cinder/os-apply-config/etc/cinder/cinder.conf | 4 ++++
- 1 file changed, 4 insertions(+)
+ elements/cinder/os-apply-config/etc/cinder/cinder.conf | 3 +++
+ 1 file changed, 3 insertions(+)
diff --git a/elements/cinder/os-apply-config/etc/cinder/cinder.conf b/elements/cinder/os-apply-config/etc/cinder/cinder.conf
-index e26d0de..f177d37 100644
+index e26d0de..c2371ef 100644
--- a/elements/cinder/os-apply-config/etc/cinder/cinder.conf
+++ b/elements/cinder/os-apply-config/etc/cinder/cinder.conf
-@@ -24,6 +24,10 @@ osapi_volume_listen = {{local-ipv4}}
+@@ -24,6 +24,9 @@ osapi_volume_listen = {{local-ipv4}}
state_path = /mnt/state/var/lib/cinder
api_paste_config = /etc/cinder/api-paste.ini
+lock_path = /mnt/state/var/lib/cinder
+volumes_dir = /mnt/state/var/lib/cinder/volumes
-+iscsi_helper = tgtadm
+
{{#cinder.include_nfs_backend}}
# If shared NFS backend is used, we need to set same host for
diff --git a/0002-Change-default-swift-bind_ports.patch b/0002-Change-default-swift-bind_ports.patch
index 04fe4ee..be370a1 100644
--- a/0002-Change-default-swift-bind_ports.patch
+++ b/0002-Change-default-swift-bind_ports.patch
@@ -1,4 +1,4 @@
-From da8c680c78f28d99bbfc76fc817ea67b8d0fba9c Mon Sep 17 00:00:00 2001
+From a704843e810d7e40210b5cf4bf184f441e5b11da Mon Sep 17 00:00:00 2001
From: Richard Su <rwsu at redhat.com>
Date: Mon, 6 Oct 2014 22:36:20 -0700
Subject: [PATCH] Change default swift bind_ports
diff --git a/0003-SELinux-Fix-mnt-state-var-log-keepalived-context.patch b/0003-SELinux-Fix-mnt-state-var-log-keepalived-context.patch
index 52ade9a..97e1049 100644
--- a/0003-SELinux-Fix-mnt-state-var-log-keepalived-context.patch
+++ b/0003-SELinux-Fix-mnt-state-var-log-keepalived-context.patch
@@ -1,4 +1,4 @@
-From 8ba094055a8d058b89a4d8ead8041c6cdcfff90a Mon Sep 17 00:00:00 2001
+From 1f376a44ee89d7cb2520ffe9f7675a30d0140808 Mon Sep 17 00:00:00 2001
From: Richard Su <rwsu at redhat.com>
Date: Wed, 15 Oct 2014 14:33:42 -0700
Subject: [PATCH] SELinux: Fix /mnt/state/var/log/keepalived context
diff --git a/0004-Ensure-neutron-rootwrap.d-symlink-is-not-nested.patch b/0004-Ensure-neutron-rootwrap.d-symlink-is-not-nested.patch
index 1976dbb..03740f3 100644
--- a/0004-Ensure-neutron-rootwrap.d-symlink-is-not-nested.patch
+++ b/0004-Ensure-neutron-rootwrap.d-symlink-is-not-nested.patch
@@ -1,4 +1,4 @@
-From f000cb5fe27db02680116d111b6c0de6743ab742 Mon Sep 17 00:00:00 2001
+From a69e2e78343acbd7d90a1084749595856d5afde6 Mon Sep 17 00:00:00 2001
From: Giulio Fidente <gfidente at redhat.com>
Date: Thu, 16 Oct 2014 16:03:31 +0200
Subject: [PATCH] Ensure neutron rootwrap.d symlink is not nested
diff --git a/0005-Add-package-install-support-for-tuskar.patch b/0005-Add-package-install-support-for-tuskar.patch
index 39cb480..c2e3f87 100644
--- a/0005-Add-package-install-support-for-tuskar.patch
+++ b/0005-Add-package-install-support-for-tuskar.patch
@@ -1,4 +1,4 @@
-From 6b9ee6a73b9c15247ce5698a58748d0ea2a353ea Mon Sep 17 00:00:00 2001
+From 463bbad079bdf16ca4487494924926fa3b728b65 Mon Sep 17 00:00:00 2001
From: James Slagle <jslagle at redhat.com>
Date: Fri, 17 Oct 2014 11:56:12 -0400
Subject: [PATCH] Add package install support for tuskar
diff --git a/0006-Add-package-install-support-for-tuskar-ui.patch b/0006-Add-package-install-support-for-tuskar-ui.patch
index 8c6778a..9fb3273 100644
--- a/0006-Add-package-install-support-for-tuskar-ui.patch
+++ b/0006-Add-package-install-support-for-tuskar-ui.patch
@@ -1,4 +1,4 @@
-From 5eef2950d6f267c2161d79f3d64fb81867bb4a1a Mon Sep 17 00:00:00 2001
+From 85153e11bfcd340a3307d7ac2268d4da3749b322 Mon Sep 17 00:00:00 2001
From: James Slagle <jslagle at redhat.com>
Date: Fri, 17 Oct 2014 11:59:43 -0400
Subject: [PATCH] Add package install support for tuskar-ui
diff --git a/0007-Make-rdo-release-install-safe.patch b/0007-Make-rdo-release-install-safe.patch
index d5b1da4..d1b5d12 100644
--- a/0007-Make-rdo-release-install-safe.patch
+++ b/0007-Make-rdo-release-install-safe.patch
@@ -1,4 +1,4 @@
-From cbe4a193468dec699ee411c0585466c3df84e5e5 Mon Sep 17 00:00:00 2001
+From 35bdb748ec4fe255838270a2713b0290b5c8287b Mon Sep 17 00:00:00 2001
From: Ben Nemec <bnemec at redhat.com>
Date: Mon, 20 Oct 2014 15:41:50 -0500
Subject: [PATCH] Make rdo-release install safe
diff --git a/0008-Change-how-SELinux-policies-are-compiled.patch b/0008-Change-how-SELinux-policies-are-compiled.patch
index a7bbb56..718794f 100644
--- a/0008-Change-how-SELinux-policies-are-compiled.patch
+++ b/0008-Change-how-SELinux-policies-are-compiled.patch
@@ -1,4 +1,4 @@
-From 5bedbc04aa8065509220f1f624c04e54abe7141f Mon Sep 17 00:00:00 2001
+From e4d2adf1d83b36634a6c88a1e885265a13802b35 Mon Sep 17 00:00:00 2001
From: Richard Su <rwsu at redhat.com>
Date: Wed, 22 Oct 2014 19:48:37 -0700
Subject: [PATCH] Change how SELinux policies are compiled
diff --git a/0009-Simplify-keepalived-custom-policy.patch b/0009-Simplify-keepalived-custom-policy.patch
index 3217a44..30ae123 100644
--- a/0009-Simplify-keepalived-custom-policy.patch
+++ b/0009-Simplify-keepalived-custom-policy.patch
@@ -1,4 +1,4 @@
-From be1aaf1d7436def267d7b28e58646009146fb6a8 Mon Sep 17 00:00:00 2001
+From c178472d63aa69450c8f1403f503fb8d9fd783db Mon Sep 17 00:00:00 2001
From: Richard Su <rwsu at redhat.com>
Date: Wed, 22 Oct 2014 20:08:58 -0700
Subject: [PATCH] Simplify keepalived custom policy
diff --git a/0010-Combine-policy-installs-into-one-operation.patch b/0010-Combine-policy-installs-into-one-operation.patch
index a1395b6..3a8194f 100644
--- a/0010-Combine-policy-installs-into-one-operation.patch
+++ b/0010-Combine-policy-installs-into-one-operation.patch
@@ -1,4 +1,4 @@
-From 28892f1e59b594fb4be80d176c8b0542a0d0475d Mon Sep 17 00:00:00 2001
+From 8a4e48b818f3249c49be34909c5606787251f3ba Mon Sep 17 00:00:00 2001
From: Richard Su <rwsu at redhat.com>
Date: Fri, 24 Oct 2014 12:14:28 -0700
Subject: [PATCH] Combine policy installs into one operation
diff --git a/0011-Make-101-tuskar-ui-re-runnable.patch b/0011-Make-101-tuskar-ui-re-runnable.patch
index a19e925..48605f4 100644
--- a/0011-Make-101-tuskar-ui-re-runnable.patch
+++ b/0011-Make-101-tuskar-ui-re-runnable.patch
@@ -1,4 +1,4 @@
-From a034bf31d1d63e974d3a837b73b190fcaae66f3a Mon Sep 17 00:00:00 2001
+From 6b88800283001c1adf65f3d67f63974f11e25874 Mon Sep 17 00:00:00 2001
From: Tzu-Mainn Chen <tzumainn at redhat.com>
Date: Fri, 24 Oct 2014 00:40:10 +0000
Subject: [PATCH] Make 101-tuskar-ui re-runnable
diff --git a/0012-Copy-static-files-for-packaged-installs.patch b/0012-Copy-static-files-for-packaged-installs.patch
index 125d5e2..b8bf040 100644
--- a/0012-Copy-static-files-for-packaged-installs.patch
+++ b/0012-Copy-static-files-for-packaged-installs.patch
@@ -1,4 +1,4 @@
-From c1a37414493971f4b99add1b33ea9a7138aa721e Mon Sep 17 00:00:00 2001
+From 027aa36664215dd80963e3cd364c2425fa4a1ef8 Mon Sep 17 00:00:00 2001
From: Tzu-Mainn Chen <tzumainn at redhat.com>
Date: Tue, 28 Oct 2014 14:27:39 +0000
Subject: [PATCH] Copy static files for packaged installs
diff --git a/0013-Increase-rabbitmq-timeout.patch b/0013-Increase-rabbitmq-timeout.patch
index 7a879d9..5c3a09f 100644
--- a/0013-Increase-rabbitmq-timeout.patch
+++ b/0013-Increase-rabbitmq-timeout.patch
@@ -1,4 +1,4 @@
-From fc6348d626abf0a47d62364368b3527745101c93 Mon Sep 17 00:00:00 2001
+From 28f2f0a4e134da04a2f4d2258227934fedb0588a Mon Sep 17 00:00:00 2001
From: James Slagle <jslagle at redhat.com>
Date: Tue, 28 Oct 2014 13:31:43 -0400
Subject: [PATCH] Increase rabbitmq timeout
diff --git a/openstack-tripleo-image-elements.spec b/openstack-tripleo-image-elements.spec
index 2959fcd..7a0a479 100644
--- a/openstack-tripleo-image-elements.spec
+++ b/openstack-tripleo-image-elements.spec
@@ -10,7 +10,7 @@ Group: System Environment/Base
URL: https://wiki.openstack.org/wiki/TripleO
Source0: http://tarballs.openstack.org/tripleo-image-elements/tripleo-image-elements-%{version}.tar.gz
-Patch0001: 0001-Cinder-conf-patch.patch
+Patch0001: 0001-Add-patch-to-set-lock_path-and-volumes_dir.-We-need-.patch
Patch0002: 0002-Change-default-swift-bind_ports.patch
Patch0003: 0003-SELinux-Fix-mnt-state-var-log-keepalived-context.patch
Patch0004: 0004-Ensure-neutron-rootwrap.d-symlink-is-not-nested.patch
More information about the scm-commits
mailing list