From 69ffc7424eda819f704c1027ce2b2b6bfcce8974 Mon Sep 17 00:00:00 2001 From: Joe Topjian Date: Sat, 4 Aug 2012 12:38:29 -0600 Subject: [PATCH] Slight changes. --- lib/puppet/provider/glance_image/glance.rb | 6 ++---- lib/puppet/type/glance_image.rb | 4 +++- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/lib/puppet/provider/glance_image/glance.rb b/lib/puppet/provider/glance_image/glance.rb index 54e5cf5e..edef3bd2 100644 --- a/lib/puppet/provider/glance_image/glance.rb +++ b/lib/puppet/provider/glance_image/glance.rb @@ -1,7 +1,5 @@ -$LOAD_PATH.push(File.join(File.dirname(__FILE__), '..', '..', '..')) - # Load the Glance provider library to help -require 'puppet/provider/glance' +require File.join(File.dirname(__FILE__), '..','..','..', 'puppet/provider/glance') Puppet::Type.type(:glance_image).provide( :glance, @@ -10,7 +8,7 @@ Puppet::Type.type(:glance_image).provide( desc <<-EOT Glance provider to manage glance_image type. - Assumes that the Keystone service is on the same host and is working. + Assumes that the glance-api service is on the same host and is working. EOT commands :glance => 'glance' diff --git a/lib/puppet/type/glance_image.rb b/lib/puppet/type/glance_image.rb index d4e7a4b5..e241f266 100644 --- a/lib/puppet/type/glance_image.rb +++ b/lib/puppet/type/glance_image.rb @@ -16,7 +16,9 @@ Puppet::Type.newtype(:glance_image) do * All images are managed by the glance service. This means that since users are unable to manage their own images via this type, is_public is really of no use. You can probably hide images this way but that's all. - * I really have no idea what I'm doing. + * As glance image names do not have to be unique, you must ensure that your glance + repository does not have any duplicate names prior to using this. + * Ensure this is run on the same server as the glance-api service. EOT