Update neutron to e2fb846dfe814be80fa2219ff5744a5818c31d96

e2fb846dfe814be80fa2219ff5744a5818c31d96 Merge "Allow customization of dhcp_domain setting from agents/dhcp.pp"
eb496c6bbef4afcd55b2f72edbe624d32bc404d2 Release 5.1.0 - Juno
12bace6b7c93a52c12b0eeeadb81e89616bf46bd Merge "Introduce public_url, internal_url and admin_url"
ccac02b91760d4ad81b53b26a46ec954a0d7f05f Make tests pass on Puppet 4.x
e0b04137d95df9e6a32a86dd791b1e3705a317c1 Sync up module with latest msync commit.
f03bfe784079dfcf26e3b7c7fb779dbe61f0bb8f Merge "Drop OVS & LB monolitic plugins"
3426ab56a245e15da57def1f3d344ab8e3a0d96a Merge "Create file /etc/default/neutron-server"
e1e974771d24a0a02469a22f52e944f568c34e4d Merge "Update spec_helper_acceptance for project renames"
5044f27823561cc88b2a4bf3ac53e079dbb7c9b4 Allow customization of dhcp_domain setting from agents/dhcp.pp
7f72df2bc96f9d43e1c9ee2154f30ae2822111d0 Update spec_helper_acceptance for project renames
55930cd62463ef76f4265a003b410e1c69bdfce7 Create file /etc/default/neutron-server
3d9dfd7ade84f727de00203756d5f0bbc7e6d407 Introduce public_url, internal_url and admin_url
926ee10c20823fae2491d50e5ede7934371176ba Drop OVS & LB monolitic plugins

Change-Id: Ibc8ba947579f6d79a9e6401b06871410184fa576

Puppetfile

@@ -119,7 +119,7 @@ mod 'nagios',
   :git => 'https://github.com/gildub/puppet-nagios-openstack.git'
 
 mod 'neutron',
-  :commit => '910afc6d768a32f36462c3cdc77fe8cd43166b81',
+  :commit => 'e2fb846dfe814be80fa2219ff5744a5818c31d96',
   :git => 'https://github.com/openstack/puppet-neutron.git'
 
 mod 'nova',

neutron/.gitignore

@@ -1,7 +1,10 @@
-*.swp
-spec/fixtures/modules/*
-spec/fixtures/manifests/site.pp
+pkg/
 Gemfile.lock
-.vendor
-.bundle/
 vendor/
+spec/fixtures/
+.vagrant/
+.bundle/
+coverage/
+.idea/
+*.swp
+*.iml

neutron/Gemfile

@@ -1,23 +1,29 @@
-source 'https://rubygems.org'
+source ENV['GEM_SOURCE'] || "https://rubygems.org"
 
 group :development, :test do
-  gem 'puppetlabs_spec_helper', :require => false
-  gem 'rspec-puppet', '~> 2.1.0', :require => false
-
-  gem 'metadata-json-lint'
-  gem 'puppet-lint-absolute_classname-check'
-  gem 'puppet-lint-absolute_template_path'
-  gem 'puppet-lint-trailing_newline-check'
+  gem 'puppetlabs_spec_helper',               :require => 'false'
+  gem 'rspec-puppet', '~> 2.2.0',             :require => 'false'
+  gem 'metadata-json-lint',                   :require => 'false'
+  gem 'puppet-lint-param-docs',               :require => 'false'
+  gem 'puppet-lint-absolute_classname-check', :require => 'false'
+  gem 'puppet-lint-absolute_template_path',   :require => 'false'
+  gem 'puppet-lint-trailing_newline-check',   :require => 'false'
+  gem 'puppet-lint-unquoted_string-check',    :require => 'false'
+  gem 'puppet-lint-leading_zero-check',       :require => 'false'
+  gem 'puppet-lint-variable_contains_upcase', :require => 'false'
+  gem 'puppet-lint-numericvariable',          :require => 'false'
+  gem 'json',                                 :require => 'false'
+  gem 'webmock',                              :require => 'false'
+end
 
-  # Puppet 4.x related lint checks
-  gem 'puppet-lint-unquoted_string-check'
-  gem 'puppet-lint-leading_zero-check'
-  gem 'puppet-lint-variable_contains_upcase'
-  gem 'puppet-lint-numericvariable'
+group :system_tests do
+  gem 'beaker-rspec', :require => 'false'
+end
 
-  gem 'beaker-rspec', :require => false
-  gem 'json'
-  gem 'webmock'
+if facterversion = ENV['FACTER_GEM_VERSION']
+  gem 'facter', facterversion, :require => false
+else
+  gem 'facter', :require => false
 end
 
 if puppetversion = ENV['PUPPET_GEM_VERSION']

neutron/README.md

@@ -1,7 +1,7 @@
 neutron
 ===================================
 
-5.0.0 - 2014.2.0 - Juno
+5.1.0 - 2014.2 - Juno
 
 #### Table of Contents
 
@@ -60,10 +60,13 @@ class { 'neutron::server':
     sql_connection  => 'mysql://neutron:[email protected]/neutron?charset=utf8',
 }
 
-# enable the Open VSwitch plugin server
-class { 'neutron::plugins::ovs':
-    tenant_network_type => 'gre',
-    network_vlan_ranges => 'physnet:1000:2000',
+# ml2 plugin with vxlan as ml2 driver and ovs as mechanism driver
+class { '::neutron::plugins::ml2':
+  type_drivers         => ['vxlan'],
+  tenant_network_types => ['vxlan'],
+  vxlan_group          => '239.1.1.1',
+  mechanism_drivers    => ['openvswitch'],
+  vni_ranges           => ['0:300']
 }
 ```
 
@@ -98,9 +101,11 @@ Limitations
 
 This module supports the following neutron plugins:
 
-* Open vSwitch
-* linuxbridge
-* cisco-neutron
+* Open vSwitch with ML2
+* linuxbridge with ML2
+* cisco-neutron with and without ML2
+* NVP
+* PLUMgrid
 
 The following platforms are supported:
 
@@ -135,6 +140,33 @@ The github [contributor graph](https://github.com/stackforge/puppet-neutron/grap
 Release Notes
 -------------
 
+**5.1.0**
+
+* Fix l3_ha enablement
+* spec: pin rspec-puppet to 1.0.1
+* Switch to TLSv1
+* Support SR-IOV mechanism driver in ML2
+* Implement better nova_admin_tenant_id_setter exists? method
+* OVS Agent with ML2: fix symlink on RH plateforms
+* Adding portdb and fastpath_flood to n1kv.conf
+* Make cisco plugin symlink coherent
+* Fix status messages checks for neutron provider
+* Make neutron_plugin_ml2 before db-sync
+* Pin puppetlabs-concat to 1.2.1 in fixtures
+* change default MySQL collate to utf8_general_ci
+* Fix neutron file_line dependency
+* Corrects "ip link set" command
+* Adding vxlan network type support for neutron ML2 plug-in
+* Raise puppet error, if nova-api unavailable
+* Do not run neutron-ovs-cleanup for each Puppet run
+* Unescape value in parse_allocation_pool
+* Fix neutron_network for --router:external setting
+* Add MidoNet plugin support
+* Allow l3_ha to be turned back off after it has been enabled
+* Update .gitreview file for project rename
+* Fix support for auth_uri setting in neutron provider
+* Reduce neutron API timeout to 10 seconds
+
 **5.0.0**
 
 * Stable Juno release

neutron/Rakefile

@@ -1,6 +1,21 @@
 require 'puppetlabs_spec_helper/rake_tasks'
 require 'puppet-lint/tasks/puppet-lint'
+require 'puppet-syntax/tasks/puppet-syntax'
 
-PuppetLint.configuration.fail_on_warnings = true
-PuppetLint.configuration.send('disable_80chars')
-PuppetLint.configuration.send('disable_class_parameter_defaults')
+PuppetSyntax.exclude_paths ||= []
+PuppetSyntax.exclude_paths << "spec/fixtures/**/*"
+PuppetSyntax.exclude_paths << "pkg/**/*"
+PuppetSyntax.exclude_paths << "vendor/**/*"
+
+Rake::Task[:lint].clear
+PuppetLint::RakeTask.new :lint do |config|
+  config.ignore_paths = ["spec/**/*.pp", "vendor/**/*.pp"]
+  config.fail_on_warnings = true
+  config.log_format = '%{path}:%{linenumber}:%{KIND}: %{message}'
+  config.disable_checks = ["80chars", "class_inherits_from_params_class", "class_parameter_defaults", "parameter_documentation"]
+end
+
+desc "Run acceptance tests"
+RSpec::Core::RakeTask.new(:acceptance) do |t|
+  t.pattern = 'spec/acceptance'
+end

neutron/examples/neutron.pp

@@ -32,16 +32,11 @@
 
 # This plugin configures Neutron for OVS on the server
 # Agent
-class { '::neutron::agents::ovs':
+class { '::neutron::agents::ml2::ovs':
   local_ip         => '192.168.1.1',
   enable_tunneling => true,
 }
 
-# Plugin
-class { '::neutron::plugins::ovs':
-  tenant_network_type => 'gre',
-}
-
 # ml2 plugin with vxlan as ml2 driver and ovs as mechanism driver
 class { '::neutron::plugins::ml2':
   type_drivers         => ['vxlan'],
@@ -63,12 +58,7 @@
 
 # The agent/plugin combo also needs installed on clients
 # Agent
-class { '::neutron::agents::ovs':
+class { '::neutron::agents::ml2::ovs':
   local_ip         => '192.168.1.11',
   enable_tunneling => true,
 }
-
-# Plugin
-class { '::neutron::plugins::ovs':
-  tenant_network_type => 'gre',
-}

neutron/manifests/agents/dhcp.pp

@@ -29,6 +29,10 @@
 # [*interface_driver*]
 #   (optional) Defaults to 'neutron.agent.linux.interface.OVSInterfaceDriver'.
 #
+# [*dhcp_domain*]
+#   (optional) domain to use for building the hostnames
+#   Defaults to 'openstacklocal'
+#
 # [*dhcp_driver*]
 #   (optional) Defaults to 'neutron.agent.linux.dhcp.Dnsmasq'.
 #
@@ -69,6 +73,7 @@
   $state_path             = '/var/lib/neutron',
   $resync_interval        = 30,
   $interface_driver       = 'neutron.agent.linux.interface.OVSInterfaceDriver',
+  $dhcp_domain            = 'openstacklocal',
   $dhcp_driver            = 'neutron.agent.linux.dhcp.Dnsmasq',
   $root_helper            = 'sudo neutron-rootwrap /etc/neutron/rootwrap.conf',
   $use_namespaces         = true,
@@ -113,6 +118,7 @@
     'DEFAULT/state_path':             value => $state_path;
     'DEFAULT/resync_interval':        value => $resync_interval;
     'DEFAULT/interface_driver':       value => $interface_driver;
+    'DEFAULT/dhcp_domain':            value => $dhcp_domain;
     'DEFAULT/dhcp_driver':            value => $dhcp_driver;
     'DEFAULT/use_namespaces':         value => $use_namespaces;
     'DEFAULT/root_helper':            value => $root_helper;