Skip to content

Commit bfa883d

Browse files
committed
Merge pull request #10 from nickbales/expanding_client_auth
Expanding client auth
2 parents 641935c + 963b5fe commit bfa883d

File tree

4 files changed

+8
-3
lines changed

4 files changed

+8
-3
lines changed

ModuleFile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
name 'citops-repose'
2-
version '1.0.7'
2+
version '1.0.8'
33
description "Repose is an api middleware that provides authentication,
44
filtering, ratelimitting and several other features, this deploys it."
55
project_page 'https://github.com/rackerlabs/puppet-repose'

manifests/filter/client_auth_n.pp

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,10 @@
3232
# Bool.
3333
# Defaults to <tt>false</tt>
3434
#
35+
# [*request_groups*]
36+
# String containing values 'true' or 'false'
37+
# If undef, defaults to 'true'
38+
#
3539
# [*group_cache_timeout*]
3640
# Integer as String.
3741
# Defaults to <tt>60000</tt>
@@ -74,6 +78,7 @@
7478
$ignore_tenant_roles = undef,
7579
$delegable = false,
7680
$tenanted = false,
81+
$request_groups = undef,
7782
$token_cache_timeout = undef,
7883
$group_cache_timeout = '60000',
7984
$connection_pool_id = undef,

puppet-module-repose.spec

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
%define base_name repose
22

33
Name: puppet-module-%{base_name}
4-
Version: 1.0.7
4+
Version: 1.0.8
55
Release: 1
66
BuildArch: noarch
77
Summary: Puppet module to configure %{base_name}

templates/client-auth-n.cfg.xml.erb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22

33
<client-auth xmlns="http://docs.rackspacecloud.com/repose/client-auth/v1.0">
4-
<openstack-auth delegable="<%= @delegable %>" tenanted="<%= @tenanted %>" group-cache-timeout="<%= @group_cache_timeout %>" <% if @connection_pool_id %>connectionPoolId="<%= @connection_pool_id %>"<% end %> <% if @token_cache_timeout %>token-cache-timeout="<%= @token_cache_timeout %>"<% end %> xmlns="http://docs.openrepose.org/repose/client-auth/os-ids-auth/v1.0">
4+
<openstack-auth delegable="<%= @delegable %>" tenanted="<%= @tenanted %>" group-cache-timeout="<%= @group_cache_timeout %>" <% if @connection_pool_id %>connectionPoolId="<%= @connection_pool_id %>"<% end %> <% if @token_cache_timeout %>token-cache-timeout="<%= @token_cache_timeout %>"<% end %> <% if @request_groups %>request-groups="<%= @request_groups %>"<% end %> xmlns="http://docs.openrepose.org/repose/client-auth/os-ids-auth/v1.0">
55
<identity-service username="<%= @auth['user'] -%>" password="<%= @auth['pass'] -%>" uri="<%= @auth['uri'] -%>" />
66
<%- if @client_maps -%>
77
<% @client_maps.each do |client_map| -%>

0 commit comments

Comments
 (0)