ichavero pushed to openstack-puppet-modules (f21). "Update to upstream 2014.1.2"
notifications at fedoraproject.org
notifications at fedoraproject.org
Sat Apr 4 00:48:39 UTC 2015
>From 84fe8d740c2aab59faf9d1f3a654c4cfe5e1691a Mon Sep 17 00:00:00 2001
From: Ivan Chavero <ichavero at redhat.com>
Date: Fri, 3 Apr 2015 17:28:02 -0700
Subject: Update to upstream 2014.1.2
diff --git a/0001-horizon-Change-default-documentation-URL.patch b/0001-horizon-Change-default-documentation-URL.patch
index f043220..8a01ca2 100644
--- a/0001-horizon-Change-default-documentation-URL.patch
+++ b/0001-horizon-Change-default-documentation-URL.patch
@@ -1,4 +1,4 @@
-From 3291bcf705f7835ade7abbee8e46db1fda4e5dd9 Mon Sep 17 00:00:00 2001
+From 34fd5a360dd7900ee2216916a4a82d2bee5201fd Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Martin=20M=C3=A1gr?= <mmagr at redhat.com>
Date: Wed, 19 Nov 2014 11:35:15 -0500
Subject: [PATCH] [horizon] Change default documentation URL
diff --git a/0002-rabbitmq-Don-t-manage-RabbitMQ-repos.patch b/0002-rabbitmq-Don-t-manage-RabbitMQ-repos.patch
index 0a1f282..0ca14db 100644
--- a/0002-rabbitmq-Don-t-manage-RabbitMQ-repos.patch
+++ b/0002-rabbitmq-Don-t-manage-RabbitMQ-repos.patch
@@ -1,4 +1,4 @@
-From b709e4ba616a1ccf71ecb5bd545eb335d8c9c124 Mon Sep 17 00:00:00 2001
+From c2dd9867785de4fd56f2c1f2e2273605d79e468f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Martin=20M=C3=A1gr?= <mmagr at redhat.com>
Date: Wed, 19 Nov 2014 11:36:34 -0500
Subject: [PATCH] [rabbitmq] Don't manage RabbitMQ repos
diff --git a/0003-nova-Change-default-compute-driver.patch b/0003-nova-Change-default-compute-driver.patch
index 74c56d5..37917ee 100644
--- a/0003-nova-Change-default-compute-driver.patch
+++ b/0003-nova-Change-default-compute-driver.patch
@@ -1,4 +1,4 @@
-From 31cec53c878e84285af5ec7b4136b28310f66076 Mon Sep 17 00:00:00 2001
+From eabd8c27461bb4c273369def89e1dd468739f051 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Martin=20M=C3=A1gr?= <mmagr at redhat.com>
Date: Wed, 19 Nov 2014 11:39:05 -0500
Subject: [PATCH] [nova] Change default compute/driver
diff --git a/0004-openstack-This-patch-sets-default-charset-in-DB-to-u.patch b/0004-openstack-This-patch-sets-default-charset-in-DB-to-u.patch
index 4cf2085..d9eee7b 100644
--- a/0004-openstack-This-patch-sets-default-charset-in-DB-to-u.patch
+++ b/0004-openstack-This-patch-sets-default-charset-in-DB-to-u.patch
@@ -1,4 +1,4 @@
-From a131e424d84161fea9606f2726b71dd10dff1124 Mon Sep 17 00:00:00 2001
+From f00f71b5f4f8729806b7baa12eda6a1e60c251a1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Martin=20M=C3=A1gr?= <mmagr at redhat.com>
Date: Wed, 19 Nov 2014 11:43:23 -0500
Subject: [PATCH] [openstack] This patch sets default charset in DB to utf8 for
diff --git a/0005-firewall-Add-support-for-mac-address-source-rules.patch b/0005-firewall-Add-support-for-mac-address-source-rules.patch
index 69e3b37..6ee42e1 100644
--- a/0005-firewall-Add-support-for-mac-address-source-rules.patch
+++ b/0005-firewall-Add-support-for-mac-address-source-rules.patch
@@ -1,4 +1,4 @@
-From c6cf81a235f9be2fd9bb61d55f56e91053f5d77f Mon Sep 17 00:00:00 2001
+From 9f83a0c89e73a509c30edd45d7d5b061f9aaf194 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Martin=20M=C3=A1gr?= <mmagr at redhat.com>
Date: Wed, 19 Nov 2014 12:05:40 -0500
Subject: [PATCH] [firewall] Add support for mac address source rules
diff --git a/0006-firewall-Ensure-that-etc-sysconfig-iptables-exists.patch b/0006-firewall-Ensure-that-etc-sysconfig-iptables-exists.patch
index e64497e..ab4981f 100644
--- a/0006-firewall-Ensure-that-etc-sysconfig-iptables-exists.patch
+++ b/0006-firewall-Ensure-that-etc-sysconfig-iptables-exists.patch
@@ -1,4 +1,4 @@
-From 6ac715987d33ca8cf5e0b3dd520bee1604f666cf Mon Sep 17 00:00:00 2001
+From e71b26d68c3d96b33a784015b74bd312717d22ff Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Martin=20M=C3=A1gr?= <mmagr at redhat.com>
Date: Wed, 19 Nov 2014 13:13:50 -0500
Subject: [PATCH] [firewall] Ensure that /etc/sysconfig/iptables exists
diff --git a/0007-firewall-Correct-resource-dependencies-for-fedora-re.patch b/0007-firewall-Correct-resource-dependencies-for-fedora-re.patch
index 188cffe..d996b48 100644
--- a/0007-firewall-Correct-resource-dependencies-for-fedora-re.patch
+++ b/0007-firewall-Correct-resource-dependencies-for-fedora-re.patch
@@ -1,4 +1,4 @@
-From 5a3a28c09c8625ad9d58c34cacac2785af4f6a77 Mon Sep 17 00:00:00 2001
+From 735b6cc19008967eec730ebea05ef6035dee686d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Martin=20M=C3=A1gr?= <mmagr at redhat.com>
Date: Wed, 19 Nov 2014 13:24:11 -0500
Subject: [PATCH] [firewall] Correct resource dependencies for fedora/redhat
diff --git a/0008-heat-Implement-Keystone-domain-creation.patch b/0008-heat-Implement-Keystone-domain-creation.patch
index d116353..3ff7338 100644
--- a/0008-heat-Implement-Keystone-domain-creation.patch
+++ b/0008-heat-Implement-Keystone-domain-creation.patch
@@ -1,4 +1,4 @@
-From 7de8fd63b9fc6258d269a6059ddf1b6502ba6e9f Mon Sep 17 00:00:00 2001
+From 31c1cc3598bf691dd59a77fb29fed2087230c4bc Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Martin=20M=C3=A1gr?= <mmagr at redhat.com>
Date: Wed, 19 Nov 2014 13:29:38 -0500
Subject: [PATCH] [heat] Implement Keystone domain creation
diff --git a/0009-neutron-Stop-puppet-from-breaking-neutron.patch b/0009-neutron-Stop-puppet-from-breaking-neutron.patch
index 9c3303c..37a715f 100644
--- a/0009-neutron-Stop-puppet-from-breaking-neutron.patch
+++ b/0009-neutron-Stop-puppet-from-breaking-neutron.patch
@@ -1,4 +1,4 @@
-From 76cf317d154f6d5ef596f4591c5c6af6b3ca675b Mon Sep 17 00:00:00 2001
+From f465a802f88729bcf6101c15c350f1f78439be49 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Martin=20M=C3=A1gr?= <mmagr at redhat.com>
Date: Wed, 19 Nov 2014 13:33:03 -0500
Subject: [PATCH] [neutron] Stop puppet from breaking neutron
diff --git a/0010-nova-Don-t-manage-the-nova-uid-gid-if-nova_-user-gro.patch b/0010-nova-Don-t-manage-the-nova-uid-gid-if-nova_-user-gro.patch
index 5bfe8df..35f5250 100644
--- a/0010-nova-Don-t-manage-the-nova-uid-gid-if-nova_-user-gro.patch
+++ b/0010-nova-Don-t-manage-the-nova-uid-gid-if-nova_-user-gro.patch
@@ -1,4 +1,4 @@
-From 7ba76398e21a6b3f31d4b83f73ae49e3705d30bf Mon Sep 17 00:00:00 2001
+From 6f8ed44ba95bd40a7c3405d44547702fa5d43095 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Martin=20M=C3=A1gr?= <mmagr at redhat.com>
Date: Wed, 19 Nov 2014 13:35:56 -0500
Subject: [PATCH] [nova] Don't manage the nova uid/gid if nova_{user,group}_id
diff --git a/0011-nova-Install-ceph-client-libraries-when-using-rbd.patch b/0011-nova-Install-ceph-client-libraries-when-using-rbd.patch
index 6405185..0326f49 100644
--- a/0011-nova-Install-ceph-client-libraries-when-using-rbd.patch
+++ b/0011-nova-Install-ceph-client-libraries-when-using-rbd.patch
@@ -1,4 +1,4 @@
-From 684a1a59f483550ed85705c290dcf92882254e12 Mon Sep 17 00:00:00 2001
+From 99d94abe7bb1de1cac9b9ee019005c3e3b94c847 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Martin=20M=C3=A1gr?= <mmagr at redhat.com>
Date: Wed, 19 Nov 2014 13:37:34 -0500
Subject: [PATCH] [nova] Install ceph client libraries when using rbd
diff --git a/0012-neutron-Configure-OVS-mechanism-agent-configs-in-its.patch b/0012-neutron-Configure-OVS-mechanism-agent-configs-in-its.patch
index 1a62901..55960c0 100644
--- a/0012-neutron-Configure-OVS-mechanism-agent-configs-in-its.patch
+++ b/0012-neutron-Configure-OVS-mechanism-agent-configs-in-its.patch
@@ -1,4 +1,4 @@
-From 150d05207d43bec6ed762fe08af0ef87f16878fd Mon Sep 17 00:00:00 2001
+From 74e156cb11714bea9d5fa27d8adcdfdeccfaab1b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Martin=20M=C3=A1gr?= <mmagr at redhat.com>
Date: Wed, 19 Nov 2014 13:40:41 -0500
Subject: [PATCH] [neutron] Configure OVS mechanism agent configs in its config
diff --git a/0013-horizon-Just-clean-original-config.patch b/0013-horizon-Just-clean-original-config.patch
index 0a53e2b..4abd2e2 100644
--- a/0013-horizon-Just-clean-original-config.patch
+++ b/0013-horizon-Just-clean-original-config.patch
@@ -1,4 +1,4 @@
-From 8c7b6ba3678e9ac9f8c69a35082cedd8bafb7e00 Mon Sep 17 00:00:00 2001
+From 26d3a0d7cb5737c62a1991b32abd94e953df16dc Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Martin=20M=C3=A1gr?= <mmagr at redhat.com>
Date: Wed, 19 Nov 2014 13:42:47 -0500
Subject: [PATCH] [horizon] Just clean original config
diff --git a/0014-neutron-Fixes-plugin.ini-error.patch b/0014-neutron-Fixes-plugin.ini-error.patch
index c8ff110..65a9137 100644
--- a/0014-neutron-Fixes-plugin.ini-error.patch
+++ b/0014-neutron-Fixes-plugin.ini-error.patch
@@ -1,4 +1,4 @@
-From 7a423fe59b5c450f8fdb9678c5807ddf201ad4f9 Mon Sep 17 00:00:00 2001
+From 8c78691cbb5655b21da82b94b5d4e8bbac1db833 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Martin=20M=C3=A1gr?= <mmagr at redhat.com>
Date: Wed, 19 Nov 2014 13:45:04 -0500
Subject: [PATCH] [neutron] Fixes plugin.ini error
diff --git a/0015-ceilometer-Add-manage_service-feature.patch b/0015-ceilometer-Add-manage_service-feature.patch
index aebfc0c..6a20619 100644
--- a/0015-ceilometer-Add-manage_service-feature.patch
+++ b/0015-ceilometer-Add-manage_service-feature.patch
@@ -1,4 +1,4 @@
-From fa673e67193fa937b57cf675b160d0f39ddb01a1 Mon Sep 17 00:00:00 2001
+From 2e24405a3c4c18da0781eb84fb7de1b85a60cf66 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Martin=20M=C3=A1gr?= <mmagr at redhat.com>
Date: Wed, 19 Nov 2014 13:49:47 -0500
Subject: [PATCH] [ceilometer] Add manage_service feature
diff --git a/0016-heat-Add-manage_service-feature.patch b/0016-heat-Add-manage_service-feature.patch
index 878f6ed..b7a49cd 100644
--- a/0016-heat-Add-manage_service-feature.patch
+++ b/0016-heat-Add-manage_service-feature.patch
@@ -1,4 +1,4 @@
-From 641f88ac6ff44359378043e5e7dc7f0070dcf78b Mon Sep 17 00:00:00 2001
+From 8d4ca1e0baac80b6273ed70b6190338351baa92e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Martin=20M=C3=A1gr?= <mmagr at redhat.com>
Date: Wed, 19 Nov 2014 13:50:53 -0500
Subject: [PATCH] [heat] Add manage_service feature
diff --git a/0017-horizon-Add-manage_service-feature-for-horizon.patch b/0017-horizon-Add-manage_service-feature-for-horizon.patch
index ddca250..16dac68 100644
--- a/0017-horizon-Add-manage_service-feature-for-horizon.patch
+++ b/0017-horizon-Add-manage_service-feature-for-horizon.patch
@@ -1,4 +1,4 @@
-From 7685d628ee689d6e91215e788c5bfd8f0a7d420d Mon Sep 17 00:00:00 2001
+From 6c17d2c6003591cfdd8a3fbf63d3935d0d262e36 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Martin=20M=C3=A1gr?= <mmagr at redhat.com>
Date: Wed, 19 Nov 2014 13:53:32 -0500
Subject: [PATCH] [horizon] Add manage_service feature for horizon
diff --git a/0018-keystone-Add-manage_service-feature.patch b/0018-keystone-Add-manage_service-feature.patch
index e7bfc9c..9026541 100644
--- a/0018-keystone-Add-manage_service-feature.patch
+++ b/0018-keystone-Add-manage_service-feature.patch
@@ -1,4 +1,4 @@
-From a3cda064845fca9e56c3f5e25362bbbd76283221 Mon Sep 17 00:00:00 2001
+From 35fbe6d4a0a5e70cebef6ef94c4244ddc3a3e15c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Martin=20M=C3=A1gr?= <mmagr at redhat.com>
Date: Wed, 19 Nov 2014 13:55:44 -0500
Subject: [PATCH] [keystone] Add manage_service feature
@@ -16,7 +16,7 @@ Conflicts:
1 file changed, 12 insertions(+), 4 deletions(-)
diff --git a/keystone/manifests/init.pp b/keystone/manifests/init.pp
-index 87cd613..ce0c7bd 100644
+index 04cd50f..6e2405c 100644
--- a/keystone/manifests/init.pp
+++ b/keystone/manifests/init.pp
@@ -38,6 +38,11 @@
@@ -29,17 +29,17 @@ index 87cd613..ce0c7bd 100644
+# Defaults to true.
+#
# [enabled] If the keystone services should be enabled. Optional. Default to true.
- # [sql_connection] Url used to connect to database.
- # [idle_timeout] Timeout when db connections should be reaped.
-@@ -168,6 +173,7 @@ class keystone(
+ #
+ # [*database_connection*]
+@@ -208,6 +213,7 @@ class keystone(
$ssl_cert_subject = '/C=US/ST=Unset/L=Unset/O=Unset/CN=localhost',
$cache_dir = '/var/cache/keystone',
$memcache_servers = false,
+ $manage_service = true,
$enabled = true,
- $sql_connection = 'sqlite:////var/lib/keystone/keystone.db',
- $idle_timeout = '200',
-@@ -403,10 +409,12 @@ class keystone(
+ $database_connection = 'sqlite:////var/lib/keystone/keystone.db',
+ $database_idle_timeout = '200',
+@@ -461,10 +467,12 @@ class keystone(
keystone_config { 'DEFAULT/rabbit_ha_queues': value => false }
}
@@ -55,4 +55,4 @@ index 87cd613..ce0c7bd 100644
+ }
}
- service { 'keystone':
+ if $service_name == 'keystone' {
diff --git a/0019-swift-Add-manage_service-feature.patch b/0019-swift-Add-manage_service-feature.patch
index e99fe49..258380c 100644
--- a/0019-swift-Add-manage_service-feature.patch
+++ b/0019-swift-Add-manage_service-feature.patch
@@ -1,4 +1,4 @@
-From 288af828b2f7302f078d08727d4a0c33f60eae0f Mon Sep 17 00:00:00 2001
+From 33e93f01c39aeaa8649c0dfd42f2ff4df71910c5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Martin=20M=C3=A1gr?= <mmagr at redhat.com>
Date: Wed, 19 Nov 2014 13:57:48 -0500
Subject: [PATCH] [swift] Add manage_service feature
diff --git a/0020-glance-Add-manage_service-feature.patch b/0020-glance-Add-manage_service-feature.patch
index bcb27fb..d744a59 100644
--- a/0020-glance-Add-manage_service-feature.patch
+++ b/0020-glance-Add-manage_service-feature.patch
@@ -1,4 +1,4 @@
-From 54acc8dd771da0c0d71770ff8160c490fc0fca3a Mon Sep 17 00:00:00 2001
+From 5f4fe0960b8e14f166f9d268f8c3ec8b6196bb65 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Martin=20M=C3=A1gr?= <mmagr at redhat.com>
Date: Wed, 19 Nov 2014 13:58:54 -0500
Subject: [PATCH] [glance] Add manage_service feature
diff --git a/0021-neutron-Fixed-manage_service-feature.patch b/0021-neutron-Fixed-manage_service-feature.patch
index 975b9cd..24149d4 100644
--- a/0021-neutron-Fixed-manage_service-feature.patch
+++ b/0021-neutron-Fixed-manage_service-feature.patch
@@ -1,4 +1,4 @@
-From ee921bd83c4813d5a8e19a942e0f8fb28a8f7ee9 Mon Sep 17 00:00:00 2001
+From 338f16e22ebd47321b1944d5494c98ae9e2ab3ce Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Martin=20M=C3=A1gr?= <mmagr at redhat.com>
Date: Wed, 19 Nov 2014 14:00:19 -0500
Subject: [PATCH] [neutron] Fixed manage_service feature
diff --git a/0022-nova-vlan-is-not-the-same-as-vlan_start.patch b/0022-nova-vlan-is-not-the-same-as-vlan_start.patch
index 3baa2ad..b6283b7 100644
--- a/0022-nova-vlan-is-not-the-same-as-vlan_start.patch
+++ b/0022-nova-vlan-is-not-the-same-as-vlan_start.patch
@@ -1,4 +1,4 @@
-From ec035d20e3baba8c67c23a28046696c1f0474117 Mon Sep 17 00:00:00 2001
+From 70558d2ee6a46de2332beceec6100adaa6786e8c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Martin=20M=C3=A1gr?= <mmagr at redhat.com>
Date: Wed, 19 Nov 2014 14:02:17 -0500
Subject: [PATCH] [nova] --vlan is not the same as --vlan_start
diff --git a/0023-neutron-New-manifest-file-to-deploy-Cisco-N1KV-VEM.patch b/0023-neutron-New-manifest-file-to-deploy-Cisco-N1KV-VEM.patch
index 74e1061..14bb716 100644
--- a/0023-neutron-New-manifest-file-to-deploy-Cisco-N1KV-VEM.patch
+++ b/0023-neutron-New-manifest-file-to-deploy-Cisco-N1KV-VEM.patch
@@ -1,4 +1,4 @@
-From 636f09905bd2924a701f71821a671c50c45f94f3 Mon Sep 17 00:00:00 2001
+From 4e410445dd281e6ec788448809aa33d94d6a969e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Martin=20M=C3=A1gr?= <mmagr at redhat.com>
Date: Wed, 19 Nov 2014 14:06:16 -0500
Subject: [PATCH] [neutron] New manifest file to deploy Cisco N1KV-VEM
diff --git a/0024-vswitch-Fixed-issue-with-vlan-on-redhat-provider.patch b/0024-vswitch-Fixed-issue-with-vlan-on-redhat-provider.patch
index b1d73db..1dac26b 100644
--- a/0024-vswitch-Fixed-issue-with-vlan-on-redhat-provider.patch
+++ b/0024-vswitch-Fixed-issue-with-vlan-on-redhat-provider.patch
@@ -1,4 +1,4 @@
-From 5c2dc8b1fc52ccc2d116f31cf8a1077b7a2c266d Mon Sep 17 00:00:00 2001
+From b9c14f9214abeb9f0860b63efbd4f6a47b1693fb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Martin=20M=C3=A1gr?= <mmagr at redhat.com>
Date: Wed, 19 Nov 2014 14:08:44 -0500
Subject: [PATCH] [vswitch] Fixed issue with vlan on redhat provider
diff --git a/0025-Fix-the-subnet-dhcp-enable-disable-param.patch b/0025-Fix-the-subnet-dhcp-enable-disable-param.patch
index fd6bfa0..30f9643 100644
--- a/0025-Fix-the-subnet-dhcp-enable-disable-param.patch
+++ b/0025-Fix-the-subnet-dhcp-enable-disable-param.patch
@@ -1,4 +1,4 @@
-From ad51a20ab33ecaa9041278ade40141810f3cb096 Mon Sep 17 00:00:00 2001
+From d55dc37abcc41d20a9ce2d5d66156a052a682a9e Mon Sep 17 00:00:00 2001
From: Mehdi Abaakouk <mehdi.abaakouk at enovance.com>
Date: Fri, 22 Aug 2014 11:09:40 +0200
Subject: [PATCH] Fix the subnet dhcp enable/disable param
diff --git a/0026-Fix-against-mongodb-2.6.5-from-epel.patch b/0026-Fix-against-mongodb-2.6.5-from-epel.patch
index f6981af..012a785 100644
--- a/0026-Fix-against-mongodb-2.6.5-from-epel.patch
+++ b/0026-Fix-against-mongodb-2.6.5-from-epel.patch
@@ -1,4 +1,4 @@
-From fc58b47ac6b1261bc7e99279ce9cc24cd806803b Mon Sep 17 00:00:00 2001
+From 3d170dae2f7c50352ca2af8bcfd9530fda525c53 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ivan=20Ne=C4=8Das?= <inecas at redhat.com>
Date: Tue, 25 Nov 2014 18:14:37 +0100
Subject: [PATCH] Fix against mongodb 2.6.5 from epel
diff --git a/0027-pki-setup-should-be-run-regardless-of-token-provider.patch b/0027-pki-setup-should-be-run-regardless-of-token-provider.patch
index ce5ab94..b668ff4 100644
--- a/0027-pki-setup-should-be-run-regardless-of-token-provider.patch
+++ b/0027-pki-setup-should-be-run-regardless-of-token-provider.patch
@@ -1,4 +1,4 @@
-From 1b63d6092bc08d3424e290815edbcc6c9517aeb9 Mon Sep 17 00:00:00 2001
+From 4c3043cd17d78355785dd7e4b936135410db33c0 Mon Sep 17 00:00:00 2001
From: Nathan Kinder <nkinder at redhat.com>
Date: Tue, 23 Sep 2014 12:09:28 -0700
Subject: [PATCH] pki-setup should be run regardless of token provider
@@ -23,7 +23,7 @@ Conflicts:
2 files changed, 169 insertions(+), 17 deletions(-)
diff --git a/keystone/manifests/init.pp b/keystone/manifests/init.pp
-index ce0c7bd..eec1801 100644
+index 6e2405c..916efff 100644
--- a/keystone/manifests/init.pp
+++ b/keystone/manifests/init.pp
@@ -42,6 +42,25 @@
@@ -51,10 +51,10 @@ index ce0c7bd..eec1801 100644
+# pki tokens and revocation lists. Optional. Default: /etc/keystone/ssl/private/cakey.pem
#
# [enabled] If the keystone services should be enabled. Optional. Default to true.
- # [sql_connection] Url used to connect to database.
-@@ -178,6 +197,10 @@ class keystone(
- $sql_connection = 'sqlite:////var/lib/keystone/keystone.db',
- $idle_timeout = '200',
+ #
+@@ -218,6 +237,10 @@ class keystone(
+ $database_connection = 'sqlite:////var/lib/keystone/keystone.db',
+ $database_idle_timeout = '200',
$enable_pki_setup = true,
+ $signing_certfile = '/etc/keystone/ssl/certs/signing_cert.pem',
+ $signing_keyfile = '/etc/keystone/ssl/private/signing_key.pem',
@@ -63,7 +63,7 @@ index ce0c7bd..eec1801 100644
$mysql_module = '0.9',
$rabbit_host = 'localhost',
$rabbit_hosts = false,
-@@ -354,23 +377,36 @@ class keystone(
+@@ -412,23 +435,36 @@ class keystone(
# remove the old format in case of an upgrade
keystone_config { 'signing/token_format': ensure => absent }
@@ -105,7 +105,7 @@ index ce0c7bd..eec1801 100644
- user => 'keystone',
- refreshonly => true,
- creates => '/etc/keystone/ssl/private/signing_key.pem',
-- notify => Service['keystone'],
+- notify => Service[$service_name],
- subscribe => Package['keystone'],
- require => User['keystone'],
- }
@@ -116,10 +116,10 @@ index ce0c7bd..eec1801 100644
keystone_config { 'token/provider': value => 'keystone.token.providers.uuid.Provider' }
} else {
diff --git a/keystone/spec/classes/keystone_spec.rb b/keystone/spec/classes/keystone_spec.rb
-index 178f4fd..061fd17 100644
+index 2e4d6be..ad9d46a 100644
--- a/keystone/spec/classes/keystone_spec.rb
+++ b/keystone/spec/classes/keystone_spec.rb
-@@ -179,7 +179,24 @@ describe 'keystone' do
+@@ -235,7 +235,24 @@ describe 'keystone' do
'token_provider' => 'keystone.token.providers.uuid.Provider'
}
end
@@ -145,7 +145,7 @@ index 178f4fd..061fd17 100644
end
describe 'when configuring as PKI' do
-@@ -209,6 +226,70 @@ describe 'keystone' do
+@@ -265,6 +282,70 @@ describe 'keystone' do
end
end
@@ -216,7 +216,7 @@ index 178f4fd..061fd17 100644
describe 'with invalid catalog_type' do
let :params do
{ :admin_token => 'service_token',
-@@ -227,14 +308,49 @@ describe 'keystone' do
+@@ -283,14 +364,49 @@ describe 'keystone' do
it { should contain_keystone_config('catalog/driver').with_value(params[:catalog_driver]) }
end
diff --git a/0028-Switch-to-TLSv1-as-SSLv3-is-considered-insecure-and-.patch b/0028-Switch-to-TLSv1-as-SSLv3-is-considered-insecure-and-.patch
index d10bd8d..ddc5f8a 100644
--- a/0028-Switch-to-TLSv1-as-SSLv3-is-considered-insecure-and-.patch
+++ b/0028-Switch-to-TLSv1-as-SSLv3-is-considered-insecure-and-.patch
@@ -1,4 +1,4 @@
-From 17a8500b8bec802a431254c0bd3c6fa0efacb166 Mon Sep 17 00:00:00 2001
+From 894f51160637e934b1609dbafb72205dd6c51bdb Mon Sep 17 00:00:00 2001
From: Lukas Bezdicka <lbezdick at redhat.com>
Date: Fri, 2 Jan 2015 22:49:10 +0100
Subject: [PATCH] Switch to TLSv1 as SSLv3 is considered insecure and is
diff --git a/0029-Switch-to-TLSv1-as-SSLv3-is-considered-insecure-and-.patch b/0029-Switch-to-TLSv1-as-SSLv3-is-considered-insecure-and-.patch
index 345ef26..a701744 100644
--- a/0029-Switch-to-TLSv1-as-SSLv3-is-considered-insecure-and-.patch
+++ b/0029-Switch-to-TLSv1-as-SSLv3-is-considered-insecure-and-.patch
@@ -1,4 +1,4 @@
-From f3ccedc0f94d4c9fce94026e652c1c182c480910 Mon Sep 17 00:00:00 2001
+From 6eaa54d26b419789278b35461c9a4187ce5ee658 Mon Sep 17 00:00:00 2001
From: Lukas Bezdicka <lbezdick at redhat.com>
Date: Fri, 2 Jan 2015 20:17:29 +0100
Subject: [PATCH] Switch to TLSv1 as SSLv3 is considered insecure and is
diff --git a/0030-Switch-to-TLSv1-as-SSLv3-is-considered-insecure-and-.patch b/0030-Switch-to-TLSv1-as-SSLv3-is-considered-insecure-and-.patch
index d28a891..1f92d7d 100644
--- a/0030-Switch-to-TLSv1-as-SSLv3-is-considered-insecure-and-.patch
+++ b/0030-Switch-to-TLSv1-as-SSLv3-is-considered-insecure-and-.patch
@@ -1,4 +1,4 @@
-From 1a3c4c4fda1d318ad6b327731e40960cf0fd2838 Mon Sep 17 00:00:00 2001
+From 7bc22189703ab4b01014387f67fa42e80dc01ebe Mon Sep 17 00:00:00 2001
From: Lukas Bezdicka <lbezdick at redhat.com>
Date: Fri, 2 Jan 2015 22:44:28 +0100
Subject: [PATCH] Switch to TLSv1 as SSLv3 is considered insecure and is
diff --git a/0031-Makes-kombu_ssl_-parameters-optional-when-rabbit_use.patch b/0031-Makes-kombu_ssl_-parameters-optional-when-rabbit_use.patch
index 8cf42ae..82b4812 100644
--- a/0031-Makes-kombu_ssl_-parameters-optional-when-rabbit_use.patch
+++ b/0031-Makes-kombu_ssl_-parameters-optional-when-rabbit_use.patch
@@ -1,4 +1,4 @@
-From da9ac2b17c280bf8ad605407a6142e2b73ee43b4 Mon Sep 17 00:00:00 2001
+From cade61c4968b91945d79934498702575e08b0e57 Mon Sep 17 00:00:00 2001
From: Lukas Bezdicka <lbezdick at redhat.com>
Date: Mon, 2 Feb 2015 15:15:58 +0100
Subject: [PATCH] Makes kombu_ssl_* parameters optional when rabbit_use_ssl =>
diff --git a/0032-Switch-to-TLSv1-as-SSLv3-is-considered-insecure-and-.patch b/0032-Switch-to-TLSv1-as-SSLv3-is-considered-insecure-and-.patch
index 22a118a..b617c5f 100644
--- a/0032-Switch-to-TLSv1-as-SSLv3-is-considered-insecure-and-.patch
+++ b/0032-Switch-to-TLSv1-as-SSLv3-is-considered-insecure-and-.patch
@@ -1,4 +1,4 @@
-From d02098d60d3a060d305d0f5ce6e9a35a2fa2593b Mon Sep 17 00:00:00 2001
+From ce68891237528d0710a086eb1f2d8d1669c94a09 Mon Sep 17 00:00:00 2001
From: Lukas Bezdicka <lbezdick at redhat.com>
Date: Fri, 2 Jan 2015 20:04:10 +0100
Subject: [PATCH] Switch to TLSv1 as SSLv3 is considered insecure and is
diff --git a/0033-Switch-to-TLSv1-as-SSLv3-is-considered-insecure-and-.patch b/0033-Switch-to-TLSv1-as-SSLv3-is-considered-insecure-and-.patch
index 8b4f08c..015bcdb 100644
--- a/0033-Switch-to-TLSv1-as-SSLv3-is-considered-insecure-and-.patch
+++ b/0033-Switch-to-TLSv1-as-SSLv3-is-considered-insecure-and-.patch
@@ -1,4 +1,4 @@
-From b602e9bc1116d3a4dab29adf4dc83761fca1ee3e Mon Sep 17 00:00:00 2001
+From c5458eb33bf9495fbcbfb0a1fb586a4e5956fb93 Mon Sep 17 00:00:00 2001
From: Lukas Bezdicka <lbezdick at redhat.com>
Date: Fri, 2 Jan 2015 20:07:25 +0100
Subject: [PATCH] Switch to TLSv1 as SSLv3 is considered insecure and is
diff --git a/0034-Switch-to-TLSv1-as-SSLv3-is-considered-insecure-and-.patch b/0034-Switch-to-TLSv1-as-SSLv3-is-considered-insecure-and-.patch
index 7e403f3..0738fd9 100644
--- a/0034-Switch-to-TLSv1-as-SSLv3-is-considered-insecure-and-.patch
+++ b/0034-Switch-to-TLSv1-as-SSLv3-is-considered-insecure-and-.patch
@@ -1,4 +1,4 @@
-From f285b5ac7820dd8a11d9696ac387e74d9fd78f02 Mon Sep 17 00:00:00 2001
+From c1c0380d3c80b14f6c1cd756a1e035997f6bb084 Mon Sep 17 00:00:00 2001
From: Lukas Bezdicka <lbezdick at redhat.com>
Date: Fri, 2 Jan 2015 20:27:10 +0100
Subject: [PATCH] Switch to TLSv1 as SSLv3 is considered insecure and is
diff --git a/0035-Disable-file-injection-when-using-RBD-as-compute-eph.patch b/0035-Disable-file-injection-when-using-RBD-as-compute-eph.patch
index 209d714..36f85b2 100644
--- a/0035-Disable-file-injection-when-using-RBD-as-compute-eph.patch
+++ b/0035-Disable-file-injection-when-using-RBD-as-compute-eph.patch
@@ -1,4 +1,4 @@
-From 7a8533d20f6081a736184e6d1bbab217531849c8 Mon Sep 17 00:00:00 2001
+From 28fd9b8573ceb4a98a07896979363a4406ff33c1 Mon Sep 17 00:00:00 2001
From: Ivan Chavero <ichavero at redhat.com>
Date: Sun, 10 Aug 2014 22:33:25 -0600
Subject: [PATCH] Disable file injection when using RBD as compute ephemeral
diff --git a/openstack-puppet-modules.spec b/openstack-puppet-modules.spec
index abf723f..ccb989a 100644
--- a/openstack-puppet-modules.spec
+++ b/openstack-puppet-modules.spec
@@ -1,7 +1,7 @@
Name: openstack-puppet-modules
-Version: 2014.1.1
-Release: 4%{?dist}
+Version: 2014.1.2
+Release: 1%{?dist}
Summary: Collection of Puppet modules for OpenStack deployment
License: ASL 2.0 and GPLv2 and GPLv3
@@ -156,6 +156,9 @@ rm -f %{buildroot}/%{_datadir}/openstack-puppet/modules/nova/files/nova-novncpro
%changelog
+* Fri Apr 03 2015 Ivan Chavero <ichavero at redhat.com> 2014.1.2-1
+- Update to upstream 2014.1.2
+
* Wed Mar 25 2015 Lukas Bezdicka <lbezdick at redhat.com> 2014.1.1-4
- Disable file injection when using RBD as compute ephemeral storage
- Switch to TLSv1 as SSLv3 is considered insecure and is disabled by default
diff --git a/sources b/sources
index c683ada..a3e73a3 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-a12e2fcdc1d39f24e7900622eb39e63c 2014.1.1.tar.gz
+1710b46884746b20f64af78dd2a122dd 2014.1.2.tar.gz
--
cgit v0.10.2
http://pkgs.fedoraproject.org/cgit/openstack-puppet-modules.git/commit/?h=f21&id=84fe8d740c2aab59faf9d1f3a654c4cfe5e1691a
More information about the scm-commits
mailing list