Merge pull request #15 from bodepd/dev

Fedora support for glance

examples/single.pp

@@ -0,0 +1,15 @@
+
+node glance {
+  # set up glance server
+  class { 'glance::api':
+    swift_store_user => 'foo_user',
+    swift_store_key => 'foo_pass',
+  }
+
+  class { 'glance::registry': }
+
+}
+
+node default {
+  fail("could not find a matching node entry for ${clientcert}")
+}

manifests/api.pp

@@ -69,6 +69,7 @@ class glance::api(
   }
 
   service { 'glance-api':
+    name       => $::glance::params::api_service_name,
     ensure     => running,
     enable     => true,
     hasstatus  => true,

manifests/init.pp

@@ -1,6 +1,9 @@
 class glance(
   $package_ensure = 'present'
 ) {
+
+  include glance::params
+
   file { '/etc/glance/':
     ensure  => directory,
     owner   => 'glance',
@@ -8,5 +11,11 @@ class glance(
     mode    => '0770',
     require => Package['glance']
   }
-  package { 'glance': ensure => $package_ensure }
+  package { 'glance':
+    name   => $::glance::params::package_name,
+    ensure => $package_ensure,
+  }
+  if(! defined(Package['python-migrate'])) {
+    package { 'python-migrate': ensure => 'present' }
+  }
 }

manifests/params.pp

@@ -0,0 +1,21 @@
+# these parameters need to be accessed from several locations and
+# should be considered to be constant
+class glance::params {
+
+  case $::osfamily {
+    'RedHat': {
+      $package_name          = 'openstack-glance'
+      $api_service_name      = 'openstack-glance-api'
+      $registry_service_name = 'openstack-glance-registry'
+    }
+    'Debian': {
+      $package_name          = 'glance'
+      $api_service_name      = 'glance-api'
+      $registry_service_name = 'glance-registry'
+    }
+    default: {
+      fail("Unsupported osfamily: ${::osfamily} operatingsystem: ${::operatingsystem}, module ${module_name} only support osfamily RedHat and Debian")
+    }
+  }
+
+}

manifests/registry.pp

@@ -7,6 +7,7 @@ class glance::registry(
   $sql_connection = 'sqlite:///var/lib/glance/glance.sqlite',
   $sql_idle_timeout = '3600'
 ) inherits glance {
+
   file { '/etc/glance/glance-registry.conf':
     ensure  => present,
     owner   => 'glance',
@@ -15,7 +16,9 @@ class glance::registry(
     content => template('glance/glance-registry.conf.erb'),
     require => Class['glance']
   }
+
   service { 'glance-registry':
+    name       => $::glance::params::registry_service_name,
     ensure     => running,
     enable     => true,
     hasstatus  => true,

spec/classes/glance_api_spec.rb

@@ -2,6 +2,12 @@ require 'spec_helper'
 
 describe 'glance::api' do
 
+  let :facts do
+    {
+      :osfamily => 'Debian'
+    }
+  end
+
   let :default_params do
     {
       :log_verbose => 'false',

spec/classes/glance_registry_spec.rb

@@ -2,6 +2,12 @@ require 'spec_helper'
 
 describe 'glance::registry' do
 
+  let :facts do
+    {
+      :osfamily => 'Debian'
+    }
+  end
+
   let :default_params do
     {
       :log_verbose => 'false',

spec/classes/glance_spec.rb

@@ -2,6 +2,12 @@ require 'spec_helper'
 
 describe 'glance' do
 
+  let :facts do
+    {
+      :osfamily => 'Debian'
+    }
+  end
+
   let :default_params do
     {:package_ensure => 'present'}
   end