Renamed common.rb to default.rb

Renamed the common.rb recipe to default.rb in an early attempt
to simplify the refactor happening here:
https://review.openstack.org/#/c/141459/

Change-Id: Idd904f80cd51711db456606298e9761452bed23d

CHANGELOG.md

@@ -20,6 +20,7 @@ This file is used to list changes made in each version of cookbook-openstack-net
 * Fix an error from restarting the metadata agent before installing the package.
 * Remove route lwrp in favor of standard exec to set external physical interface to up (only for OVS)
 * Added the update to iproute, because of the required support for ip netns
+* Renamed common recipe to default
 
 ## 10.0.1
 * Add tunnel_types item in ovs_neutron_plugin.ini.erb

recipes/balancer.rb

@@ -23,7 +23,7 @@
 
 ['quantum', 'neutron'].include?(node['openstack']['compute']['network']['service_type']) || return
 
-include_recipe 'openstack-network::common'
+include_recipe 'openstack-network'
 
 platform_options = node['openstack']['network']['platform']
 

recipes/bigswitch.rb

@@ -20,4 +20,4 @@
 
 ['quantum', 'neutron'].include?(node['openstack']['compute']['network']['service_type']) || return
 
-include_recipe 'openstack-network::common'
+include_recipe 'openstack-network'

recipes/brocade.rb

@@ -20,4 +20,4 @@
 
 ['quantum', 'neutron'].include?(node['openstack']['compute']['network']['service_type']) || return
 
-include_recipe 'openstack-network::common'
+include_recipe 'openstack-network'

recipes/cisco.rb

@@ -20,4 +20,4 @@
 
 ['quantum', 'neutron'].include?(node['openstack']['compute']['network']['service_type']) || return
 
-include_recipe 'openstack-network::common'
+include_recipe 'openstack-network'

recipes/default.rb

@@ -1,7 +1,7 @@
 # Encoding: utf-8
 #
 # Cookbook Name:: openstack-network
-# Recipe:: common
+# Recipe:: default
 #
 # Copyright 2013, AT&T
 # Copyright 2013-2014, SUSE Linux GmbH
@@ -136,7 +136,7 @@ platform_options['neutron_client_packages'].each do |pkg|
   end
 end
 
-# all recipes include common.rb, and some servers
+# all recipes include default.rb, and some servers
 # may just be running a subset of agents (like l3_agent)
 # and not the api server components, so we ignore restart
 # failures here as there may be no neutron-server process

recipes/dhcp_agent.rb

@@ -20,7 +20,7 @@
 
 ['quantum', 'neutron'].include?(node['openstack']['compute']['network']['service_type']) || return
 
-include_recipe 'openstack-network::common'
+include_recipe 'openstack-network'
 
 platform_options = node['openstack']['network']['platform']
 core_plugin = node['openstack']['network']['core_plugin']

recipes/hyperv.rb

@@ -20,4 +20,4 @@
 
 ['quantum', 'neutron'].include?(node['openstack']['compute']['network']['service_type']) || return
 
-include_recipe 'openstack-network::common'
+include_recipe 'openstack-network'

recipes/l3_agent.rb

@@ -20,7 +20,7 @@
 
 ['quantum', 'neutron'].include?(node['openstack']['compute']['network']['service_type']) || return
 
-include_recipe 'openstack-network::common'
+include_recipe 'openstack-network'
 
 ruby_block 'query gateway external network uuid' do
   block do

recipes/linuxbridge.rb

@@ -20,7 +20,7 @@
 
 ['quantum', 'neutron'].include?(node['openstack']['compute']['network']['service_type']) || return
 
-include_recipe 'openstack-network::common'
+include_recipe 'openstack-network'
 
 platform_options = node['openstack']['network']['platform']
 

recipes/metadata_agent.rb

@@ -20,7 +20,7 @@
 
 ['quantum', 'neutron'].include?(node['openstack']['compute']['network']['service_type']) || return
 
-include_recipe 'openstack-network::common'
+include_recipe 'openstack-network'
 
 platform_options = node['openstack']['network']['platform']
 

recipes/metaplugin.rb

@@ -20,4 +20,4 @@
 
 ['quantum', 'neutron'].include?(node['openstack']['compute']['network']['service_type']) || return
 
-include_recipe 'openstack-network::common'
+include_recipe 'openstack-network'

recipes/midonet.rb

@@ -20,4 +20,4 @@
 
 ['quantum', 'neutron'].include?(node['openstack']['compute']['network']['service_type']) || return
 
-include_recipe 'openstack-network::common'
+include_recipe 'openstack-network'

recipes/nec.rb

@@ -20,4 +20,4 @@
 
 ['quantum', 'neutron'].include?(node['openstack']['compute']['network']['service_type']) || return
 
-include_recipe 'openstack-network::common'
+include_recipe 'openstack-network'

recipes/nicira.rb

@@ -20,4 +20,4 @@
 
 ['quantum', 'neutron'].include?(node['openstack']['compute']['network']['service_type']) || return
 
-include_recipe 'openstack-network::common'
+include_recipe 'openstack-network'

recipes/openvswitch.rb

@@ -27,7 +27,7 @@ class ::Chef::Recipe
   include ::Openstack
 end
 
-include_recipe 'openstack-network::common'
+include_recipe 'openstack-network'
 
 platform_options = node['openstack']['network']['platform']
 core_plugin = node['openstack']['network']['core_plugin']

recipes/plumgrid.rb

@@ -20,4 +20,4 @@
 
 ['quantum', 'neutron'].include?(node['openstack']['compute']['network']['service_type']) || return
 
-include_recipe 'openstack-network::common'
+include_recipe 'openstack-network'

recipes/ryu.rb

@@ -20,4 +20,4 @@
 
 ['quantum', 'neutron'].include?(node['openstack']['compute']['network']['service_type']) || return
 
-include_recipe 'openstack-network::common'
+include_recipe 'openstack-network'

recipes/server.rb

@@ -26,7 +26,7 @@ class ::Chef::Recipe
   include ::Openstack
 end
 
-include_recipe 'openstack-network::common'
+include_recipe 'openstack-network'
 
 platform_options = node['openstack']['network']['platform']
 core_plugin = node['openstack']['network']['core_plugin']
@@ -39,7 +39,7 @@ platform_options['neutron_server_packages'].each do |pkg|
 end
 
 # Migrate network database to latest version
-# The node['openstack']['network']['plugin_config_file'] attribute is set in the common.rb recipe
+# The node['openstack']['network']['plugin_config_file'] attribute is set in the default.rb recipe
 
 bash 'migrate network database' do
   plugin_config_file = node['openstack']['network']['plugin_config_file']

spec/default-redhat_spec.rb

@@ -1,7 +1,7 @@
 # Encoding: utf-8
 require_relative 'spec_helper'
 
-describe 'openstack-network::common' do
+describe 'openstack-network' do
   describe 'redhat' do
     let(:runner) { ChefSpec::Runner.new(REDHAT_OPTS) }
     let(:node) { runner.node }

spec/default_spec.rb

@@ -36,7 +36,7 @@ shared_examples 'core plugin common configurator' do |plugin_name, file_name, at
   end
 end
 
-describe 'openstack-network::common' do
+describe 'openstack-network' do
   describe 'ubuntu' do
     let(:runner) { ChefSpec::Runner.new(UBUNTU_OPTS) }
     let(:node) { runner.node }

spec/dhcp_agent_spec.rb

@@ -15,7 +15,7 @@ describe 'openstack-network::dhcp_agent' do
     it 'does not include recipe openstack-network::comon when nova networking' do
       node.override['openstack']['compute']['network']['service_type'] = 'nova'
 
-      expect(chef_run).to_not include_recipe('openstack-network::common')
+      expect(chef_run).to_not include_recipe('openstack-network')
     end
 
     it 'subscribes the agent service to neutron.conf' do