From c27e90ab06757b13d25fb3f3fe90aadb1846fda1 Mon Sep 17 00:00:00 2001
From: Emilien Macchi <emilien.macchi@enovance.com>
Date: Mon, 12 May 2014 10:34:34 -0400
Subject: [PATCH] Update to latest refs

Signed-off-by: Emilien Macchi <emilien.macchi@enovance.com>
---
 .fixtures.yml                                | 4 ++--
 Puppetfile                                   | 4 ++--
 manifests/volume.pp                          | 7 ++++++-
 spec/classes/cloud_volume_controller_spec.rb | 2 +-
 spec/classes/cloud_volume_storage_spec.rb    | 2 +-
 5 files changed, 12 insertions(+), 7 deletions(-)

diff --git a/.fixtures.yml b/.fixtures.yml
index 5cf40315..5f00bff9 100644
--- a/.fixtures.yml
+++ b/.fixtures.yml
@@ -8,10 +8,10 @@ fixtures:
       ref: '77dbc80de15b5ef02a5e89c8ef040e70df576a1d'
     'nova':
       repo: 'git://github.com/enovance/puppet-nova.git'
-      ref: '1e77a9d48a85a3ae6d30993b3c887f58e4a5973c'
+      ref: '0249428f294217c2ad5fb75f8d0a0bafac12fe9c'
     'glance':
       repo: 'git://github.com/enovance/puppet-glance.git'
-      ref: 'f3bbfd9efcc2436d6ed4beca87d62168bb109453'
+      ref: '8156a87cd04943904258d572e47838d0c346654f'
     'horizon':
       repo: 'git://github.com/enovance/puppet-horizon'
       ref: '36383e90d1c4013d7989561b00ffcb08c76908de'
diff --git a/Puppetfile b/Puppetfile
index effe4055..493b294e 100644
--- a/Puppetfile
+++ b/Puppetfile
@@ -25,7 +25,7 @@ mod 'cinder',
   :ref => 'eccaa59fb9635c62d108029e797388d456e8f6c2'
 mod 'glance',
   :git => 'git://github.com/enovance/puppet-glance.git',
-  :ref => 'f3bbfd9efcc2436d6ed4beca87d62168bb109453'
+  :ref => '8156a87cd04943904258d572e47838d0c346654f'
 mod 'heat',
   :git => 'git://github.com/enovance/puppet-heat.git',
   :ref => '17736b2fd726858cb83590f8a8b1d594a087ea44'
@@ -40,7 +40,7 @@ mod 'neutron',
   :ref => '66c436bc2f06c5a71d79c674697394a11ec227f9'
 mod 'nova',
   :git => 'git://github.com/enovance/puppet-nova.git',
-  :ref => '1e77a9d48a85a3ae6d30993b3c887f58e4a5973c'
+  :ref => '0249428f294217c2ad5fb75f8d0a0bafac12fe9c'
 mod 'swift',
   :git => 'git://github.com/enovance/puppet-swift.git',
   :ref => '9874edd2655e122bf8bd3eedc70e697bc5b83326'
diff --git a/manifests/volume.pp b/manifests/volume.pp
index eaacaf47..45dd4ff1 100644
--- a/manifests/volume.pp
+++ b/manifests/volume.pp
@@ -92,7 +92,12 @@ class cloud::volume(
     log_dir                   => $log_dir,
     log_facility              => $log_facility,
     use_syslog                => $use_syslog,
-    storage_availability_zone => $storage_availability_zone
+    # https://review.openstack.org/#/c/92993/
+    # storage_availability_zone => $storage_availability_zone
+  }
+
+  cinder_config {
+    'DEFAULT/storage_availability_zone': value => $storage_availability_zone
   }
 
   class { 'cinder::ceilometer': }
diff --git a/spec/classes/cloud_volume_controller_spec.rb b/spec/classes/cloud_volume_controller_spec.rb
index 6e28b264..609783eb 100644
--- a/spec/classes/cloud_volume_controller_spec.rb
+++ b/spec/classes/cloud_volume_controller_spec.rb
@@ -60,7 +60,7 @@ describe 'cloud::volume::controller' do
           :log_facility              => 'LOG_LOCAL0',
           :use_syslog                => true,
           :log_dir                   => false,
-          :storage_availability_zone => 'nova'
+          # :storage_availability_zone => 'nova'
         )
       should contain_class('cinder::ceilometer')
     end
diff --git a/spec/classes/cloud_volume_storage_spec.rb b/spec/classes/cloud_volume_storage_spec.rb
index 134e3bde..e55d906d 100644
--- a/spec/classes/cloud_volume_storage_spec.rb
+++ b/spec/classes/cloud_volume_storage_spec.rb
@@ -74,7 +74,7 @@ describe 'cloud::volume::storage' do
           :log_facility              => 'LOG_LOCAL0',
           :use_syslog                => true,
           :log_dir                   => false,
-          :storage_availability_zone => 'nova'
+          # :storage_availability_zone => 'nova'
         )
 
       should contain_cinder_config('DEFAULT/notification_driver').with('value' => 'cinder.openstack.common.notifier.rpc_notifier')