Merge "Update to most recent version of openstack modules"

.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

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",

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':

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',
-}

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']