From 7db7cceaaf1c533ee87197a52c48ca6be508a6af Mon Sep 17 00:00:00 2001 From: Martin Magr Date: May 12 2014 15:24:56 +0000 Subject: Updated to most recent master branch of redhat-openstack/openstack-puppet-modules --- diff --git a/0001-RHEL-should-have-default-provider.patch b/0001-RHEL-should-have-default-provider.patch deleted file mode 100644 index 047f1af..0000000 --- a/0001-RHEL-should-have-default-provider.patch +++ /dev/null @@ -1,29 +0,0 @@ -From 11ec3593f677e43da49a9fb85fdda5538103c731 Mon Sep 17 00:00:00 2001 -From: Martin Magr -Date: Fri, 25 Apr 2014 18:05:02 +0200 -Subject: [PATCH] RHEL should have default provider - -On RHEL-7 systemd is used and the default provider (service I suppose) -works on older releases too. - -Change-Id: I4cb378350cb8de7f7c1ce1c3caacabbe682227da ---- - manifests/params.pp | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/manifests/params.pp b/manifests/params.pp -index d20d337..c3c8456 100644 ---- a/manifests/params.pp -+++ b/manifests/params.pp -@@ -39,7 +39,7 @@ class nova::params { - $root_helper = 'sudo nova-rootwrap' - $lock_path = '/var/lib/nova/tmp' - case $::operatingsystem { -- 'Fedora': { -+ 'Fedora', 'RedHat': { - $special_service_provider = undef - } - default: { --- -1.8.5.3 - diff --git a/compute_driver.patch b/compute_driver.patch index 7fdc9e8..e975cf9 100644 --- a/compute_driver.patch +++ b/compute_driver.patch @@ -1,13 +1,13 @@ diff --git a/manifests/compute/libvirt.pp b/manifests/compute/libvirt.pp -index 4b6b57a..d3659bf 100644 +index 5fd9f40..fe6ea33 100644 --- a/manifests/compute/libvirt.pp +++ b/manifests/compute/libvirt.pp -@@ -48,7 +48,7 @@ class nova::compute::libvirt ( +@@ -141,7 +141,7 @@ class nova::compute::libvirt ( } nova_config { - 'DEFAULT/compute_driver': value => 'libvirt.LibvirtDriver'; + 'DEFAULT/compute_driver': value => 'nova.virt.libvirt.LibvirtDriver'; - 'DEFAULT/libvirt_type': value => $libvirt_type; - 'DEFAULT/connection_type': value => 'libvirt'; 'DEFAULT/vncserver_listen': value => $vncserver_listen; + 'libvirt/virt_type': value => $libvirt_virt_type_real; + 'libvirt/cpu_mode': value => $libvirt_cpu_mode_real; diff --git a/nova.patch b/nova.patch index 8b3d37d..8025c51 100644 --- a/nova.patch +++ b/nova.patch @@ -1,35 +1,15 @@ diff --git a/manifests/db/mysql.pp b/manifests/db/mysql.pp -index 3f20081..d64086a 100644 +index f883283..b042b3d 100644 --- a/manifests/db/mysql.pp +++ b/manifests/db/mysql.pp -@@ -6,7 +6,7 @@ class nova::db::mysql( +@@ -45,8 +45,8 @@ class nova::db::mysql( $dbname = 'nova', $user = 'nova', $host = '127.0.0.1', - $charset = 'latin1', +- $collate = 'latin1_swedish_ci', + $charset = 'utf8', ++ $collate = 'utf8_unicode_ci', $allowed_hosts = undef, - $cluster_id = 'localzone' - ) { -diff --git a/spec/classes/nova_db_mysql_spec.rb b/spec/classes/nova_db_mysql_spec.rb -index 3eb6ff2..00572bf 100644 ---- a/spec/classes/nova_db_mysql_spec.rb -+++ b/spec/classes/nova_db_mysql_spec.rb -@@ -23,7 +23,7 @@ describe 'nova::db::mysql' do - it { should contain_mysql__db('nova').with( - :user => 'nova', - :password => 'qwerty', -- :charset => 'latin1', -+ :charset => 'utf8', - :require => "Class[Mysql::Config]" - )} - end -@@ -50,7 +50,7 @@ describe 'nova::db::mysql' do - it { should contain_mysql__db('nova').with( - :user => 'nova', - :password => 'qwerty', -- :charset => 'latin1', -+ :charset => 'utf8', - :require => "Class[Mysql::Config]" - )} - end + $mysql_module = '0.9', + $cluster_id = undef diff --git a/openstack-puppet-modules.spec b/openstack-puppet-modules.spec index 4a0b2ec..8b967a4 100644 --- a/openstack-puppet-modules.spec +++ b/openstack-puppet-modules.spec @@ -6,19 +6,19 @@ %global common_commit 2c0ed2844c606fd806bde0c02e47e79c88fab4a9 %global concat_commit 031bf261289dcbb32e63b053ed5b3a82117698c0 %global firewall_commit c147a624fb3dba7df625d0d7571b1b6669bcfca5 +%global galera_commit 22380ea649debf277735171b6a07900df4ba691c %global glance_commit 5557c224f37c22b058c951d7494448981cb484a2 %global gluster_commit 80c2b13448c97c70a4b4bc0e402e00ecb5d681d5 %global haproxy_commit f381510e940ee11feb044c1c728ba2e5af807c79 %global heat_commit a64082e4f8ec75ecadaf20a02678647a7af22fb6 %global horizon_commit 17ba6a73cec7f386922e6a914a120a829e225efc %global inifile_commit fe9b0d5229ea37179a08c4b49239da9bc950acd1 -%global keepalived_commit f0585c45e7c5d5c2d86d0a84690a75dc522b2cd4 %global keystone_commit 688ff4379ed7437747ff8fdcd464096e24b4ebc6 %global memcached_commit 49dbf102fb6eee90297b2ed6a1fa463a8c5ccee7 %global mongodb_commit 3f392925710f1758a95f1775d700b5fb787a003d %global mysql_commit 3b27d6956bf49531a5fa886f8624e20f1ef692ba -%global neutron_commit 78428c844f73bf585a8f8a3bdf615ba2a0e8983b -%global nova_commit 6c8a4bd5e1d67cce4c6e316c2ba43ed5a4dd4e59 +%global neutron_commit f9b3d184a05978668ee5960c83836b56e02636ce +%global nova_commit 1e77a9d48a85a3ae6d30993b3c887f58e4a5973c %global nssdb_commit b3799a9a7c62c3b5b7968f9860220a885b45fb8a %global openstack_commit c20039004cb39e78c93cd00f154c3b9ba6404951 %global pacemaker_commit 21950c9b5e619a3cb02f01f66cd4cb33d209a690 @@ -40,7 +40,7 @@ Name: openstack-puppet-modules Version: 2014.1 -Release: 9.1%{?dist} +Release: 10%{?dist} Summary: Puppet modules used to deploy OpenStack License: ASL 2.0 and GPLv2 and GPLv3 @@ -53,13 +53,13 @@ Source3: https://github.com/stackforge/puppet-cinder/archive/%{cinder_commit}/ci Source4: https://github.com/purpleidea/puppet-common/archive/%{common_commit}/common-%{common_commit}.tar.gz Source5: https://github.com/ripienaar/puppet-concat/archive/%{concat_commit}/concat-%{concat_commit}.tar.gz Source6: https://github.com/puppetlabs/puppetlabs-firewall/archive/%{firewall_commit}/firewall-%{firewall_commit}.tar.gz -Source7: https://github.com/stackforge/puppet-glance/archive/%{glance_commit}/glance-%{glance_commit}.tar.gz -Source8: https://github.com/purpleidea/puppet-gluster/archive/%{gluster_commit}/gluster-%{gluster_commit}.tar.gz -Source9: https://github.com/puppetlabs/puppetlabs-haproxy/archive/%{haproxy_commit}/haproxy-%{haproxy_commit}.tar.gz -Source10: https://github.com/stackforge/puppet-heat/archive/%{heat_commit}/heat-%{heat_commit}.tar.gz -Source11: https://github.com/stackforge/puppet-horizon/archive/%{horizon_commit}/horizon-%{horizon_commit}.tar.gz -Source12: https://github.com/puppetlabs/puppetlabs-inifile/archive/%{inifile_commit}/inifile-%{inifile_commit}.tar.gz -Source13: https://github.com/purpleidea/puppet-keepalived/archive/%{keepalived_commit}/keepalived-%{keepalived_commit}.tar.gz +Source7: https://github.com/rohara/puppet-galera/archive/%{galera_commit}/galera-%{galera_commit}.tar.gz +Source8: https://github.com/stackforge/puppet-glance/archive/%{glance_commit}/glance-%{glance_commit}.tar.gz +Source9: https://github.com/purpleidea/puppet-gluster/archive/%{gluster_commit}/gluster-%{gluster_commit}.tar.gz +Source10: https://github.com/puppetlabs/puppetlabs-haproxy/archive/%{haproxy_commit}/haproxy-%{haproxy_commit}.tar.gz +Source11: https://github.com/stackforge/puppet-heat/archive/%{heat_commit}/heat-%{heat_commit}.tar.gz +Source12: https://github.com/stackforge/puppet-horizon/archive/%{horizon_commit}/horizon-%{horizon_commit}.tar.gz +Source13: https://github.com/puppetlabs/puppetlabs-inifile/archive/%{inifile_commit}/inifile-%{inifile_commit}.tar.gz Source14: https://github.com/stackforge/puppet-keystone/archive/%{keystone_commit}/keystone-%{keystone_commit}.tar.gz Source15: https://github.com/saz/puppet-memcached/archive/%{memcached_commit}/memcached-%{memcached_commit}.tar.gz Source16: https://github.com/puppetlabs/puppetlabs-mongodb/archive/%{mongodb_commit}/mongodb-%{mongodb_commit}.tar.gz @@ -91,8 +91,7 @@ Patch3: openstack.patch Patch4: cinder.patch Patch5: keystone.patch Patch6: nova.patch -Patch7: 0001-RHEL-should-have-default-provider.patch -Patch8: 0001-Use-lioadm-as-iscsi-helper-on-RHEL-7.patch +Patch7: 0001-Use-lioadm-as-iscsi-helper-on-RHEL-7.patch BuildArch: noarch Requires: rubygem-json @@ -144,7 +143,6 @@ A collection of Puppet modules used to install and configure OpenStack. cd %{_builddir}/%{name}-%{version}/puppet-nova-%{nova_commit} %patch0 -p1 %patch6 -p1 -%patch7 -p1 # puppet-glance patches cd %{_builddir}/%{name}-%{version}/puppet-glance-%{glance_commit} @@ -161,7 +159,7 @@ cd %{_builddir}/%{name}-%{version}/puppet-openstack-%{openstack_commit} # puppet-cinder patches cd %{_builddir}/%{name}-%{version}/puppet-cinder-%{cinder_commit} %patch4 -p1 -%patch8 -p1 +%patch7 -p1 # puppet-keystone patches cd %{_builddir}/%{name}-%{version}/puppet-keystone-%{keystone_commit} @@ -187,13 +185,13 @@ cp -r puppet-cinder-%{cinder_commit} %{buildroot}/%{_datadir}/openstack-puppet/m cp -r puppet-common-%{common_commit} %{buildroot}/%{_datadir}/openstack-puppet/modules/common cp -r puppetlabs-concat-%{concat_commit} %{buildroot}/%{_datadir}/openstack-puppet/modules/concat cp -r puppetlabs-firewall-%{firewall_commit} %{buildroot}/%{_datadir}/openstack-puppet/modules/firewall +cp -r puppet-galera-%{galera_commit} %{buildroot}/%{_datadir}/openstack-puppet/modules/galera cp -r puppet-glance-%{glance_commit} %{buildroot}/%{_datadir}/openstack-puppet/modules/glance cp -r puppet-gluster-%{gluster_commit} %{buildroot}/%{_datadir}/openstack-puppet/modules/gluster cp -r puppetlabs-haproxy-%{haproxy_commit} %{buildroot}/%{_datadir}/openstack-puppet/modules/haproxy cp -r puppet-heat-%{heat_commit} %{buildroot}/%{_datadir}/openstack-puppet/modules/heat cp -r puppet-horizon-%{horizon_commit} %{buildroot}/%{_datadir}/openstack-puppet/modules/horizon cp -r puppetlabs-inifile-%{inifile_commit} %{buildroot}/%{_datadir}/openstack-puppet/modules/inifile -cp -r puppet-keepalived-%{keepalived_commit} %{buildroot}/%{_datadir}/openstack-puppet/modules/keepalived cp -r puppet-keystone-%{keystone_commit} %{buildroot}/%{_datadir}/openstack-puppet/modules/keystone cp -r puppet-memcached-%{memcached_commit} %{buildroot}/%{_datadir}/openstack-puppet/modules/memcached cp -r puppetlabs-mongodb-%{mongodb_commit} %{buildroot}/%{_datadir}/openstack-puppet/modules/mongodb @@ -225,6 +223,9 @@ rm -f %{buildroot}/%{_datadir}/openstack-puppet/modules/nova/files/nova-novncpro %changelog +* Mon May 12 2014 Martin Mágr - 2014.1-10 +- Synchronized modules with current master branch of redhat-openstack/openstack-puppet-modules + * Wed May 7 2014 Martin Mágr - 2014.1-9.1 - Added rubyjem-json requirement diff --git a/sources b/sources index a2fdc05..5d493fb 100644 --- a/sources +++ b/sources @@ -5,19 +5,17 @@ eabb902f6211f5b6818b05b656a45a7f cinder-164163a7a267ae4139e2d97bab1a385a6da2ac5 6e70f75bbb494957eb64e5b71f835bd3 common-2c0ed2844c606fd806bde0c02e47e79c88fab4a9.tar.gz 8cff08df8d7fe83817af8b4ba5b13227 concat-031bf261289dcbb32e63b053ed5b3a82117698c0.tar.gz 3c338845ca69b093a065cae1c35996c0 firewall-c147a624fb3dba7df625d0d7571b1b6669bcfca5.tar.gz +b88807cc59fe4e3450675e2f3979b309 galera-22380ea649debf277735171b6a07900df4ba691c.tar.gz 3c6661f772af84010a96a3fbbf8b0eab glance-5557c224f37c22b058c951d7494448981cb484a2.tar.gz 7d21112588ba43525f2006fd65a00b07 gluster-80c2b13448c97c70a4b4bc0e402e00ecb5d681d5.tar.gz edef1e76ec9200bb1989302f19ea18b9 haproxy-f381510e940ee11feb044c1c728ba2e5af807c79.tar.gz -4dc6a108d2474aa9dd38a8d44914858c heat-a64082e4f8ec75ecadaf20a02678647a7af22fb6.tar.gz 4b24a19668635cc11f7578f17ab12ebe horizon-17ba6a73cec7f386922e6a914a120a829e225efc.tar.gz b92cb5bb97ea2c2ccdd6fbd361cbb2e7 inifile-fe9b0d5229ea37179a08c4b49239da9bc950acd1.tar.gz -a9d88960f7bda1e68e8418be6a9249c8 keepalived-f0585c45e7c5d5c2d86d0a84690a75dc522b2cd4.tar.gz 63063035247258a08875e17cddecfb3f keystone-688ff4379ed7437747ff8fdcd464096e24b4ebc6.tar.gz d91faa359ff81cc3e5bdc2a4217afff5 memcached-49dbf102fb6eee90297b2ed6a1fa463a8c5ccee7.tar.gz -25f400100566e0a10580b84835126631 mongodb-3f392925710f1758a95f1775d700b5fb787a003d.tar.gz 858c4da1350cef91ad84df37f4a80879 mysql-3b27d6956bf49531a5fa886f8624e20f1ef692ba.tar.gz -0cdb8681353dd995a92bd7a2d31f9315 neutron-78428c844f73bf585a8f8a3bdf615ba2a0e8983b.tar.gz -c02befefc2711d69270ea8dc573b463e nova-6c8a4bd5e1d67cce4c6e316c2ba43ed5a4dd4e59.tar.gz +1c01457ce1acab652d052a979b8bd3ce neutron-f9b3d184a05978668ee5960c83836b56e02636ce.tar.gz +2f0d23068f0eb1916755787b1d7bb9ae nova-1e77a9d48a85a3ae6d30993b3c887f58e4a5973c.tar.gz ee40158527431488131f4331092b958c nssdb-b3799a9a7c62c3b5b7968f9860220a885b45fb8a.tar.gz b210832794c85b5f4e5aa75de0007b51 openstack-c20039004cb39e78c93cd00f154c3b9ba6404951.tar.gz 8a56f0deff38aaffff3fb56a35dbfef9 pacemaker-21950c9b5e619a3cb02f01f66cd4cb33d209a690.tar.gz