From 0d24222b7f385e0449008e1b1d3ee7c8d16ab4b1 Mon Sep 17 00:00:00 2001
From: Simon Dodsley <simon@purestorage.com>
Date: Tue, 16 Feb 2016 14:46:06 -0500
Subject: [PATCH] Relocate common function

Change-Id: Ie25ae0c8dce8e05b7f0f058449709309c88ff1a4
---
 .../lib}/puppet/parser/functions/get_random_id.rb        | 0
 .../plugin_purestorage_cinder/manifests/common.pp        | 1 +
 .../plugin_purestorage_cinder/manifests/compute.pp       | 2 +-
 .../plugin_purestorage_cinder/manifests/controller.pp    | 9 ++++-----
 4 files changed, 6 insertions(+), 6 deletions(-)
 rename {lib => deployment_scripts/puppet/modules/plugin_purestorage_cinder/lib}/puppet/parser/functions/get_random_id.rb (100%)

diff --git a/lib/puppet/parser/functions/get_random_id.rb b/deployment_scripts/puppet/modules/plugin_purestorage_cinder/lib/puppet/parser/functions/get_random_id.rb
similarity index 100%
rename from lib/puppet/parser/functions/get_random_id.rb
rename to deployment_scripts/puppet/modules/plugin_purestorage_cinder/lib/puppet/parser/functions/get_random_id.rb
diff --git a/deployment_scripts/puppet/modules/plugin_purestorage_cinder/manifests/common.pp b/deployment_scripts/puppet/modules/plugin_purestorage_cinder/manifests/common.pp
index b66664f..5da6700 100755
--- a/deployment_scripts/puppet/modules/plugin_purestorage_cinder/manifests/common.pp
+++ b/deployment_scripts/puppet/modules/plugin_purestorage_cinder/manifests/common.pp
@@ -73,4 +73,5 @@ class plugin_purestorage_cinder::common {
     source  => 'puppet:///modules/plugin_purestorage_cinder/multipath.conf',
     require => Package[$plugin_purestorage_cinder::params::multipath_package_name],
     notify  => Service[$plugin_purestorage_cinder::params::multipath_package_name],
+  }
 }
diff --git a/deployment_scripts/puppet/modules/plugin_purestorage_cinder/manifests/compute.pp b/deployment_scripts/puppet/modules/plugin_purestorage_cinder/manifests/compute.pp
index eeb9854..aaa193a 100755
--- a/deployment_scripts/puppet/modules/plugin_purestorage_cinder/manifests/compute.pp
+++ b/deployment_scripts/puppet/modules/plugin_purestorage_cinder/manifests/compute.pp
@@ -28,7 +28,7 @@ class plugin_purestorage_cinder::compute {
     hasrestart => true,
   }
 
-  nova_config { 'libvirt/iscsi_use_multipath': value =>  $plugin_settings['pure_nova_multipath'],
+  nova_config { 'libvirt/iscsi_use_multipath': value =>  $plugin_settings['pure_nova_multipath'];
                 'libvirt/hw_disk_discard': value => 'unmap' }
 
   Nova_config<||> ~> Service['nova-compute']
diff --git a/deployment_scripts/puppet/modules/plugin_purestorage_cinder/manifests/controller.pp b/deployment_scripts/puppet/modules/plugin_purestorage_cinder/manifests/controller.pp
index 7207203..79b168e 100755
--- a/deployment_scripts/puppet/modules/plugin_purestorage_cinder/manifests/controller.pp
+++ b/deployment_scripts/puppet/modules/plugin_purestorage_cinder/manifests/controller.pp
@@ -86,13 +86,12 @@ class plugin_purestorage_cinder::controller (
 # we can just, temporarily, assign a randon ID to the two fields.
 # When keystone-puppet has the functionality we need we will fix this workaround
 
-      $PROJECT_ID"  = get_random_id(32)
-      $USER_ID"  = get_random_id(32)
+      $PROJECT_ID  = get_random_id(32)
+      $USER_ID  = get_random_id(32)
 
-       }
       cinder::backend::pure { DEFAULT :
-        extra_options               => { "DEFAULT/cinder_internal_tenant_project_id" => { value => "$PROJECT_ID"] },
-                                         "DEFALUT/cinder_internal_tenant_user_id" => { value => "$USER_ID"] }
+        extra_options               => { "DEFAULT/cinder_internal_tenant_project_id" => { value => "$PROJECT_ID" },
+                                         "DEFALUT/cinder_internal_tenant_user_id" => { value => "$USER_ID" }
         }
        }
       cinder::backend::pure { $section :