Merge "Use new openstackclient tag"

manifests/client.pp

@@ -18,7 +18,7 @@ class cinder::client(
   package { 'python-cinderclient':
     ensure => $package_ensure,
     name   => $::cinder::params::client_package,
-    tag    => ['openstack', 'cinder-support-package'],
+    tag    => 'openstack',
   }
 
   include openstacklib::openstackclient

manifests/deps.pp

@@ -78,8 +78,8 @@ class cinder::deps {
   # will have clients available to create resources. This tag handles the
   # openstackclient but indirectly since the client is not available in
   # all catalogs that don't need the client class (like many spec tests)
-  Package<| tag == 'openstack'|>
-  ~> Anchor['cinder::service::end']
+  Package<| tag == 'openstackclient'|>
+  -> Anchor['cinder::service::end']
 
   # Installation or config changes will always restart services.
   Anchor['cinder::install::end'] ~> Anchor['cinder::service::begin']

spec/classes/cinder_client_spec.rb

@@ -23,7 +23,7 @@ describe 'cinder::client' do
       is_expected.to contain_package('python-cinderclient').with(
         :name   => platform_params[:client_package_name],
         :ensure => p[:package_ensure],
-        :tag    => ['openstack', 'cinder-support-package'],
+        :tag    => 'openstack',
       )
     end