openstack/puppet-swift
Code Issues Proposed changes

swift-concat requires swift-file dependency

Browse Source 
In a case where /etc/swift/<type>-server/<config_files>
is used, need to ensure that the directory is created
before the concat resource attempts to write a config
file there.

Change-Id: I3f62a2bcd65b429518327f43918871d4263d35fb
This commit is contained in:
Adam Vinsh
2016-10-07 17:26:47 +00:00
parent ad6a7e4987
commit af4c987615
2 changed files with 2 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
manifests/deps.pp
View File

@@ -39,6 +39,7 @@ class swift::deps {
Anchor['swift::config::begin'] Anchor['swift::config::begin']
-> File<| tag == 'swift-file' |> -> File<| tag == 'swift-file' |>
-> Concat<| tag == 'swift-concat' |>
~> Anchor['swift::config::end'] ~> Anchor['swift::config::end']
# Support packages need to be installed in the install phase, but we don't # Support packages need to be installed in the install phase, but we don't

1
manifests/storage/server.pp
View File

@@ -218,6 +218,7 @@ define swift::storage::server(
group => $group, group => $group,
notify => Service["swift-${type}-server", "swift-${type}-replicator", "swift-${type}-auditor"], notify => Service["swift-${type}-server", "swift-${type}-replicator", "swift-${type}-auditor"],
require => Package['swift'], require => Package['swift'],
tag => 'swift-concat',
} }
$required_middlewares = split( $required_middlewares = split(