Update recipes to be rubocop compliant

- Adjust .rubocop.yml to include recipes/**
- Complete rubocop compliancy for recipes/*.rb

Change-Id: Id5b5ac26f74046085e3f07d1696189061a03ee2e
Addresses: blueprint rubocop-for-network
This commit is contained in:
Andy McCrae 2014-01-29 10:07:37 +00:00
parent 81339969f5
commit 11d31927bd
4 changed files with 5 additions and 5 deletions

View File

@ -4,10 +4,10 @@ AllCops:
- metadata.rb
- attributes/**
- spec/**
- recipes/**
Excludes:
- files/**
- recipes/**
- templates/**
# UTF-8 headers not generally in these files

View File

@ -107,11 +107,11 @@ identity_admin_endpoint = endpoint 'identity-admin'
auth_uri = ::URI.decode identity_endpoint.to_s
db_user = node['openstack']['db']['network']['username']
db_pass = get_password "db", 'neutron'
db_pass = get_password 'db', 'neutron'
sql_connection = db_uri('network', db_user, db_pass)
api_endpoint = endpoint 'network-api'
service_pass = get_password "service", 'openstack-network'
service_pass = get_password 'service', 'openstack-network'
if node['openstack']['network']['api']['bind_interface'].nil?
bind_address = api_endpoint.host

View File

@ -57,7 +57,7 @@ template '/etc/neutron/l3_agent.ini' do
notifies :restart, 'service[neutron-l3-agent]', :immediately
end
unless ['nicira', 'plumgrid', 'bigswitch', 'linuxbridge'].include?(main_plugin)
unless %w(nicira plumgrid bigswitch linuxbridge).include?(main_plugin)
# See http://docs.openstack.org/trunk/openstack-network/admin/content/install_neutron-l3.html
ext_bridge = node['openstack']['network']['l3']['external_network_bridge']
ext_bridge_iface = node['openstack']['network']['l3']['external_network_bridge_interface']

View File

@ -43,7 +43,7 @@ end
# Migrate network database
# If the database has never migrated, make the current version of alembic_version to havana,
# else migrate the database to latest version.
bash "migrate network database" do
bash 'migrate network database' do
plugin_config_file = node['openstack']['network']['plugin_config_file']
migrate_command = "neutron-db-manage --config-file /etc/neutron/neutron.conf --config-file #{plugin_config_file}"
code <<-EOF