openstack
/
cookbook-openstack-identity
Code Issues Proposed changes

Remove dup identity port attributes 

The service and admin ports are now defined in common.

Change-Id: I37ab6b26c4765c9c0b75d3bbc6fc38d36580dbb6
Closes-Bug: 1281108
This commit is contained in:
Mark Vanderwiel 2014-03-17 16:11:51 -05:00
parent 3ed8970f7f
commit 8f9e0fb8e1
5 changed files with 8 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
CHANGELOG.md
View File

@ -2,6 +2,9 @@
This file is used to list changes made in each version of cookbook-openstack-identity.
## 8.1.3
* Remove duplicate service and admin ports attributes that are in Common LP1281108
## 8.1.2
### Bug
* Fix the DB2 ODBC driver issue

6
README.md
View File

@ -232,9 +232,9 @@ Create EC2 credentials for a given user in the specified tenant
Attributes
==========
Please refer to the Common cookbook for more attributes.
* `openstack['identity']['db_server_chef_role']` - The name of the Chef role that knows about the db server
* `openstack['identity']['service_port']` - Port to listen on for client functions
* `openstack['identity']['admin_port']` - Port to listen on for admin functions
* `openstack['identity']['user']` - User keystone runs as
* `openstack['identity']['group']` - Group keystone runs as
* `openstack['identity']['db']` - Name of keystone database
@ -244,8 +244,6 @@ Attributes
* `openstack['identity']['api_ipaddress']` - IP address for the keystone API to bind to. _TODO_: Rename to bind_address
* `openstack['identity']['verbose']` - Enables/disables verbose output for keystone API server
* `openstack['identity']['debug']` - Enables/disables debug output for keystone API server
* `openstack['identity']['service_port']` - Port for the keystone service API to bind to
* `openstack['identity']['admin_port']` - Port for the keystone admin service to bind to
* `openstack['identity']['admin_token']` - Admin token for bootstraping keystone server
* `openstack['identity']['roles']` - Array of roles to create in the keystone server
* `openstack['identity']['users']` - Array of users to create in the keystone server

2
attributes/default.rb
View File

@ -35,8 +35,6 @@ default['credentials']['EC2']['admin']['secret'] = ''
default['openstack']['identity']['verbose'] = 'False'
default['openstack']['identity']['debug'] = 'False'
default['openstack']['identity']['service_port'] = '5000'
default['openstack']['identity']['admin_port'] = '35357'
default['openstack']['identity']['region'] = node['openstack']['region']
default['openstack']['identity']['token']['expiration'] = '86400'

2
metadata.rb
View File

@ -4,7 +4,7 @@ maintainer_email 'matt@opscode.com'
license 'Apache 2.0'
description 'The OpenStack Identity service Keystone.'
long_description IO.read(File.join(File.dirname(__FILE__), 'README.md'))
version '8.1.2'
version '8.1.3'
recipe 'openstack-identity::client', 'Install packages required for keystone client'
recipe 'openstack-identity::server', 'Installs and Configures Keystone Service'

4
templates/default/keystone.conf.erb
View File

@ -1,8 +1,8 @@
<%= node["openstack"]["identity"]["custom_template_banner"] %>
[DEFAULT]
public_port = <%= node["openstack"]["identity"]["service_port"] %>
admin_port = <%= node["openstack"]["identity"]["admin_port"] %>
public_port = <%= node['openstack']['endpoints']['identity-api']['port'] %>
admin_port = <%= node['openstack']['endpoints']['identity-admin']['port'] %>
admin_token = <%= @bootstrap_token %>
bind_host = <%= @bind_address %>
compute_port = 8774