Remove the glance/rbd user name from static hieradata

The static setting for the glance/rbd user name was overriding
any customization provided via template param because it was
up in the hierarchy for the controller nodes.

More at: https://bugzilla.redhat.com/show_bug.cgi?id=1308889

Change-Id: I3d112de7eeffd524fb1308d5976a28f04aa5ff23

diff --git a/puppet/hieradata/controller.yaml b/puppet/hieradata/controller.yaml
index 288d224..6d1d3b6 100644 (file)
--- a/puppet/hieradata/controller.yaml
+++ b/puppet/hieradata/controller.yaml
@@ -80,7 +80,6 @@ glance::api::pipeline: 'keystone'
 glance::api::show_image_direct_url: true
 glance::registry::pipeline: 'keystone'
 glance::backend::swift::swift_store_create_container_on_put: true
 glance::api::show_image_direct_url: true
 glance::registry::pipeline: 'keystone'
 glance::backend::swift::swift_store_create_container_on_put: true

-glance::backend::rbd::rbd_store_user: 'openstack'

 glance_file_pcmk_directory: '/var/lib/glance/images'
 
 # neutron
 glance_file_pcmk_directory: '/var/lib/glance/images'
 
 # neutron