From e01d2bac2b172f697a2f9d71b282f9d0ba12273a Mon Sep 17 00:00:00 2001 From: Derek Higgins Date: Tue, 21 May 2013 04:31:45 -0400 Subject: [PATCH] Update to most recent version of openstack modules Updating to upstream version of each module, including changes to puppet templates required by new modules Change-Id: I3efeb54d2f89020c989ef5834ddce1ea12c62877 --- .gitmodules | 14 +++++++------- packstack/puppet/modules/cinder | 2 +- packstack/puppet/modules/glance | 2 +- packstack/puppet/modules/horizon | 2 +- packstack/puppet/modules/keystone | 2 +- packstack/puppet/modules/nova | 2 +- packstack/puppet/modules/openstack | 2 +- packstack/puppet/modules/swift | 2 +- packstack/puppet/templates/cinder.pp | 9 +++++---- packstack/puppet/templates/horizon.pp | 3 --- packstack/puppet/templates/keystone.pp | 12 ------------ packstack/puppet/templates/nova_compute.pp | 16 ---------------- 12 files changed, 19 insertions(+), 49 deletions(-) diff --git a/.gitmodules b/.gitmodules index 8f233f0d6..f60ea7693 100644 --- a/.gitmodules +++ b/.gitmodules @@ -1,24 +1,24 @@ [submodule "packstack/puppet/modules/glance"] path = packstack/puppet/modules/glance - url = https://github.com/puppetlabs/puppetlabs-glance.git + url = https://github.com/stackforge/puppet-glance.git [submodule "packstack/puppet/modules/horizon"] path = packstack/puppet/modules/horizon - url = https://github.com/packstack/puppetlabs-horizon.git + url = https://github.com/stackforge/puppet-horizon.git [submodule "packstack/puppet/modules/keystone"] path = packstack/puppet/modules/keystone - url = https://github.com/packstack/puppetlabs-keystone.git + url = https://github.com/stackforge/puppet-keystone.git [submodule "packstack/puppet/modules/nova"] path = packstack/puppet/modules/nova - url = https://github.com/packstack/puppetlabs-nova.git + url = https://github.com/stackforge/puppet-nova.git [submodule "packstack/puppet/modules/openstack"] path = packstack/puppet/modules/openstack - url = https://github.com/puppetlabs/puppetlabs-openstack.git + url = https://github.com/stackforge/puppet-openstack.git [submodule "packstack/puppet/modules/swift"] path = packstack/puppet/modules/swift - url = https://github.com/packstack/puppetlabs-swift.git + url = https://github.com/stackforge/puppet-swift.git [submodule "packstack/puppet/modules/cinder"] path = packstack/puppet/modules/cinder - url = https://github.com/packstack/puppetlabs-cinder.git + url = https://github.com/stackforge/puppet-cinder.git [submodule "packstack/puppet/modules/stdlib"] path = packstack/puppet/modules/stdlib url = https://github.com/puppetlabs/puppetlabs-stdlib.git diff --git a/packstack/puppet/modules/cinder b/packstack/puppet/modules/cinder index d9f9efac3..fa28def3f 160000 --- a/packstack/puppet/modules/cinder +++ b/packstack/puppet/modules/cinder @@ -1 +1 @@ -Subproject commit d9f9efac3db5749c2130a8b74c511ffd1161bec2 +Subproject commit fa28def3fb63d1ca29b4030d229afaa2c8d3b017 diff --git a/packstack/puppet/modules/glance b/packstack/puppet/modules/glance index 1cf25907e..44a82aa06 160000 --- a/packstack/puppet/modules/glance +++ b/packstack/puppet/modules/glance @@ -1 +1 @@ -Subproject commit 1cf25907ebeb5163a9562d9eaaacfdf2714e5853 +Subproject commit 44a82aa06a265e74cc2a3a9db65c0de979070416 diff --git a/packstack/puppet/modules/horizon b/packstack/puppet/modules/horizon index 3f32b84c2..bdcf7470d 160000 --- a/packstack/puppet/modules/horizon +++ b/packstack/puppet/modules/horizon @@ -1 +1 @@ -Subproject commit 3f32b84c2b11ae653fc410dacd1b9d703cdcef6b +Subproject commit bdcf7470de2547638989cf3a75681f7d8cfc4da6 diff --git a/packstack/puppet/modules/keystone b/packstack/puppet/modules/keystone index 611ba8047..f7f2ef7d4 160000 --- a/packstack/puppet/modules/keystone +++ b/packstack/puppet/modules/keystone @@ -1 +1 @@ -Subproject commit 611ba804721ad1aadc6e1428e6b7d4c127d254cb +Subproject commit f7f2ef7d4548e125245b06c9aa30dfa476bf4ff6 diff --git a/packstack/puppet/modules/nova b/packstack/puppet/modules/nova index 44b29a871..3eac0fd0c 160000 --- a/packstack/puppet/modules/nova +++ b/packstack/puppet/modules/nova @@ -1 +1 @@ -Subproject commit 44b29a871feacbf15990ff16f15bdfa7320ee6ec +Subproject commit 3eac0fd0cc7840bb89049d47fafb78e931afc30f diff --git a/packstack/puppet/modules/openstack b/packstack/puppet/modules/openstack index c18670270..7bdab85f3 160000 --- a/packstack/puppet/modules/openstack +++ b/packstack/puppet/modules/openstack @@ -1 +1 @@ -Subproject commit c18670270adbbd7f70801a143214014388ff4442 +Subproject commit 7bdab85f3598623a84fc3226e39e11535a6e5615 diff --git a/packstack/puppet/modules/swift b/packstack/puppet/modules/swift index 295b8a347..ee4a9d485 160000 --- a/packstack/puppet/modules/swift +++ b/packstack/puppet/modules/swift @@ -1 +1 @@ -Subproject commit 295b8a347b0a1c9601e2a56323bab7c1a3a112d4 +Subproject commit ee4a9d48599bce332d0d7bdf4f8c0bbb6d9c6f2e diff --git a/packstack/puppet/templates/cinder.pp b/packstack/puppet/templates/cinder.pp index 20bfa0efb..ecdc949a6 100644 --- a/packstack/puppet/templates/cinder.pp +++ b/packstack/puppet/templates/cinder.pp @@ -1,18 +1,19 @@ -class {'cinder::base': - rabbit_password => '', +class {'cinder': + rpc_backend => 'cinder.openstack.common.rpc.impl_qpid', + qpid_hostname => "%(CONFIG_QPID_HOST)s", + qpid_password => "notused", sql_connection => "mysql://cinder:%(CONFIG_CINDER_DB_PW)s@%(CONFIG_MYSQL_HOST)s/cinder" } cinder_config{ - "DEFAULT/rpc_backend": value => "cinder.openstack.common.rpc.impl_qpid"; - "DEFAULT/qpid_hostname": value => "%(CONFIG_QPID_HOST)s"; "DEFAULT/glance_host": value => "%(CONFIG_GLANCE_HOST)s"; } package {'python-keystone': notify => Class['cinder::api'], } + class {'cinder::api': keystone_password => '%(CONFIG_CINDER_KS_PW)s', keystone_tenant => "services", diff --git a/packstack/puppet/templates/horizon.pp b/packstack/puppet/templates/horizon.pp index 39b69856d..e71f4288e 100644 --- a/packstack/puppet/templates/horizon.pp +++ b/packstack/puppet/templates/horizon.pp @@ -17,12 +17,9 @@ class {'horizon': class {'memcached':} -class {'apache':} class {'apache::mod::php': } -class {'apache::mod::wsgi':} # The apache module purges files it doesn't know about # avoid this be referencing them here -file { '/etc/httpd/conf.d/openstack-dashboard.conf':} file { '/etc/httpd/conf.d/nagios.conf':} firewall { '001 horizon incoming': diff --git a/packstack/puppet/templates/keystone.pp b/packstack/puppet/templates/keystone.pp index 1dd1e3b77..708d7f2bf 100644 --- a/packstack/puppet/templates/keystone.pp +++ b/packstack/puppet/templates/keystone.pp @@ -3,10 +3,6 @@ class {"keystone": sql_connection => "mysql://keystone_admin:%(CONFIG_KEYSTONE_DB_PW)s@%(CONFIG_MYSQL_HOST)s/keystone", } -keystone_config { - 'signing/token_format': value => "UUID"; -} - class {"keystone::roles::admin": email => "test@test.com", password => "%(CONFIG_KEYSTONE_ADMIN_PW)s", @@ -25,11 +21,3 @@ firewall { '001 keystone incoming': action => 'accept', } -Package['keystone'] -> File['keystone.log'] -> Service['keystone'] -file{'keystone.log': - path => '/var/log/keystone/keystone.log', - ensure => present, - mode => 640, - owner => 'keystone', - group => 'keystone', -} diff --git a/packstack/puppet/templates/nova_compute.pp b/packstack/puppet/templates/nova_compute.pp index 66636946e..7e4791d45 100644 --- a/packstack/puppet/templates/nova_compute.pp +++ b/packstack/puppet/templates/nova_compute.pp @@ -1,5 +1,3 @@ - - if $::is_virtual_packstack == "true" { $libvirt_type = "qemu" nova_config{ @@ -71,17 +69,3 @@ exec {'tuned-virtual-host': require => Service['tuned'], } -# Need to start dbus for libvirt -if($::operatingsystem == 'Fedora') { - service { 'messagebus': - name => 'dbus', - ensure => running, - enable => true, - } -} else { - service { 'messagebus': - ensure => running, - enable => true, - } -} -Package['libvirt'] -> Service['messagebus'] -> Service['libvirt']