From 56f98b1d22343f79c8d597a0710b91ea1d827250 Mon Sep 17 00:00:00 2001 From: Gael Chamoulaud Date: Wed, 9 Jul 2014 11:03:15 +0200 Subject: [PATCH 1/2] This Commit fixes the issue with the new CentOS version numbers. Fixes: rhbz#1117035 Signed-off-by: Gael Chamoulaud --- .gitmodules | 6 +++--- apache | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/.gitmodules b/.gitmodules index 396c394c4..85121c92e 100644 --- a/.gitmodules +++ b/.gitmodules @@ -1,6 +1,3 @@ -[submodule "apache"] - path = apache - url = https://github.com/puppetlabs/puppetlabs-apache.git [submodule "ceilometer"] path = ceilometer url = https://github.com/stackforge/puppet-ceilometer.git @@ -115,3 +112,6 @@ [submodule "sahara"] path = sahara url = https://github.com/stackforge/puppet-sahara.git +[submodule "apache"] + path = apache + url = https://github.com/puppetlabs/puppetlabs-apache.git diff --git a/apache b/apache index bbf9278b2..769ff363a 160000 --- a/apache +++ b/apache @@ -1 +1 @@ -Subproject commit bbf9278b24931444022aa67140d3505b748151da +Subproject commit 769ff363a8a3c51e24f63a2494217d2d029289c6 From d5914d254303b9a17b337cff02839df1630ed691 Mon Sep 17 00:00:00 2001 From: Gael Chamoulaud Date: Thu, 10 Jul 2014 15:14:42 +0200 Subject: [PATCH 2/2] Update puppet-nova to the most recent stable/icehouse Fixes: rhbz#1117035 Closes-Bug: 1338777 stackforge/puppet-nova@0b7b93f Fixes Facts string comparisons in CentOS 7 stackforge/puppet-nova@d682792 Release 4.1.0 stackforge/puppet-nova@f1155dd Pin gem versions for stable branch stackforge/puppet-nova@b9ae517 Enable nova server to be run in SSL mode stackforge/puppet-nova@1da5943 Default to utf8 for MySQL stackforge/puppet-nova@3f0fb20 add rbd keyring name to secret.xml template stackforge/puppet-nova@77fa1ce Allow configuring the rbd keyring name stackforge/puppet-nova@9cb3885 Add API v3 endpoint support stackforge/puppet-nova@109d482 Update puppetlabs-rabbitmq dependency Signed-off-by: Gael Chamoulaud --- .gitmodules | 6 +++--- nova | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/.gitmodules b/.gitmodules index 85121c92e..bc7820f7c 100644 --- a/.gitmodules +++ b/.gitmodules @@ -43,9 +43,6 @@ [submodule "neutron"] path = neutron url = https://github.com/stackforge/puppet-neutron.git -[submodule "nova"] - path = nova - url = https://github.com/stackforge/puppet-nova.git [submodule "nssdb"] path = nssdb url = https://github.com/rcritten/puppet-nssdb.git @@ -115,3 +112,6 @@ [submodule "apache"] path = apache url = https://github.com/puppetlabs/puppetlabs-apache.git +[submodule "nova"] + path = nova + url = https://github.com/stackforge/puppet-nova.git diff --git a/nova b/nova index 1e77a9d48..0b7b93fea 160000 --- a/nova +++ b/nova @@ -1 +1 @@ -Subproject commit 1e77a9d48a85a3ae6d30993b3c887f58e4a5973c +Subproject commit 0b7b93fea44d79ef6eecb3ab9c83cf60c1951bfb