From 315fa319630fa22ee9e31a058a2a17376b5f1ea3 Mon Sep 17 00:00:00 2001
From: Emilien Macchi <emilien@redhat.com>
Date: Wed, 13 Jul 2016 11:29:43 -0400
Subject: Migrate Puppet Hieradata to composable services

Migrate puppet/hieradata/*.yaml parameters to puppet/services/*.yaml
except for some services that are not composable yet.

Co-Authored-By: Juan Antonio Osorio Robles <jaosorior@redhat.com>
Change-Id: I7e5f8b18ee9aa63a1dffc6facaf88315b07d5fd7
---
 puppet/services/swift-proxy.yaml | 26 ++++++++++++++++++++++++++
 1 file changed, 26 insertions(+)

(limited to 'puppet/services/swift-proxy.yaml')

diff --git a/puppet/services/swift-proxy.yaml b/puppet/services/swift-proxy.yaml
index 12165cc1..5d172709 100644
--- a/puppet/services/swift-proxy.yaml
+++ b/puppet/services/swift-proxy.yaml
@@ -41,6 +41,7 @@ outputs:
         swift::proxy::authtoken::auth_uri: {get_param: [EndpointMap, KeystoneInternal, uri]}
         swift::proxy::authtoken::identity_uri: {get_param: [EndpointMap, KeystoneAdmin, uri_no_suffix]}
         swift::proxy::authtoken::admin_password: {get_param: SwiftPassword}
+        swift::proxy::authtoken::admin_tenant_name: 'service'
         swift::proxy::node_timeout: {get_param: SwiftProxyNodeTimeout}
         swift::proxy::workers: {get_param: SwiftWorkers}
         swift::keystone::auth::public_url: {get_param: [EndpointMap, SwiftPublic, uri]}
@@ -56,5 +57,30 @@ outputs:
             dport:
               - 8080
               - 13808
+        swift::keystone::auth::tenant: 'service'
+        swift::keystone::auth::configure_s3_endpoint: false
+        swift::keystone::auth::operator_roles:
+          - admin
+          - swiftoperator
+          - ResellerAdmin
+        swift::proxy::keystone::operator_roles:
+          - admin
+          - swiftoperator
+          - ResellerAdmin
+        swift::proxy::pipeline:
+          - 'catch_errors'
+          - 'healthcheck'
+          - 'proxy-logging'
+          - 'cache'
+          - 'ratelimit'
+          - 'bulk'
+          - 'tempurl'
+          - 'formpost'
+          - 'authtoken'
+          - 'keystone'
+          - 'staticweb'
+          - 'proxy-logging'
+          - 'proxy-server'
+        swift::proxy::account_autocreate: true
       step_config: |
         include ::tripleo::profile::base::swift::proxy
-- 
cgit 1.2.3-korg