profile/nova/compute changed to use CEPH as external cluster. Comments on the code.

manifests/profile/nova/compute.pp

@@ -4,6 +4,9 @@ class iaas::profile::nova::compute (
   $neutron_password = hiera('iaas::profile::neutron::password', undef),
   $cinder_secret = hiera('iaas::profile::cinder::secret', undef),
 
+# added reference to ceph::keys::args hash
+  $ceph_cinder_key = hiera_hash('ceph::keys::args', false),
+
   $region = hiera('iaas::region', undef),
   $endpoint = hiera('iaas::role::endpoint::main_address', undef),
 ) {
@@ -11,9 +14,10 @@ class iaas::profile::nova::compute (
 
   package { 'sysfsutils': }
 
-  sysctl { 'net.ipv4.ip_forward': value => '1' }
-  sysctl { 'net.ipv4.conf.all.rp_filter': value => '0' }
-  sysctl { 'net.ipv4.conf.default.rp_filter': value => '0' }
+#duritong/sysctl compatible
+  sysctl::value { "net.ipv4.ip_forward": value => "1" }
+  sysctl::value { "net.ipv4.conf.all.rp_filter": value => "0" }
+  sysctl::value { "net.ipv4.conf.default.rp_filter": value => "0" }
 
   class { 'ceph::profile::client': } ->
   class { 'ceph::keys': }
@@ -23,7 +27,7 @@ class iaas::profile::nova::compute (
     vnc_enabled => true,
     vncserver_proxyclient_address => $::facts["ipaddress_${admin_interface}"],
     vncproxy_host => $endpoint,
-    vnc_keymap => 'fr',
+    vnc_keymap => 'en-us',
   }
 
   class { '::nova::compute::neutron': }
@@ -34,11 +38,16 @@ class iaas::profile::nova::compute (
     migration_support => true,
   }
 
+#cinder.client_secret
+$cinder_key = $ceph_cinder_key['client.cinder']['secret']
+
   class {'nova::compute::rbd':
     libvirt_rbd_user => 'cinder',
     libvirt_images_rbd_pool => 'vms',
     libvirt_rbd_secret_uuid => $cinder_secret,
-    rbd_keyring => 'client.cinder'
+    rbd_keyring => 'client.cinder',
+#Added cinder.client_secret
+    libvirt_rbd_secret_key => $cinder_key,
   }
 
   nova_config {