summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJenkins <jenkins@review.openstack.org>2017-06-16 20:39:06 +0000
committerGerrit Code Review <review@openstack.org>2017-06-16 20:39:06 +0000
commit0e8c75e5267a93a7706d98fd070b0f1aab540a3e (patch)
tree5f8f2d15ef3384671a9046947ca26cf4d386c03e
parentfcb143cda7a80a7b2ae9fef291b7b412c26c7510 (diff)
parentdede1d449473f99c4f929e555a3b65b974ebad4b (diff)
Merge "Enable Swift containersync on Red Hat platform"
-rw-r--r--manifests/storage/container.pp20
-rw-r--r--releasenotes/notes/swift-containersync-service-f188d18796e7affe.yaml5
-rw-r--r--spec/classes/swift_storage_container_spec.rb1
3 files changed, 15 insertions, 11 deletions
diff --git a/manifests/storage/container.pp b/manifests/storage/container.pp
index e3e02e7..8a515b8 100644
--- a/manifests/storage/container.pp
+++ b/manifests/storage/container.pp
@@ -43,6 +43,7 @@ class swift::storage::container(
43 include ::swift::deps 43 include ::swift::deps
44 44
45 Swift_config<| |> ~> Service['swift-container-updater'] 45 Swift_config<| |> ~> Service['swift-container-updater']
46 Swift_config<| |> ~> Service['swift-container-sync']
46 47
47 swift::storage::generic { 'container': 48 swift::storage::generic { 'container':
48 manage_service => $manage_service, 49 manage_service => $manage_service,
@@ -70,16 +71,13 @@ class swift::storage::container(
70 service_subscribe => Concat["/etc/swift/${config_file_name}"], 71 service_subscribe => Concat["/etc/swift/${config_file_name}"],
71 } 72 }
72 73
73 if $::osfamily == 'Debian' { 74 swift::service { 'swift-container-sync':
74 swift::service { 'swift-container-sync': 75 os_family_service_name => $::swift::params::container_sync_service_name,
75 os_family_service_name => $::swift::params::container_sync_service_name, 76 service_ensure => $service_ensure,
76 service_ensure => $service_ensure, 77 enabled => $enabled,
77 enabled => $enabled, 78 config_file_name => $config_file_name,
78 config_file_name => $config_file_name, 79 service_provider => $service_provider,
79 service_provider => $service_provider, 80 service_require => Package['swift-container'],
80 service_require => Package['swift-container'], 81 service_subscribe => Concat["/etc/swift/${config_file_name}"],
81 service_subscribe => Concat["/etc/swift/${config_file_name}"],
82 }
83 Swift_config<| |> ~> Service['swift-container-sync']
84 } 82 }
85} 83}
diff --git a/releasenotes/notes/swift-containersync-service-f188d18796e7affe.yaml b/releasenotes/notes/swift-containersync-service-f188d18796e7affe.yaml
new file mode 100644
index 0000000..fd4ba2f
--- /dev/null
+++ b/releasenotes/notes/swift-containersync-service-f188d18796e7affe.yaml
@@ -0,0 +1,5 @@
1---
2fixes:
3 - |
4 The systemd service for Swift containersync is now enabled by
5 default without a distribution check.
diff --git a/spec/classes/swift_storage_container_spec.rb b/spec/classes/swift_storage_container_spec.rb
index 9d6840a..3c087a9 100644
--- a/spec/classes/swift_storage_container_spec.rb
+++ b/spec/classes/swift_storage_container_spec.rb
@@ -142,6 +142,7 @@ describe 'swift::storage::container' do
142 'swift-container-replicator' => 'swift-container-replicator', 142 'swift-container-replicator' => 'swift-container-replicator',
143 'swift-container-updater' => 'swift-container-updater', 143 'swift-container-updater' => 'swift-container-updater',
144 'swift-container-auditor' => 'swift-container-auditor', 144 'swift-container-auditor' => 'swift-container-auditor',
145 'swift-container-sync' => 'swift-container-sync'
145 }, 146 },
146 :service_provider => 'swiftinit' 147 :service_provider => 'swiftinit'
147 } 148 }