From 572482ab240b13a2fa270561dd098ffe303a5e67 Mon Sep 17 00:00:00 2001 From: Gael Chamoulaud Date: Sat, 28 Mar 2015 18:23:54 +0100 Subject: [PATCH] Tag all Designate packages Some users wish to override the default package provider by their own. Tag all packages with the 'openstack' to allow mass resource attributes override using resource collectors. Closes-bug: #1391209 Change-Id: Idcd296c754c4c66efcbdd1672c8367ce3539b268 Signed-off-by: Gael Chamoulaud --- manifests/agent.pp | 1 + manifests/api.pp | 1 + manifests/central.pp | 1 + manifests/client.pp | 1 + manifests/init.pp | 1 + manifests/sink.pp | 1 + spec/classes/designate_agent_spec.rb | 3 ++- spec/classes/designate_api_spec.rb | 3 ++- spec/classes/designate_central_spec.rb | 3 ++- spec/classes/designate_client_spec.rb | 3 ++- spec/classes/designate_init_spec.rb | 3 ++- spec/classes/designate_sink_spec.rb | 3 ++- 12 files changed, 18 insertions(+), 6 deletions(-) diff --git a/manifests/agent.pp b/manifests/agent.pp index bf0c86bc..2e7a7ed2 100644 --- a/manifests/agent.pp +++ b/manifests/agent.pp @@ -36,6 +36,7 @@ class designate::agent ( package { 'designate-agent': ensure => $package_ensure, name => pick($agent_package_name, $::designate::params::agent_package_name), + tag => 'openstack', } Designate_config<||> ~> Service['designate-agent'] diff --git a/manifests/api.pp b/manifests/api.pp index 8b6b4606..224fb171 100644 --- a/manifests/api.pp +++ b/manifests/api.pp @@ -76,6 +76,7 @@ class designate::api ( package { 'designate-api': ensure => $package_ensure, name => pick($api_package_name, $::designate::params::api_package_name), + tag => 'openstack', } Designate_config<||> ~> Service['designate-api'] diff --git a/manifests/central.pp b/manifests/central.pp index 5765163b..3dd0508a 100644 --- a/manifests/central.pp +++ b/manifests/central.pp @@ -36,6 +36,7 @@ class designate::central ( package { 'designate-central': ensure => $package_ensure, name => pick($central_package_name, $::designate::params::central_package_name), + tag => 'openstack', } Designate_config<||> ~> Service['designate-central'] diff --git a/manifests/client.pp b/manifests/client.pp index 70ec6374..8233a365 100644 --- a/manifests/client.pp +++ b/manifests/client.pp @@ -22,6 +22,7 @@ class designate::client ( package { 'python-designateclient': ensure => $package_ensure, name => pick($client_package_name, $::designate::params::client_package_name), + tag => 'openstack', } } diff --git a/manifests/init.pp b/manifests/init.pp index 858c4b95..ba162794 100644 --- a/manifests/init.pp +++ b/manifests/init.pp @@ -65,6 +65,7 @@ class designate( package { 'designate-common': ensure => $package_ensure, name => pick($common_package_name, $::designate::params::common_package_name), + tag => 'openstack', } user { 'designate': diff --git a/manifests/sink.pp b/manifests/sink.pp index f03c2e2e..266cbc84 100644 --- a/manifests/sink.pp +++ b/manifests/sink.pp @@ -31,6 +31,7 @@ class designate::sink ( package { 'designate-sink': ensure => $package_ensure, name => pick($sink_package_name, $::designate::params::sink_service_name), + tag => 'openstack', } Package['designate-sink'] -> Service['designate-sink'] diff --git a/spec/classes/designate_agent_spec.rb b/spec/classes/designate_agent_spec.rb index 29ad84ee..026f12b4 100644 --- a/spec/classes/designate_agent_spec.rb +++ b/spec/classes/designate_agent_spec.rb @@ -20,7 +20,8 @@ describe 'designate::agent' do ) is_expected.to contain_package('designate-agent').with( :name => platform_params[:agent_package_name], - :ensure => 'present' + :ensure => 'present', + :tag => 'openstack' ) end diff --git a/spec/classes/designate_api_spec.rb b/spec/classes/designate_api_spec.rb index 261fc771..b1069192 100644 --- a/spec/classes/designate_api_spec.rb +++ b/spec/classes/designate_api_spec.rb @@ -27,7 +27,8 @@ describe 'designate::api' do ) is_expected.to contain_package('designate-api').with( :name => platform_params[:api_package_name], - :ensure => 'present' + :ensure => 'present', + :tag => 'openstack' ) end diff --git a/spec/classes/designate_central_spec.rb b/spec/classes/designate_central_spec.rb index 8fca1107..12cb48cd 100644 --- a/spec/classes/designate_central_spec.rb +++ b/spec/classes/designate_central_spec.rb @@ -20,7 +20,8 @@ describe 'designate::central' do ) is_expected.to contain_package('designate-central').with( :name => platform_params[:central_package_name], - :ensure => 'present' + :ensure => 'present', + :tag => 'openstack' ) end diff --git a/spec/classes/designate_client_spec.rb b/spec/classes/designate_client_spec.rb index 061b63f4..7e2c5104 100644 --- a/spec/classes/designate_client_spec.rb +++ b/spec/classes/designate_client_spec.rb @@ -12,7 +12,8 @@ describe 'designate::client' do it 'installs designate client package' do is_expected.to contain_package('python-designateclient').with( :ensure => 'present', - :name => platform_params[:client_package_name] + :name => platform_params[:client_package_name], + :tag => 'openstack' ) end end diff --git a/spec/classes/designate_init_spec.rb b/spec/classes/designate_init_spec.rb index 12cb8cf4..eb1ffd9d 100644 --- a/spec/classes/designate_init_spec.rb +++ b/spec/classes/designate_init_spec.rb @@ -74,7 +74,8 @@ describe 'designate' do it 'installs designate common package' do is_expected.to contain_package('designate-common').with( :ensure => 'installed', - :name => platform_params[:common_package_name] + :name => platform_params[:common_package_name], + :tag => 'openstack' ) end diff --git a/spec/classes/designate_sink_spec.rb b/spec/classes/designate_sink_spec.rb index a6d05ada..d87275c2 100644 --- a/spec/classes/designate_sink_spec.rb +++ b/spec/classes/designate_sink_spec.rb @@ -20,7 +20,8 @@ describe 'designate::sink' do ) is_expected.to contain_package('designate-sink').with( :name => platform_params[:sink_package_name], - :ensure => 'present' + :ensure => 'present', + :tag => 'openstack' ) end end