Fix for cinder classes; clean comments

manifests/profile/cinder.pp

@@ -5,23 +5,29 @@ class iaas::profile::cinder (
   $secret = undef,
   $volume_size = undef,
 
+#verbose, debug
+  $verbose = hiera('iaas::verbose', undef),
+  $debug = hiera('iaas::debug', undef),
+
   $region = hiera('iaas::region', undef),
   $endpoint = hiera('iaas::role::endpoint::main_address', undef),
- #Costa - added $rhosts
+#Added $rhosts
   $rhosts = hiera('iaas::profile::rabbitmq::rhosts', undef),
   $rabbitmq_user = hiera('iaas::profile::rabbitmq::user', undef),
   $rabbitmq_password = hiera('iaas::profile::rabbitmq::password', undef),
 ) {
-#Costa
-#  include iaas::resources::connectors
-#Costa
-#  iaas::resources::database { 'cinder': }
+  include iaas::resources::connectors
+  iaas::resources::database { 'cinder': }
 
   class { '::cinder':
+#Verbose, debug
+    verbose => $verbose,
+    debug => $debug,
+
     database_connection => $iaas::resources::connectors::cinder,
-#Costa - added rabbit_hosts
+#Added rabbit_hosts
 #    rabbit_host => $endpoint,
-    rpc_backend => 'rabbit',
+#    rpc_backend => 'rabbit',
     rabbit_hosts => $rhosts,
     rabbit_userid => $rabbitmq_user,
     rabbit_password => $rabbitmq_password,
@@ -42,9 +48,11 @@ class iaas::profile::cinder (
   }
 
   class { '::cinder::api':
+#Identity_uri - planed to be implemented
+    keystone_auth_host => $endpoint,
     keystone_password => $password,
-    auth_uri => "http://${endpoint}:5000/v2.0",
-    identity_uri => "http://${endpoint}:35357",
+    keystone_auth_uri => "http://${endpoint}:5000/v2.0",
+#    keystone_identity_uri => "http://${endpoint}:35357",
     bind_host => $::facts["ipaddress_${admin_interface}"],
   }
 
@@ -65,12 +73,11 @@ class iaas::profile::cinder (
     rbd_secret_uuid => $secret,
   }
 
-#Costa
-#  class { '::cinder::backup': }
-#  class { '::cinder::backup::ceph':
-#    backup_ceph_user => 'cinder-backup',
-#  }
-
+  class { '::cinder::backup': }
+  class { '::cinder::backup::ceph':
+    backup_ceph_user => 'cinder-backup',
+  }
+#HAproxy setup commented
 #  @@haproxy::balancermember { "cinder_api_${::fqdn}":
 #    listening_service => 'cinder_api_cluster',
 #    server_names => $::hostname,