openstack/cookbook-openstack-common
Code Issues Proposed changes

Support neutron configuration

Browse Source 
After we have havana branch, I search and replace all the quantum with
neturon to support neutron configuraton.
The related patch on cookbook-openstack-network is:
https://review.openstack.org/#/c/58217/

Implemented: blueprint neutron-support

Change-Id: I0aa81b661eaa7d305d7a2645e349c893b3c849f4
This commit is contained in:
gengjh
2013-12-11 12:28:52 +08:00
parent 2201bd113f
commit 9a2948a924
2 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
attributes/default.rb
View File

@@ -169,11 +169,11 @@ default['openstack']['endpoints']['compute-novnc']['bind_interface'] = nil
# ******************** OpenStack Network Endpoints **************************** # ******************** OpenStack Network Endpoints ****************************
# The OpenStack Network (Quantum) API endpoint. # The OpenStack Network (Neutron) API endpoint.
default['openstack']['endpoints']['network-api']['host'] = "127.0.0.1" default['openstack']['endpoints']['network-api']['host'] = "127.0.0.1"
default['openstack']['endpoints']['network-api']['scheme'] = "http" default['openstack']['endpoints']['network-api']['scheme'] = "http"
default['openstack']['endpoints']['network-api']['port'] = "9696" default['openstack']['endpoints']['network-api']['port'] = "9696"
# quantumclient appends the protocol version to the endpoint URL, so the # neutronclient appends the protocol version to the endpoint URL, so the
# path needs to be empty # path needs to be empty
default['openstack']['endpoints']['network-api']['path'] = "" default['openstack']['endpoints']['network-api']['path'] = ""
default['openstack']['endpoints']['network-api']['bind_interface'] = nil default['openstack']['endpoints']['network-api']['bind_interface'] = nil
@@ -238,7 +238,7 @@ default['openstack']['endpoints']['metering-api']['bind_interface'] = nil
# The ::Openstack::db(<SERVICE_NAME>) library routine allows a lookup from any recipe # The ::Openstack::db(<SERVICE_NAME>) library routine allows a lookup from any recipe
# to this array, returning the host information for the server that contains # to this array, returning the host information for the server that contains
# the database for <SERVICE_NAME>, where <SERVICE_NAME> is one of 'compute' (Nova), # the database for <SERVICE_NAME>, where <SERVICE_NAME> is one of 'compute' (Nova),
# 'image' (Glance), 'identity' (Keystone), 'network' (Quantum), or 'volume' (Cinder) # 'image' (Glance), 'identity' (Keystone), 'network' (Neutron), or 'volume' (Cinder)
# #
# The ::Openstack::db_connection(<SERVICE_NAME>, <USER>, <PASSWORD>) library routine # The ::Openstack::db_connection(<SERVICE_NAME>, <USER>, <PASSWORD>) library routine
# returns the SQLAlchemy DB URI for <SERVICE_NAME>, with the supplied user and password # returns the SQLAlchemy DB URI for <SERVICE_NAME>, with the supplied user and password
@@ -291,11 +291,11 @@ default['openstack']['db']['image']['host'] = "127.0.0.1"
default['openstack']['db']['image']['port'] = node['openstack']['db']['port'] default['openstack']['db']['image']['port'] = node['openstack']['db']['port']
default['openstack']['db']['image']['db_name'] = "glance" default['openstack']['db']['image']['db_name'] = "glance"
# Database used by the OpenStack Network (Quantum) service # Database used by the OpenStack Network (Neutron) service
default['openstack']['db']['network']['db_type'] = node['openstack']['db']['service_type'] default['openstack']['db']['network']['db_type'] = node['openstack']['db']['service_type']
default['openstack']['db']['network']['host'] = "127.0.0.1" default['openstack']['db']['network']['host'] = "127.0.0.1"
default['openstack']['db']['network']['port'] = node['openstack']['db']['port'] default['openstack']['db']['network']['port'] = node['openstack']['db']['port']
default['openstack']['db']['network']['db_name'] = "quantum" default['openstack']['db']['network']['db_name'] = "neutron"
# Database used by the OpenStack Volume (Cinder) service # Database used by the OpenStack Volume (Cinder) service
default['openstack']['db']['volume']['db_type'] = node['openstack']['db']['service_type'] default['openstack']['db']['volume']['db_type'] = node['openstack']['db']['service_type']

6
templates/default/logging.conf.erb
View File

@@ -1,5 +1,5 @@
[loggers] [loggers]
keys=root,ceilometer,cinder,glance,horizon,keystone,nova,quantum,swift,amqplib,sqlalchemy,boto,suds,eventletwsgi,<%= node["openstack"]["logging"]["ignore"].map{|k,v| k.gsub(/\W/, '_')}.join(',') %> keys=root,ceilometer,cinder,glance,horizon,keystone,nova,neutron,swift,amqplib,sqlalchemy,boto,suds,eventletwsgi,<%= node["openstack"]["logging"]["ignore"].map{|k,v| k.gsub(/\W/, '_')}.join(',') %>
[formatters] [formatters]
keys=normal,normal_with_name,debug,syslog_with_name,syslog_debug keys=normal,normal_with_name,debug,syslog_with_name,syslog_debug
@@ -95,10 +95,10 @@ level=DEBUG
handlers=prod,debug handlers=prod,debug
qualname=nova qualname=nova
[logger_quantum] [logger_neutron]
level=DEBUG level=DEBUG
handlers=prod,debug handlers=prod,debug
qualname=quantum qualname=neutron
[logger_swift] [logger_swift]
level=DEBUG level=DEBUG