block-storage refactor for Pike and Chef 13

- deprecated postgresql support
- dropped apt cookbook dependency
- deprecated node.foo.bar method access for node['foo']['bar'] bracket syntax
- implemented foodcritic and cookstyle corrections
- migrated cinder api to a Chef-managed config
- deprecated cinder-group-active service, as it is no longer needed and gets in
  the way of functionality
- added lvm cookbook dependency for better pv/vg handling

Implements blueprint modern-chef

Change-Id: Id248c9267af6750c871487bc8b577aa2011a782a

10 files changed, 30 insertions, 68 deletions

diff --git a/spec/api-redhat_spec.rb b/spec/api-redhat_spec.rb
index d0ef802..11f73b6 100644
--- a/spec/api-redhat_spec.rb
+++ b/spec/api-redhat_spec.rb
@@ -19,12 +19,5 @@ describe 'openstack-block-storage::api' do
     it 'upgrades mysql python package' do
       expect(chef_run).to upgrade_package 'MySQL-python'
     end
-
-    it 'upgrades postgresql python packages if explicitly told' do
-      node.set['openstack']['db']['block-storage']['service_type'] = 'postgresql'
-
-      expect(chef_run).to upgrade_package 'python-psycopg2'
-      expect(chef_run).not_to upgrade_package 'MySQL-python'
-    end
   end
 end
diff --git a/spec/api_spec.rb b/spec/api_spec.rb
index 366a2bb..13f9897 100644
--- a/spec/api_spec.rb
+++ b/spec/api_spec.rb
@@ -22,13 +22,6 @@ describe 'openstack-block-storage::api' do
       expect(chef_run).to upgrade_package('python-mysqldb')
     end
 
-    it 'upgrades postgresql python packages if explicitly told' do
-      node.set['openstack']['db']['block-storage']['service_type'] = 'postgresql'
-
-      expect(chef_run).to upgrade_package('python-psycopg2')
-      expect(chef_run).not_to upgrade_package('python-mysqldb')
-    end
-
     it 'runs db migrations' do
       expect(chef_run).to run_execute('cinder-manage db sync').with(user: 'cinder', group: 'cinder')
     end
diff --git a/spec/backup-redhat_spec.rb b/spec/backup-redhat_spec.rb
index 3e46c41..7fc940b 100644
--- a/spec/backup-redhat_spec.rb
+++ b/spec/backup-redhat_spec.rb
@@ -28,13 +28,6 @@ describe 'openstack-block-storage::backup' do
       it 'upgrades mysql python package' do
         expect(chef_run).to upgrade_package 'MySQL-python'
       end
-
-      it 'upgrades postgresql python packages if explicitly told' do
-        node.set['openstack']['db']['block-storage']['service_type'] = 'postgresql'
-
-        expect(chef_run).to upgrade_package 'python-psycopg2'
-        expect(chef_run).not_to upgrade_package 'MySQL-python'
-      end
     end
   end
 end
diff --git a/spec/backup_spec.rb b/spec/backup_spec.rb
index d8ff358..ed44776 100644
--- a/spec/backup_spec.rb
+++ b/spec/backup_spec.rb
@@ -32,13 +32,6 @@ describe 'openstack-block-storage::backup' do
       it 'upgrades mysql python package' do
         expect(chef_run).to upgrade_package 'python-mysqldb'
       end
-
-      it 'upgrades postgresql python packages if explicitly told' do
-        node.set['openstack']['db']['block-storage']['service_type'] = 'postgresql'
-
-        expect(chef_run).to upgrade_package 'python-psycopg2'
-        expect(chef_run).not_to upgrade_package 'python-mysqldb'
-      end
     end
   end
 end
diff --git a/spec/identity_registration_spec.rb b/spec/identity_registration_spec.rb
index 95e2315..c0cdfec 100644
--- a/spec/identity_registration_spec.rb
+++ b/spec/identity_registration_spec.rb
@@ -23,6 +23,7 @@ describe 'openstack-block-storage::identity_registration' do
     service_type = 'volumev2'
     service_user = 'cinder'
     url = 'http://127.0.0.1:8776/v2/%(tenant_id)s'
+    url_v3 = 'http://127.0.0.1:8776/v3/%(tenant_id)s'
     region = 'RegionOne'
     project_name = 'service'
     role_name = 'service'
@@ -46,6 +47,15 @@ describe 'openstack-block-storage::identity_registration' do
       )
     end
 
+    it 'registers cinderv3 service' do
+      expect(chef_run).to create_openstack_service(
+        'cinderv3'
+      ).with(
+        connection_params: connection_params,
+        type: 'volumev3'
+      )
+    end
+
     context "registers #{service_name} endpoint" do
       %w(admin internal public).each do |interface|
         it "#{interface} endpoint with default values" do
@@ -59,6 +69,18 @@ describe 'openstack-block-storage::identity_registration' do
             connection_params: connection_params
           )
         end
+
+        it "volumev3 #{interface} endpoint with default values" do
+          expect(chef_run).to create_openstack_endpoint(
+            'volumev3'
+          ).with(
+            service_name: 'cinderv3',
+            # interface: interface,
+            url: url_v3,
+            region: region,
+            connection_params: connection_params
+          )
+        end
       end
 
       it 'with custom region override' do
@@ -75,16 +97,6 @@ describe 'openstack-block-storage::identity_registration' do
       ).with(
         domain_name: domain_name,
         project_name: project_name,
-        password: password,
-        connection_params: connection_params
-      )
-    end
-
-    it do
-      expect(chef_run).to grant_role_openstack_user(
-        service_user
-      ).with(
-        project_name: project_name,
         role_name: role_name,
         password: password,
         connection_params: connection_params
diff --git a/spec/scheduler-redhat_spec.rb b/spec/scheduler-redhat_spec.rb
index edd0c00..0c2ff2f 100644
--- a/spec/scheduler-redhat_spec.rb
+++ b/spec/scheduler-redhat_spec.rb
@@ -27,12 +27,5 @@ describe 'openstack-block-storage::scheduler' do
     it 'upgrades mysql python package' do
       expect(chef_run).to upgrade_package 'MySQL-python'
     end
-
-    it 'upgrades postgresql python packages if explicitly told' do
-      node.set['openstack']['db']['block-storage']['service_type'] = 'postgresql'
-
-      expect(chef_run).to upgrade_package 'python-psycopg2'
-      expect(chef_run).not_to upgrade_package 'MySQL-python'
-    end
   end
 end
diff --git a/spec/scheduler_spec.rb b/spec/scheduler_spec.rb
index 3b60a7c..2cefe34 100644
--- a/spec/scheduler_spec.rb
+++ b/spec/scheduler_spec.rb
@@ -29,12 +29,5 @@ describe 'openstack-block-storage::scheduler' do
     it 'upgrades mysql python package' do
       expect(chef_run).to upgrade_package 'python-mysqldb'
     end
-
-    it 'upgrades postgresql python packages if explicitly told' do
-      node.set['openstack']['db']['block-storage']['service_type'] = 'postgresql'
-
-      expect(chef_run).to upgrade_package 'python-psycopg2'
-      expect(chef_run).not_to upgrade_package 'python-mysqldb'
-    end
   end
 end
diff --git a/spec/spec_helper.rb b/spec/spec_helper.rb
index eb82788..cb91497 100644
--- a/spec/spec_helper.rb
+++ b/spec/spec_helper.rb
@@ -12,7 +12,7 @@ require 'chef/application'
 LOG_LEVEL = :fatal
 REDHAT_OPTS = {
   platform: 'redhat',
-  version: '7.1',
+  version: '7.3',
   log_level: LOG_LEVEL,
 }.freeze
 UBUNTU_OPTS = {
@@ -58,6 +58,8 @@ shared_context 'block-storage-stubs' do
     allow_any_instance_of(Chef::Recipe).to receive(:rabbit_transport_url)
       .with('block-storage')
       .and_return('rabbit://guest:mypass@127.0.0.1:5672')
+    stub_command('/usr/sbin/httpd -t').and_return(true)
+    stub_command('/usr/sbin/apache2 -t').and_return(true)
     allow(Chef::Application).to receive(:fatal!)
   end
 end
diff --git a/spec/volume-redhat_spec.rb b/spec/volume-redhat_spec.rb
index 1830442..7e3e1a4 100644
--- a/spec/volume-redhat_spec.rb
+++ b/spec/volume-redhat_spec.rb
@@ -16,13 +16,6 @@ describe 'openstack-block-storage::volume' do
       expect(chef_run).to upgrade_package('MySQL-python')
     end
 
-    it 'upgrades postgresql python packages if explicitly told' do
-      node.set['openstack']['db']['block-storage']['service_type'] = 'postgresql'
-
-      expect(chef_run).to upgrade_package('python-psycopg2')
-      expect(chef_run).not_to upgrade_package('MySQL-python')
-    end
-
     it 'upgrades qemu-img-ev package' do
       expect(chef_run).to upgrade_package('qemu-img-ev')
     end
@@ -41,7 +34,7 @@ describe 'openstack-block-storage::volume' do
 
     context 'ISCSI' do
       it 'starts iscsi target on boot' do
-        expect(chef_run).to enable_service('target')
+        expect(chef_run).to enable_service('iscsitarget')
       end
     end
   end
diff --git a/spec/volume_spec.rb b/spec/volume_spec.rb
index 5c6b3b2..b5efa33 100644
--- a/spec/volume_spec.rb
+++ b/spec/volume_spec.rb
@@ -22,6 +22,10 @@ describe 'openstack-block-storage::volume' do
       expect(chef_run).to upgrade_package 'qemu-utils'
     end
 
+    it 'upgrades thin provisioning tools package' do
+      expect(chef_run).to upgrade_package 'thin-provisioning-tools'
+    end
+
     it 'starts cinder volume' do
       expect(chef_run).to start_service 'cinder-volume'
     end
@@ -38,13 +42,6 @@ describe 'openstack-block-storage::volume' do
       expect(chef_run).to upgrade_package 'python-mysqldb'
     end
 
-    it 'upgrades postgresql python packages if explicitly told' do
-      node.set['openstack']['db']['block-storage']['service_type'] = 'postgresql'
-
-      expect(chef_run).to upgrade_package 'python-psycopg2'
-      expect(chef_run).not_to upgrade_package 'python-mysqldb'
-    end
-
     it 'upgrades cinder iscsi package' do
       expect(chef_run).to upgrade_package 'tgt'
     end