openstack/puppet-swift
Code Issues Proposed changes

Merge "Install packages before ensuring container-sync-realms.conf"

Browse Source
This commit is contained in:
Zuul
2025-03-11 18:16:35 +00:00
committed by Gerrit Code Review
parent 7b132a881f 5fc89ad787
commit 1434beceb7
2 changed files with 6 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
manifests/storage/server.pp
View File

@@ -428,7 +428,6 @@ define swift::storage::server(
owner => 'root', owner => 'root',
group => pick($group, $::swift::params::group), group => pick($group, $::swift::params::group),
mode => '0640', mode => '0640',
tag => 'swift-config-file',
before => $required_middlewares, before => $required_middlewares,
} }
@@ -576,11 +575,12 @@ define swift::storage::server(
} }
file { '/etc/swift/container-sync-realms.conf': file { '/etc/swift/container-sync-realms.conf':
ensure => 'file', ensure => 'file',
owner => 'root', owner => 'root',
group => pick($group, $::swift::params::group), group => pick($group, $::swift::params::group),
mode => '0640', mode => '0640',
tag => 'swift-config-file', require => Anchor['swift::config::begin'],
before => Anchor['swift::config::end']
} }
File['/etc/swift/container-sync-realms.conf'] -> Swift_container_sync_realms_config<||> File['/etc/swift/container-sync-realms.conf'] -> Swift_container_sync_realms_config<||>
} }

4
spec/defines/swift_storage_server_spec.rb
View File

@@ -62,7 +62,6 @@ describe 'swift::storage::server' do
:owner => 'root', :owner => 'root',
:group => 'swift', :group => 'swift',
:mode => '0640', :mode => '0640',
:tag => 'swift-config-file'
)} )}
it { it {
@@ -248,14 +247,12 @@ describe 'swift::storage::server' do
:owner => 'root', :owner => 'root',
:group => 'swift', :group => 'swift',
:mode => '0640', :mode => '0640',
:tag => 'swift-config-file'
)} )}
it { is_expected.to contain_file('/etc/swift/container-sync-realms.conf').with( it { is_expected.to contain_file('/etc/swift/container-sync-realms.conf').with(
:ensure => 'file', :ensure => 'file',
:owner => 'root', :owner => 'root',
:group => 'swift', :group => 'swift',
:mode => '0640', :mode => '0640',
:tag => 'swift-config-file'
)} )}
it { it {
@@ -452,7 +449,6 @@ describe 'swift::storage::server' do
:owner => 'root', :owner => 'root',
:group => 'swift', :group => 'swift',
:mode => '0640', :mode => '0640',
:tag => 'swift-config-file'
)} )}
it { it {