Update attributes to be rubocop compliant

- Update .rubocop.yml file to correctly check attributes
- Update attributes/default.rb to be rubocop compliant

Addresses: blueprint rubocop-for-network
Change-Id: I04ff5003d0e916369d58b05d19a6f16252f3604b
This commit is contained in:
Andy McCrae 2014-01-28 15:50:41 +00:00
parent dc58cbe2a8
commit 7d94a7989a
2 changed files with 34 additions and 29 deletions

View File

@ -2,19 +2,24 @@ AllCops:
Includes:
- Gemfile
- metadata.rb
- attributes/**
Excludes:
- files/**
- recipes/**
- spec/**
- templates/**
# UTF-8 headers not generally in these files
Encoding:
Enabled: false
Exclude:
- metadata.rb
- Gemfile
# ignore long lines
LineLength:
Enabled: false
# ignore long methods
MethodLength:
Enabled: false
# ignore word arrays
WordArray:
Enabled: false
MinSize: 3

View File

@ -1,4 +1,4 @@
# Encoding: utf-8
# encoding: UTF-8
#
# Cookbook Name:: openstack-network
# Attributes:: default
@ -20,10 +20,10 @@
# Set to some text value if you want templated config files
# to contain a custom banner at the top of the written file
default['openstack']['network']['custom_template_banner'] = "
default['openstack']['network']['custom_template_banner'] = '
# This file autogenerated by Chef
# Do not edit, changes will be overwritten
"
'
default['openstack']['network']['verbose'] = 'False'
default['openstack']['network']['debug'] = 'False'
@ -342,8 +342,8 @@ default['openstack']['network']['lbaas_config_path'] = '/etc/neutron/plugins/ser
default['openstack']['network']['lbaas']['periodic_interval'] = 10
# Set lbaas plugin
# Supported types are: "ovs" (ovs based plugins(OVS, Ryu, NEC, NVP, BigSwitch/Floodlight))
# and "linuxbridge".
# Supported types are: 'ovs' (ovs based plugins(OVS, Ryu, NEC, NVP, BigSwitch/Floodlight))
# and 'linuxbridge'.
default['openstack']['network']['lbaas_plugin'] = 'ovs'
# ============================= OVS Plugin Configuration ===================
@ -380,8 +380,8 @@ default['openstack']['network']['openvswitch']['tunnel_id_ranges'] = nil
# Do not change this parameter unless you have a good reason to.
# This is the name of the OVS integration bridge. There is one per hypervisor.
# The integration bridge acts as a virtual "patch bay". All VM VIFs are
# attached to this bridge and then "patched" according to their network
# The integration bridge acts as a virtual 'patch bay'. All VM VIFs are
# attached to this bridge and then 'patched' according to their network
# connectivity
default['openstack']['network']['openvswitch']['integration_bridge'] = 'br-int'
@ -552,7 +552,7 @@ default['openstack']['network']['cisco']['manager_class'] = 'neutron.plugins.cis
default['openstack']['network']['cisco']['nexus_driver'] = 'neutron.plugins.cisco.tests.unit.v2.nexus.fake_nexus_driver.CiscoNEXUSFakeDriver'
# For each Nexus switch, add a hash to the
# node["openstack"]["network"]["cisco"]["nexus_switches"] Hash,
# node['openstack']['network']['cisco']['nexus_switches'] Hash,
# using the switch's IP address as the outer Hash key with each
# hash containing this information:
#
@ -563,11 +563,11 @@ default['openstack']['network']['cisco']['nexus_driver'] = 'neutron.plugins.cisc
#
# Example:
#
# node["openstack"]["network"]["cisco"]["nexus_switches"]["1.1.1.1"]["ssh_port"] = 22
# node["openstack"]["network"]["cisco"]["nexus_switches"]["1.1.1.1"]["username"] = "admin"
# node["openstack"]["network"]["cisco"]["nexus_switches"]["1.1.1.1"]["password"] = "mySecretPassword"
# node["openstack"]["network"]["cisco"]["nexus_switches"]["1.1.1.1"]["hosts"] = [ [ "compute1", "1/1" ],
# [ "compute2", "1/2" ]]
# node['openstack']['network']['cisco']['nexus_switches']['1.1.1.1']['ssh_port'] = 22
# node['openstack']['network']['cisco']['nexus_switches']['1.1.1.1']['username'] = 'admin'
# node['openstack']['network']['cisco']['nexus_switches']['1.1.1.1']['password'] = 'mySecretPassword'
# node['openstack']['network']['cisco']['nexus_switches']['1.1.1.1']['hosts'] = [ [ 'compute1', '1/1' ],
# [ 'compute2', '1/2' ]]
#
#
# will write the following to the Cisco plugin config INI file:
@ -605,7 +605,7 @@ default['openstack']['network']['hyperv']['polling_interval'] = 2
# (ListOpt) Comma separated list of <physical_network>:<vswitch>
# where the physical networks can be expressed with wildcards,
# e.g.: ."*:external".
# e.g.: .'*:external'.
# The referred external virtual switches need to be already present on
# the Hyper-V server.
# If a given physical network name will not match any value in the list
@ -628,7 +628,7 @@ default['openstack']['network']['hyperv']['local_network_vswitch'] = 'private'
default['openstack']['network']['metaplugin']['plugin_list'] = 'openvswitch:neutron.plugins.openvswitch.ovs_neutron_plugin.OVSNeutronPluginV2,linuxbridge:neutron.plugins.linuxbridge.lb_neutron_plugin.LinuxBridgePluginV2'
default['openstack']['network']['metaplugin']['l3_plugin_list'] = 'openvswitch:neutron.plugins.openvswitch.ovs_neutron_plugin.OVSNeutronPluginV2,linuxbridge:neutron.plugins.linuxbridge.lb_neutron_plugin.LinuxBridgePluginV2'
# Default "flavor" for L2 and L3
# Default 'flavor' for L2 and L3
default['openstack']['network']['metaplugin']['default_flavor'] = 'openvswitch'
default['openstack']['network']['metaplugin']['default_l3_flavor'] = 'openvswitch'
@ -656,8 +656,8 @@ default['openstack']['network']['midonet']['metadata_router_id'] = 'ffeeddcc-ffe
# Do not change this parameter unless you have a good reason to.
# This is the name of the OVS integration bridge. There is one per hypervisor.
# The integration bridge acts as a virtual "patch port". All VM VIFs are
# attached to this bridge and then "patched" according to their network
# The integration bridge acts as a virtual 'patch port'. All VM VIFs are
# attached to this bridge and then 'patched' according to their network
# connectivity.
default['openstack']['network']['nec']['integration_bridge'] = 'br-int'
@ -704,11 +704,11 @@ default['openstack']['network']['nicira']['redirects'] = 2
default['openstack']['network']['nicira']['nvp_controllers'] = 'xx.yy.zz.ww:443, aa.bb.cc.dd, ee.ff.gg.hh.ee:80'
# UUID of the pre-existing default NVP Transport zone to be used for creating
# tunneled isolated "Neutron" networks. This option MUST be specified, e.g.:
# tunneled isolated 'Neutron' networks. This option MUST be specified, e.g.:
default['openstack']['network']['nicira']['default_tz_uuid'] = '1e8e52cf-fa7f-46b0-a14a-f99835a9cb53'
# (Optional) UUID of the cluster in NVP. It can be retrieved from NVP management
# console "admin" section.
# console 'admin' section.
default['openstack']['network']['nicira']['nvp_cluster_uuid'] = '615be8e4-82e9-4fd2-b4b3-fd141e51a5a7'
# (Optional) UUID for the default l3 gateway service to use with this cluster.
@ -766,8 +766,8 @@ default['openstack']['network']['plumgrid']['topologyname'] = '<nos-topology-nam
# Do not change this parameter unless you have a good reason to.
# This is the name of the OVS integration bridge. There is one per hypervisor.
# The integration bridge acts as a virtual "patch port". All VM VIFs are
# attached to this bridge and then "patched" according to their network
# The integration bridge acts as a virtual 'patch port'. All VM VIFs are
# attached to this bridge and then 'patched' according to their network
# connectivity.
default['openstack']['network']['ryu']['integration_bridge'] = 'br-int'
@ -875,10 +875,10 @@ when 'ubuntu'
'neutron_packages' => ['neutron-common', 'python-pyparsing', 'python-cliff'],
'neutron_client_packages' => ['python-neutronclient', 'python-pyparsing'],
'neutron_dhcp_packages' => ['neutron-dhcp-agent'],
'neutron_dhcp_build_packages' => ['build-essential', 'pkg-config', 'libidn11-dev', 'libdbus-1-dev', 'libnetfilter-conntrack-dev', 'gettext'],
'neutron_dhcp_build_packages' => %w(build-essential pkg-config libidn11-dev libdbus-1-dev libnetfilter-conntrack-dev gettext),
'neutron_l3_packages' => ['neutron-l3-agent'],
'neutron_openvswitch_packages' => ['openvswitch-switch', 'openvswitch-datapath-dkms', 'bridge-utils'],
'neutron_openvswitch_build_packages' => ['build-essential', 'pkg-config', 'fakeroot', 'libssl-dev', 'openssl', 'debhelper', 'autoconf', 'dkms', 'python-all', 'python-qt4', 'python-zopeinterface', 'python-twisted-conch'],
'neutron_openvswitch_build_packages' => %w(build-essential pkg-config fakeroot libssl-dev openssl debhelper autoconf dkms python-all python-qt4 python-zopeinterface python-twisted-conch),
'neutron_openvswitch_agent_packages' => ['neutron-plugin-openvswitch', 'neutron-plugin-openvswitch-agent'],
'neutron_linuxbridge_agent_packages' => ['neutron-plugin-linuxbridge', 'neutron-plugin-linuxbridge-agent'],
'neutron_metadata_agent_packages' => ['neutron-metadata-agent'],