install the common package in the common recipe

This fixes a bug on SUSE where the openstack-cinder (common) package
would not be installed when the template in recipes/cinder-common.rb is
created. That package requires the openstack-cinder user which is
created by the openstack-cinder package.

Change-Id: I745d5d32cc70bd2660a734821a682900f3d1043d

attributes/default.rb

@@ -131,11 +131,12 @@ when "fedora", "redhat", "centos" # :pragma-foodcritic: ~FC024 - won't fix this
   default["openstack"]["block-storage"]["platform"] = {
     "mysql_python_packages" => ["MySQL-python"],
     "postgresql_python_packages" => ["python-psycopg2"],
-    "cinder_api_packages" => ["openstack-cinder", "python-cinderclient"],
+    "cinder_common_packages" => ["openstack-cinder"],
+    "cinder_api_packages" => ["python-cinderclient"],
     "cinder_api_service" => "openstack-cinder-api",
-    "cinder_volume_packages" => ["openstack-cinder"],
+    "cinder_volume_packages" => [],
     "cinder_volume_service" => "openstack-cinder-volume",
-    "cinder_scheduler_packages" => ["openstack-cinder"],
+    "cinder_scheduler_packages" => [],
     "cinder_scheduler_service" => "openstack-cinder-scheduler",
     "cinder_iscsitarget_packages" => ["scsi-target-utils"],
     "cinder_iscsitarget_service" => "tgtd",
@@ -149,6 +150,7 @@ when "suse"
   default["openstack"]["block-storage"]["platform"] = {
     "mysql_python_packages" => ["python-mysql"],
     "postgresql_python_packages" => ["python-psycopg2"],
+    "cinder_common_packages" => ["openstack-cinder"],
     "cinder_api_packages" => ["openstack-cinder-api"],
     "cinder_api_service" => "openstack-cinder-api",
     "cinder_scheduler_packages" => ["openstack-cinder-scheduler"],
@@ -166,7 +168,8 @@ when "ubuntu"
   default["openstack"]["block-storage"]["platform"] = {
     "mysql_python_packages" => ["python-mysqldb"],
     "postgresql_python_packages" => ["python-psycopg2"],
-    "cinder_api_packages" => ["cinder-common", "cinder-api", "python-cinderclient"],
+    "cinder_common_packages" => ["cinder-common"],
+    "cinder_api_packages" => ["cinder-api", "python-cinderclient"],
     "cinder_api_service" => "cinder-api",
     "cinder_volume_packages" => ["cinder-volume"],
     "cinder_volume_service" => "cinder-volume",

recipes/cinder-common.rb

@@ -22,6 +22,14 @@ end
 
 platform_options = node["openstack"]["block-storage"]["platform"]
 
+platform_options["cinder_common_packages"].each do |pkg|
+  package pkg do
+    options platform_options["package_overrides"]
+
+    action :upgrade
+  end
+end
+
 db_user = node["openstack"]["block-storage"]["db"]["username"]
 db_pass = db_password "cinder"
 sql_connection = db_uri("volume", db_user, db_pass)

spec/api-redhat_spec.rb

@@ -9,7 +9,6 @@ describe "openstack-block-storage::api" do
     end
 
     it "installs cinder api packages" do
-      expect(@chef_run).to upgrade_package "openstack-cinder"
       expect(@chef_run).to upgrade_package "python-cinderclient"
     end
 

spec/api_spec.rb

@@ -20,7 +20,6 @@ describe "openstack-block-storage::api" do
     end
 
     it "installs cinder api packages" do
-      expect(@chef_run).to upgrade_package "cinder-common"
       expect(@chef_run).to upgrade_package "cinder-api"
       expect(@chef_run).to upgrade_package "python-cinderclient"
     end

spec/cinder_common-opensuse_spec.rb

@@ -0,0 +1,18 @@
+require_relative "spec_helper"
+
+describe "openstack-block-storage::cinder-common" do
+  before { block_storage_stubs }
+  before do
+    @chef_run = ::ChefSpec::ChefRunner.new ::OPENSUSE_OPTS do |n|
+      n.set["openstack"]["mq"] = {
+        "host" => "127.0.0.1"
+      }
+      n.set["openstack"]["block-storage"]["syslog"]["use"] = true
+    end
+    @chef_run.converge "openstack-block-storage::cinder-common"
+  end
+
+  it "installs the openstack-cinder package" do
+    expect(@chef_run).to upgrade_package "openstack-cinder"
+  end
+end

spec/cinder_common-redhat_spec.rb

@@ -0,0 +1,18 @@
+require_relative "spec_helper"
+
+describe "openstack-block-storage::cinder-common" do
+  before { block_storage_stubs }
+  before do
+    @chef_run = ::ChefSpec::ChefRunner.new ::REDHAT_OPTS do |n|
+      n.set["openstack"]["mq"] = {
+        "host" => "127.0.0.1"
+      }
+      n.set["openstack"]["block-storage"]["syslog"]["use"] = true
+    end
+    @chef_run.converge "openstack-block-storage::cinder-common"
+  end
+
+  it "installs the openstack-cinder package" do
+    expect(@chef_run).to upgrade_package "openstack-cinder"
+  end
+end

spec/cinder_common_spec.rb

@@ -12,6 +12,10 @@ describe "openstack-block-storage::cinder-common" do
     @chef_run.converge "openstack-block-storage::cinder-common"
   end
 
+  it "installs the cinder-common package" do
+    expect(@chef_run).to upgrade_package "cinder-common"
+  end
+
   describe "/etc/cinder" do
     before do
      @dir = @chef_run.directory "/etc/cinder"

spec/scheduler-redhat_spec.rb

@@ -8,10 +8,6 @@ describe "openstack-block-storage::scheduler" do
       @chef_run.converge "openstack-block-storage::scheduler"
     end
 
-    it "installs cinder api packages" do
-      expect(@chef_run).to upgrade_package "openstack-cinder"
-    end
-
     it "installs mysql python packages by default" do
       expect(@chef_run).to upgrade_package "MySQL-python"
     end

spec/volume-redhat_spec.rb

@@ -8,10 +8,6 @@ describe "openstack-block-storage::volume" do
       @chef_run.converge "openstack-block-storage::volume"
     end
 
-    it "installs cinder volume packages" do
-      expect(@chef_run).to upgrade_package "openstack-cinder"
-    end
-
     it "installs mysql python packages by default" do
       expect(@chef_run).to upgrade_package "MySQL-python"
     end