From af4c987615650a9ebb67826964614eddb9a2667d Mon Sep 17 00:00:00 2001 From: Adam Vinsh Date: Fri, 7 Oct 2016 17:26:47 +0000 Subject: [PATCH] swift-concat requires swift-file dependency In a case where /etc/swift/-server/ is used, need to ensure that the directory is created before the concat resource attempts to write a config file there. Change-Id: I3f62a2bcd65b429518327f43918871d4263d35fb --- manifests/deps.pp | 1 + manifests/storage/server.pp | 1 + 2 files changed, 2 insertions(+) diff --git a/manifests/deps.pp b/manifests/deps.pp index 673d007d..e4969685 100644 --- a/manifests/deps.pp +++ b/manifests/deps.pp @@ -39,6 +39,7 @@ class swift::deps { Anchor['swift::config::begin'] -> File<| tag == 'swift-file' |> + -> Concat<| tag == 'swift-concat' |> ~> Anchor['swift::config::end'] # Support packages need to be installed in the install phase, but we don't diff --git a/manifests/storage/server.pp b/manifests/storage/server.pp index 0f4748f8..e8db48bb 100644 --- a/manifests/storage/server.pp +++ b/manifests/storage/server.pp @@ -218,6 +218,7 @@ define swift::storage::server( group => $group, notify => Service["swift-${type}-server", "swift-${type}-replicator", "swift-${type}-auditor"], require => Package['swift'], + tag => 'swift-concat', } $required_middlewares = split(