[openstack-tripleo-image-elements] Update to upstream 0.8.10
slagle
slagle at fedoraproject.org
Mon Oct 20 16:53:08 UTC 2014
commit cf7be9cdf3520831ba780dcea2f828e9228595d6
Author: James Slagle <jslagle at redhat.com>
Date: Mon Oct 20 12:48:52 2014 -0400
Update to upstream 0.8.10
.gitignore | 1 +
0001-Cinder-conf-patch.patch | 2 +-
0002-Change-default-swift-bind_ports.patch | 2 +-
...3-SELinux-Update-keepalived-custom-policy.patch | 2 +-
0003-Work-around-keepalived-split-brain.patch | 48 ------
...hat-keystonemiddleware-package-is-install.patch | 27 ---
...-Fix-mnt-state-var-log-keepalived-context.patch | 2 +-
...-middleware-position-swift-proxy-server-p.patch | 29 ----
...-neutron-rootwrap.d-symlink-is-not-nested.patch | 2 +-
...06-Add-package-install-support-for-tuskar.patch | 2 +-
...gures-novnc-proxy-to-listen-on-local-ipv4.patch | 34 ----
...Add-package-install-support-for-tuskar-ui.patch | 2 +-
0007-Configure-logging-for-keepalived.patch | 58 -------
...the-storage-roles-in-Tuskar-if-they-exist.patch | 61 -------
...Associate-default-images-to-storage-roles.patch | 34 ----
0010-Remove-all-first-boot.d-references.patch | 58 -------
0011-SELinux-Fix-keepalived-killall-denials.patch | 175 --------------------
...ift-denied-access-to-var-lib-swift-.local.patch | 36 ----
0013-Fix-os-svc-install.patch | 30 ----
0014-Support-Debian-distro-for-iptables.patch | 89 ----------
...d-ability-to-enable-debug-logging-on-seed.patch | 77 ---------
openstack-tripleo-image-elements.spec | 43 +----
sources | 2 +-
23 files changed, 19 insertions(+), 797 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index b507c58..b75028c 100644
--- a/.gitignore
+++ b/.gitignore
@@ -4,3 +4,4 @@
/tripleo-image-elements-0.8.7.tar.gz
/tripleo-image-elements-0.8.8.tar.gz
/tripleo-image-elements-0.8.9.tar.gz
+/tripleo-image-elements-0.8.10.tar.gz
diff --git a/0001-Cinder-conf-patch.patch b/0001-Cinder-conf-patch.patch
index d7c74bf..9575cef 100644
--- a/0001-Cinder-conf-patch.patch
+++ b/0001-Cinder-conf-patch.patch
@@ -1,4 +1,4 @@
-From f0c4bc43d0ef107c081f5081ce784cc39595c232 Mon Sep 17 00:00:00 2001
+From 2303f8310159be69f5a817f92d03ef1af48fd0f7 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
diff --git a/0002-Change-default-swift-bind_ports.patch b/0002-Change-default-swift-bind_ports.patch
index 6b34ebb..04fe4ee 100644
--- a/0002-Change-default-swift-bind_ports.patch
+++ b/0002-Change-default-swift-bind_ports.patch
@@ -1,4 +1,4 @@
-From 9a73b8a1cf8cdf23cbf065358532210c66dcdb40 Mon Sep 17 00:00:00 2001
+From da8c680c78f28d99bbfc76fc817ea67b8d0fba9c 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/0016-SELinux-Update-keepalived-custom-policy.patch b/0003-SELinux-Update-keepalived-custom-policy.patch
similarity index 98%
rename from 0016-SELinux-Update-keepalived-custom-policy.patch
rename to 0003-SELinux-Update-keepalived-custom-policy.patch
index 7b78313..b080758 100644
--- a/0016-SELinux-Update-keepalived-custom-policy.patch
+++ b/0003-SELinux-Update-keepalived-custom-policy.patch
@@ -1,4 +1,4 @@
-From 414c6bfaff36f2725a830d8a76656908a90816cb Mon Sep 17 00:00:00 2001
+From 626c903870af3dfbe0edca951ad4b722bc30a9e0 Mon Sep 17 00:00:00 2001
From: Richard Su <rwsu at redhat.com>
Date: Wed, 15 Oct 2014 13:58:13 -0700
Subject: [PATCH] SELinux: Update keepalived custom policy
diff --git a/0017-SELinux-Fix-mnt-state-var-log-keepalived-context.patch b/0004-SELinux-Fix-mnt-state-var-log-keepalived-context.patch
similarity index 95%
rename from 0017-SELinux-Fix-mnt-state-var-log-keepalived-context.patch
rename to 0004-SELinux-Fix-mnt-state-var-log-keepalived-context.patch
index 4048f8c..b4a3720 100644
--- a/0017-SELinux-Fix-mnt-state-var-log-keepalived-context.patch
+++ b/0004-SELinux-Fix-mnt-state-var-log-keepalived-context.patch
@@ -1,4 +1,4 @@
-From 902f5843d1b00bdcf2ba9fb17d3e5ac98cd9e9a3 Mon Sep 17 00:00:00 2001
+From 5c9b8baa7df0583650607406d5abfd479d27fe54 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/0018-Ensure-neutron-rootwrap.d-symlink-is-not-nested.patch b/0005-Ensure-neutron-rootwrap.d-symlink-is-not-nested.patch
similarity index 95%
rename from 0018-Ensure-neutron-rootwrap.d-symlink-is-not-nested.patch
rename to 0005-Ensure-neutron-rootwrap.d-symlink-is-not-nested.patch
index 304bfda..b2de5a2 100644
--- a/0018-Ensure-neutron-rootwrap.d-symlink-is-not-nested.patch
+++ b/0005-Ensure-neutron-rootwrap.d-symlink-is-not-nested.patch
@@ -1,4 +1,4 @@
-From ec2bb4c3dbfc46517453339d877e8e00890aa0b2 Mon Sep 17 00:00:00 2001
+From 68fd0a46119a56a570d67e47e87df3cb266561ca 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/0019-Add-package-install-support-for-tuskar.patch b/0006-Add-package-install-support-for-tuskar.patch
similarity index 97%
rename from 0019-Add-package-install-support-for-tuskar.patch
rename to 0006-Add-package-install-support-for-tuskar.patch
index 1f41758..b6dcdda 100644
--- a/0019-Add-package-install-support-for-tuskar.patch
+++ b/0006-Add-package-install-support-for-tuskar.patch
@@ -1,4 +1,4 @@
-From c01f13a28ef4f9ecb0fd85eb3425ece05e6f2478 Mon Sep 17 00:00:00 2001
+From 13e41ab38fd067570a99ab21e50e5c2c00674a07 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/0020-Add-package-install-support-for-tuskar-ui.patch b/0007-Add-package-install-support-for-tuskar-ui.patch
similarity index 95%
rename from 0020-Add-package-install-support-for-tuskar-ui.patch
rename to 0007-Add-package-install-support-for-tuskar-ui.patch
index fc42b57..f3934b6 100644
--- a/0020-Add-package-install-support-for-tuskar-ui.patch
+++ b/0007-Add-package-install-support-for-tuskar-ui.patch
@@ -1,4 +1,4 @@
-From dc17d83eebcee0803a44af9ffcdee47989051526 Mon Sep 17 00:00:00 2001
+From a575051653a2e4d017749dc487125cd6c777a785 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/openstack-tripleo-image-elements.spec b/openstack-tripleo-image-elements.spec
index fe5f62a..e0c8436 100644
--- a/openstack-tripleo-image-elements.spec
+++ b/openstack-tripleo-image-elements.spec
@@ -3,8 +3,8 @@
Name: openstack-tripleo-image-elements
Summary: OpenStack TripleO Image Elements for diskimage-builder
-Version: 0.8.9
-Release: 5%{?dist}
+Version: 0.8.10
+Release: 1%{?dist}
License: ASL 2.0
Group: System Environment/Base
URL: https://wiki.openstack.org/wiki/TripleO
@@ -12,24 +12,11 @@ Source0: http://tarballs.openstack.org/tripleo-image-elements/tripleo-image-elem
Patch0001: 0001-Cinder-conf-patch.patch
Patch0002: 0002-Change-default-swift-bind_ports.patch
-Patch0003: 0003-Work-around-keepalived-split-brain.patch
-Patch0004: 0004-Make-sure-that-keystonemiddleware-package-is-install.patch
-Patch0005: 0005-Correct-slo-middleware-position-swift-proxy-server-p.patch
-Patch0006: 0006-Configures-novnc-proxy-to-listen-on-local-ipv4.patch
-Patch0007: 0007-Configure-logging-for-keepalived.patch
-Patch0008: 0008-Load-the-storage-roles-in-Tuskar-if-they-exist.patch
-Patch0009: 0009-Associate-default-images-to-storage-roles.patch
-Patch0010: 0010-Remove-all-first-boot.d-references.patch
-Patch0011: 0011-SELinux-Fix-keepalived-killall-denials.patch
-Patch0012: 0012-SELinux-swift-denied-access-to-var-lib-swift-.local.patch
-Patch0013: 0013-Fix-os-svc-install.patch
-Patch0014: 0014-Support-Debian-distro-for-iptables.patch
-Patch0015: 0015-Add-ability-to-enable-debug-logging-on-seed.patch
-Patch0016: 0016-SELinux-Update-keepalived-custom-policy.patch
-Patch0017: 0017-SELinux-Fix-mnt-state-var-log-keepalived-context.patch
-Patch0018: 0018-Ensure-neutron-rootwrap.d-symlink-is-not-nested.patch
-Patch0019: 0019-Add-package-install-support-for-tuskar.patch
-Patch0020: 0020-Add-package-install-support-for-tuskar-ui.patch
+Patch0003: 0003-SELinux-Update-keepalived-custom-policy.patch
+Patch0004: 0004-SELinux-Fix-mnt-state-var-log-keepalived-context.patch
+Patch0005: 0005-Ensure-neutron-rootwrap.d-symlink-is-not-nested.patch
+Patch0006: 0006-Add-package-install-support-for-tuskar.patch
+Patch0007: 0007-Add-package-install-support-for-tuskar-ui.patch
BuildArch: noarch
BuildRequires: python
@@ -53,19 +40,6 @@ program.
%patch0005 -p1
%patch0006 -p1
%patch0007 -p1
-%patch0008 -p1
-%patch0009 -p1
-%patch0010 -p1
-%patch0011 -p1
-%patch0012 -p1
-%patch0013 -p1
-%patch0014 -p1
-%patch0015 -p1
-%patch0016 -p1
-%patch0017 -p1
-%patch0018 -p1
-%patch0019 -p1
-%patch0020 -p1
%build
%{__python} setup.py build
@@ -116,6 +90,9 @@ fi
%{_datadir}/tripleo-image-elements
%changelog
+* Mon Oct 20 2014 James Slagle <jslagle at redhat.com> 0.8.10-1
+- Update to upstream 0.8.10
+
* Fri Oct 17 2014 James Slagle <jslagle at redhat.com> 0.8.9-5
- Make sure 100-tuskar-api is +x
diff --git a/sources b/sources
index 9b26761..38a75b0 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-6a7ca14953eca9cc29d25e968b2b483e tripleo-image-elements-0.8.9.tar.gz
+12aacfadbf1560550d5c48fc5f48e2ee tripleo-image-elements-0.8.10.tar.gz
More information about the scm-commits
mailing list