Skip to content

Commit

Permalink
Change keystone_default_role to _member_
Browse files Browse the repository at this point in the history
Previously both Member & _member_ roles were created, which lead to
confision.
Member role is not created anymore as of [1].

[1] https://review.openstack.org/#q,If4ed1c2c72ca67acad7b70651e68ff7ce68157dd,n,z

Change-Id: I933236c2c257b65a1027da07a760c8b4d10618cc
(cherry picked from commit 45a60830d80172814d3b44c26d26566d922f0b2d)
  • Loading branch information
fcharlier committed Jan 7, 2014
1 parent 54b6ac7 commit 07a2a0b
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 3 deletions.
4 changes: 2 additions & 2 deletions manifests/init.pp
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@
# (optional) Scheme of the Keystone service. Defaults to 'http'.
#
# [*keystone_default_role*]
# (optional) Default Keystone role for new users. Defaults to 'Member'.
# (optional) Default Keystone role for new users. Defaults to '_member_'.
#
# [*django_debug*]
# (optional) Enable or disable Django debugging. Defaults to 'False'.
Expand Down Expand Up @@ -77,7 +77,7 @@
$keystone_host = '127.0.0.1',
$keystone_port = 5000,
$keystone_scheme = 'http',
$keystone_default_role = 'Member',
$keystone_default_role = '_member_',
$django_debug = 'False',
$api_result_limit = 1000,
$log_level = 'DEBUG',
Expand Down
2 changes: 1 addition & 1 deletion spec/classes/horizon_init_spec.rb
Original file line number Diff line number Diff line change
Expand Up @@ -79,7 +79,7 @@
"SECRET_KEY = 'elj1IWiLoWHgcyYxFVLj7cM5rGOOxWl0'",
'OPENSTACK_HOST = "127.0.0.1"',
'OPENSTACK_KEYSTONE_URL = "http://%s:5000/v2.0" % OPENSTACK_HOST',
'OPENSTACK_KEYSTONE_DEFAULT_ROLE = "Member"',
'OPENSTACK_KEYSTONE_DEFAULT_ROLE = "_member_"',
" 'can_set_mount_point': True,",
'API_RESULT_LIMIT = 1000',
"LOGIN_URL = '/horizon/auth/login/'",
Expand Down

0 comments on commit 07a2a0b

Please sign in to comment.