diff

gistfile1.txt

diff --git a/hiera/data/common.yaml b/hiera/data/common.yaml
index 3bf5e67..7e4f77b 100644
--- a/hiera/data/common.yaml
+++ b/hiera/data/common.yaml
@@ -3,7 +3,7 @@
 ###################################
 
 ##
-# Idea is to enable jumbo frames after complete initial setup.
+# Idea is to enable jumbo frames after completing initial setup.
 ##
 mtu: 1500
 
@@ -142,6 +142,7 @@ cinder::scheduler::scheduler_driver: cinder.scheduler.simple.SimpleScheduler
 cinder::volume::rbd::rbd_pool: volumes
 cinder::volume::rbd::rbd_user: cinder_volume
 cinder::volume::rbd::volume_tmp_dir: /tmp
+cinder::volume::rbd::rbd_secret_uuid: "%{hiera('cinder_rbd_secret_uuid')}"
 rjil::cinder::ceph_mon_key: "%{hiera('rjil::ceph::mon::key')}"
 rjil::cinder::rbd_user: cinder_volume
 
@@ -191,7 +192,7 @@ nova::compute::libvirt::libvirt_images_type: raw
 
-rjil::nova::compute::cinder_rbd_secret_uuid: ac618f4d-b223-4b46-9aa8-e73178743521
+rjil::nova::compute::cinder_rbd_secret_uuid: "%{hiera('cinder_rbd_secret_uuid')}"
 rjil::nova::compute::ceph_mon_key: "%{hiera('rjil::ceph::mon::key')}"
 
 
diff --git a/hiera/data/secrets/common.yaml b/hiera/data/secrets/common.yaml
index 91d4637..73937c7 100644
--- a/hiera/data/secrets/common.yaml
+++ b/hiera/data/secrets/common.yaml
@@ -25,7 +25,7 @@ nova_db_password: nova
 # Cinder
 cinder_db_user: cinder
 cinder_db_password: cinder
-cinder::volume::rbd::rbd_secret_uuid: 26f3bfcf-7acd-40ec-948d-62b12cd14901
+cinder_rbd_secret_uuid: 26f3bfcf-7acd-40ec-948d-62b12cd14901
 
 # Test user
 test_user_name: testuser
diff --git a/manifests/contrail/vrouter.pp b/manifests/contrail/vrouter.pp
index 3e6465a..3b6044a 100644
--- a/manifests/contrail/vrouter.pp
+++ b/manifests/contrail/vrouter.pp
@@ -26,7 +26,7 @@ class rjil::contrail::vrouter (
   Package['libvirt'] ->
   File_line['cgroup_device_acl']
 
- file_line {'cgroup_device_acl':
+  file_line {'cgroup_device_acl':
     path => '/etc/libvirt/qemu.conf',
     line => 'cgroup_device_acl = [ "/dev/null", "/dev/full", "/dev/zero", "/dev/random", "/dev/urandom", "/dev/ptmx", "/dev/kvm", "/dev/kqemu", "/dev/rtc", "/dev/hpet","/dev/net/tun", ]',
     notify => Service['libvirt'],
diff --git a/site.pp b/site.pp
index 8e0436d..0965b91 100644
--- a/site.pp
+++ b/site.pp
@@ -140,8 +140,9 @@ node /^oclb\d+/ {
   include rjil::haproxy::openstack
 }
 
-## cp nodes are actual compute nodes
-
+##
+# compute nodes
+##
 node /^cp\d+/ {
   include rjil::base
   include rjil::ceph
diff --git a/spec/classes/openstack_zeromq_spec.rb b/spec/classes/openstack_zeromq_spec.rb
index 6f4581e..41828bf 100644
--- a/spec/classes/openstack_zeromq_spec.rb
+++ b/spec/classes/openstack_zeromq_spec.rb
@@ -27,6 +27,7 @@ describe 'rjil::openstack_zeromq' do
                                     'nob.example.com' => '1.1.1.2'},
         :nova_cert_nodes        => {'nea.example.com' => '1.1.1.1',
                                     'neb.example.com' => '1.1.1.2'},
+        :nova_compute_nodes     => {'comupte.example.com' => '1.1.1.1'}
       }
     end
     it do