3 files changed, 29 insertions, 0 deletions
diff --git a/puppet/hieradata/common.yaml b/puppet/hieradata/common.yaml
index 884be6af..76cde950 100644
--- a/puppet/hieradata/common.yaml
+++ b/puppet/hieradata/common.yaml
@@ -1 +1,2 @@
 # Common Hiera data gets applied to all nodes
+ssh::server::storeconfigs_enabled: false
diff --git a/puppet/hieradata/controller.yaml b/puppet/hieradata/controller.yaml
index 874d383b..99783a54 100644
--- a/puppet/hieradata/controller.yaml
+++ b/puppet/hieradata/controller.yaml
@@ -18,6 +18,23 @@ glance::registry::keystone_tenant: 'service'
 neutron::server::auth_tenant: 'service'
 neutron::agents::metadata::auth_tenant: 'service'
 cinder::api::keystone_tenant: 'service'
+swift::proxy::authtoken::admin_tenant_name: 'service'
+
+#swift
+swift::proxy::pipeline:
+  - 'catch_errors'
+  - 'healthcheck'
+  - 'cache'
+  - 'ratelimit'
+  - 'tempurl'
+  - 'formpost'
+  - 'staticweb'
+  - 'authtoken'
+  - 'keystone'
+  - 'proxy-logging'
+  - 'proxy-server'
+
+swift::proxy::account_autocreate: true
 
 # glance
 glance::api::pipeline: 'keystone'
diff --git a/puppet/hieradata/object.yaml b/puppet/hieradata/object.yaml
new file mode 100644
index 00000000..759a7ba9
--- /dev/null
+++ b/puppet/hieradata/object.yaml
@@ -0,0 +1,11 @@
+# Hiera data for swift storage nodes
+swift::storage::all::object_pipeline:
+  - healthcheck
+  - recon
+  - object-server
+swift::storage::all::container_pipeline:
+  - healthcheck
+  - container-server
+swift::storage::all::account_pipeline:
+  - healthcheck
+  - account-server