sync with rcbops/master as of f481cd8a322dc21526da3158d957f034a33e51fd

attributes/default.rb

@@ -57,10 +57,11 @@ default["glance"]["image"]["cirros"] = "https://launchpadlibrarian.net/83305869/
 # logging attribute
 default["glance"]["syslog"]["use"] = true
 default["glance"]["syslog"]["facility"] = "LOG_LOCAL2"
+default["glance"]["syslog"]["config_facility"] = "local2"
 
 # platform-specific settings
 case platform
-when "fedora"
+when "fedora", "redhat"
   default["glance"]["platform"] = {
     "mysql_python_packages" => [ "MySQL-python" ],
     "glance_packages" => [ "openstack-glance", "openstack-swift" ],

files/default/glance_plugin.py

@@ -5,6 +5,7 @@ import collectd
 
 global NAME, OS_USERNAME, OS_PASSWORD, OS_TENANT_NAME, OS_AUTH_URL, OS_AUTH_STRATEGY, VERBOSE_LOGGING
 
+NAME = "glance_plugin"
 OS_USERNAME = "username"
 OS_PASSWORD = "password"
 OS_TENANT_NAME = "tenantname"

recipes/glance-rsyslog.rb

@@ -17,15 +17,15 @@
 # limitations under the License.
 #
 
-if node["glance"]["syslog"]["use"] 
-    template "/etc/rsyslog.d/22-glance.conf" do
-        source "22-glance.conf.erb"
-        owner "root"
-        group "root"
-        mode "0644"
-        variables(
-            "use_syslog" => node["glance"]["syslog"]["use"],
-            "log_facility" => node["glance"]["syslog"]["facility"]
-        )
-    end
+template "/etc/rsyslog.d/22-glance.conf" do
+    source "22-glance.conf.erb"
+    owner "root"
+    group "root"
+    mode "0644"
+    variables(
+        "use_syslog" => node["glance"]["syslog"]["use"],
+        "log_facility" => node["glance"]["syslog"]["config_facility"]
+    )
+    only_if { node["glance"]["syslog"]["use"]  }
+    notifies :restart, "service[rsyslog]", :immediately
 end

templates/default/22-glance.conf.erb

@@ -1,7 +1,13 @@
+# This file autogenerated by Chef
+# Do not edit, changes will be overwritten
+<% if not node["custom_template_banner"].nil? %>
+<%= node["custom_template_banner"] %>
+<% end %>
+
 $DirGroup adm
 $DirCreateMode 0755
 $FileGroup adm
 
 $template GlanceLog, "/var/log/glance/glance.log"
 
-local2.* 		-?GlanceLog
+<%= @log_facility %>.* 		-?GlanceLog

templates/default/glance-api-paste.ini.erb

@@ -1,3 +1,9 @@
+# This file autogenerated by Chef
+# Do not edit, changes will be overwritten
+<% if not node["custom_template_banner"].nil? %>
+<%= node["custom_template_banner"] %>
+<% end %>
+
 # Default minimal pipeline
 [pipeline:glance-api]
 pipeline = versionnegotiation context apiv1app

templates/default/glance-api.conf.erb

@@ -1,3 +1,9 @@
+# This file autogenerated by Chef
+# Do not edit, changes will be overwritten
+<% if not node["custom_template_banner"].nil? %>
+<%= node["custom_template_banner"] %>
+<% end %>
+
 [DEFAULT]
 # Show more verbose log output (sets INFO log level output)
 verbose = True
@@ -8,7 +14,7 @@ debug = False
 # Which backend store should Glance use by default is not specified
 # in a request to add a new image to Glance? Default: 'file'
 # Available choices are 'file', 'swift', and 's3'
-default_store = file
+default_store = <%= @default_store %>
 
 # Address to bind the API server
 bind_host = <%= @api_bind_address %>
@@ -137,35 +143,35 @@ filesystem_store_datadir = /var/lib/glance/images/
 # Address where the Swift authentication service lives
 # Valid schemes are 'http://' and 'https://'
 # If no scheme specified,  default to 'https://'
-swift_store_auth_address = 127.0.0.1:8080/v1.0/
+swift_store_auth_address = http://<%= @keystone_api_ipaddress %>:<%= @keystone_service_port %>/v2.0
 
 # User to authenticate against the Swift authentication service
 # If you use Swift authentication service, set it to 'account':'user'
 # where 'account' is a Swift storage account and 'user'
 # is a user in that account
-swift_store_user = jdoe:jdoe
+swift_store_user = <%= @service_tenant_name %>:<%= @service_user %>
 
 # Auth key for the user authenticating against the
 # Swift authentication service
-swift_store_key = a86850deb2742ec3cb41518e26aa2d89
+swift_store_key = <%= @service_pass %>
 
 # Container within the account that the account should use
 # for storing images in Swift
-swift_store_container = glance
+swift_store_container = <%= @swift_store_container %>
 
 # Do we create the container if it does not exist?
-swift_store_create_container_on_put = False
+swift_store_create_container_on_put = True
 
 # What size, in MB, should Glance start chunking image files
 # and do a large object manifest in Swift? By default, this is
 # the maximum object size in Swift, which is 5GB
-swift_store_large_object_size = 5120
+swift_store_large_object_size = <%= @swift_large_object_size %>
 
 # When doing a large object manifest, what size, in MB, should
 # Glance write chunks to Swift? This amount of data is written
 # to a temporary disk buffer during the process of chunking
 # the image file, and the default is 200MB
-swift_store_large_object_chunk_size = 200
+swift_store_large_object_chunk_size = <%= @swift_large_object_chunk_size %>
 
 # Whether to use ServiceNET to communicate with the Swift storage servers.
 # (If you aren't RACKSPACE, leave this False!)

templates/default/glance-registry-paste.ini.erb

@@ -1,3 +1,9 @@
+# This file autogenerated by Chef
+# Do not edit, changes will be overwritten
+<% if not node["custom_template_banner"].nil? %>
+<%= node["custom_template_banner"] %>
+<% end %>
+
 # Default minimal pipeline
 [pipeline:glance-registry]
 pipeline = context registryapp

templates/default/glance-registry.conf.erb

@@ -1,3 +1,9 @@
+# This file autogenerated by Chef
+# Do not edit, changes will be overwritten
+<% if not node["custom_template_banner"].nil? %>
+<%= node["custom_template_banner"] %>
+<% end %>
+
 [DEFAULT]
 # Show more verbose log output (sets INFO log level output)
 verbose = True

templates/default/glance-scrubber-paste.ini.erb

@@ -1,3 +1,9 @@
+# This file autogenerated by Chef
+# Do not edit, changes will be overwritten
+<% if not node["custom_template_banner"].nil? %>
+<%= node["custom_template_banner"] %>
+<% end %>
+
 [app:glance-scrubber]
 paste.app_factory = glance.common.wsgi:app_factory
 glance.app_factory = glance.store.scrubber:Scrubber

templates/default/glance-scrubber.conf.erb

@@ -1,3 +1,9 @@
+# This file autogenerated by Chef
+# Do not edit, changes will be overwritten
+<% if not node["custom_template_banner"].nil? %>
+<%= node["custom_template_banner"] %>
+<% end %>
+
 [DEFAULT]
 # Show more verbose log output (sets INFO log level output)
 verbose = True

templates/default/policy.json.erb

@@ -1,3 +1,9 @@
+# This file autogenerated by Chef
+# Do not edit, changes will be overwritten
+<% if not node["custom_template_banner"].nil? %>
+<%= node["custom_template_banner"] %>
+<% end %>
+
 {
     "default": [],
     "manage_image_cache": [["role:admin"]]