openstack/cookbook-openstack-network
Code Issues Proposed changes

Remove dup attribute entries

Browse Source 
The service_user and service_role attributes were dupped

Change-Id: Iccdcf14512d02767ae8afe3f5bec7bb2548f48ca
This commit is contained in:
Mark Vanderwiel
2015-04-15 08:41:55 -05:00
parent 3babcc56c9
commit 00997b93eb
1 changed files with 2 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
attributes/default.rb
View File

@@ -42,18 +42,14 @@ default['openstack']['network']['policyfile_url'] = nil
# Gets set in the Network Endpoint when registering with Keystone # Gets set in the Network Endpoint when registering with Keystone
default['openstack']['network']['region'] = node['openstack']['region'] default['openstack']['network']['region'] = node['openstack']['region']
default['openstack']['network']['service_user'] = 'neutron' default['openstack']['network']['service_user'] = 'neutron'
default['openstack']['network']['service_role'] = 'admin' default['openstack']['network']['service_role'] = 'service'
default['openstack']['network']['service_name'] = 'neutron' default['openstack']['network']['service_name'] = 'neutron'
default['openstack']['network']['service_type'] = 'network' default['openstack']['network']['service_type'] = 'network'
default['openstack']['network']['service_tenant_name'] = 'service'
default['openstack']['network']['description'] = 'OpenStack Networking service' default['openstack']['network']['description'] = 'OpenStack Networking service'
default['openstack']['network']['rabbit_server_chef_role'] = 'rabbitmq-server' default['openstack']['network']['rabbit_server_chef_role'] = 'rabbitmq-server'
# Used in the Keystone authtoken middleware configuration
default['openstack']['network']['service_tenant_name'] = 'service'
default['openstack']['network']['service_user'] = 'neutron'
default['openstack']['network']['service_role'] = 'service'
# Number of separate worker processes to spawn. The default, 0, runs the # Number of separate worker processes to spawn. The default, 0, runs the
# worker thread in the current process. Greater than 0 launches that number of # worker thread in the current process. Greater than 0 launches that number of
# child processes as workers. The parent process manages them. # child processes as workers. The parent process manages them.