diff options
author | 2017-02-18 14:47:08 +0000 | |
---|---|---|
committer | 2017-02-18 14:47:08 +0000 | |
commit | da0d8e06bb9a55fb9b15b34cabb19c681667d383 (patch) | |
tree | ff9e2ff0b8f9d62111d33d2b7fec7bd22775b466 /build/puppet-neutron | |
parent | 645949cbac2bb766d18dfd9f818b6c14545a35e2 (diff) | |
parent | c7e6d15b4d2570c7f9d2bc8dcfc57d8a68fede71 (diff) |
Merge "Add support for odl-fdio scenario"
Diffstat (limited to 'build/puppet-neutron')
4 files changed, 0 insertions, 159 deletions
diff --git a/build/puppet-neutron/lib/puppet/provider/neutron_agent_vpp/ini_setting.rb b/build/puppet-neutron/lib/puppet/provider/neutron_agent_vpp/ini_setting.rb deleted file mode 100644 index 595904ce..00000000 --- a/build/puppet-neutron/lib/puppet/provider/neutron_agent_vpp/ini_setting.rb +++ /dev/null @@ -1,15 +0,0 @@ -Puppet::Type.type(:neutron_agent_vpp).provide( - :ini_setting, - :parent => Puppet::Type.type(:openstack_config).provider(:ini_setting) -) do - - def self.file_path - '/etc/neutron/plugins/ml2/vpp_agent.ini' - end - - # added for backwards compatibility with older versions of inifile - def file_path - self.class.file_path - end - -end
\ No newline at end of file diff --git a/build/puppet-neutron/lib/puppet/type/neutron_agent_vpp.rb b/build/puppet-neutron/lib/puppet/type/neutron_agent_vpp.rb deleted file mode 100644 index f43a8b41..00000000 --- a/build/puppet-neutron/lib/puppet/type/neutron_agent_vpp.rb +++ /dev/null @@ -1,28 +0,0 @@ -Puppet::Type.newtype(:neutron_agent_vpp) do - - ensurable - - newparam(:name, :namevar => true) do - desc 'Section/setting name to manage from vpp agent config.' - newvalues(/\S+\/\S+/) - end - - newproperty(:value) do - desc 'The value of the setting to be defined.' - munge do |value| - value = value.to_s.strip - value.capitalize! if value =~ /^(true|false)$/i - value - end - end - - newparam(:ensure_absent_val) do - desc 'A value that is specified as the value property will behave as if ensure => absent was specified' - defaultto('<SERVICE DEFAULT>') - end - - autorequire(:package) do - 'networking-vpp' - end - -end
\ No newline at end of file diff --git a/build/puppet-neutron/manifests/agents/ml2/networking-vpp.pp b/build/puppet-neutron/manifests/agents/ml2/networking-vpp.pp deleted file mode 100644 index 6184e006..00000000 --- a/build/puppet-neutron/manifests/agents/ml2/networking-vpp.pp +++ /dev/null @@ -1,65 +0,0 @@ -# == Class: neutron::agents::ml2::networking-vpp -# -# Setups networking-vpp Neutron agent for ML2 plugin. -# -# === Parameters -# -# [*package_ensure*] -# (optional) Package ensure state. -# Defaults to 'present'. -# -# [*enabled*] -# (required) Whether or not to enable the agent. -# Defaults to true. -# -# [*manage_service*] -# (optional) Whether to start/stop the service -# Defaults to true -# -# [*physnets*] -# List of <physical_network>:<physical_interface> -# tuples mapping physical network names to agent's node-specific physical -# network interfaces. Defaults to empty list. -# -# [*etcd_host*] -# etcd server host name/ip -# Defaults to 127.0.0.1. -# -# [*etcd_port*] -# etcd server listening port. -# Defaults to 4001. -# -class neutron::agents::ml2::networking-vpp ( - $package_ensure = 'present', - $enabled = true, - $manage_service = true, - $physnets = '', - $etcd_host = '127.0.0.1', - $etcd_port = 4001, -) { - - include ::neutron::params - - Neutron_agent_vpp<||> ~> Service['networking-vpp-agent'] - - neutron_agent_vpp { - 'ml2_vpp/physnets': value => $physnets; - 'ml2_vpp/etcd_host': value => $etcd_host; - 'ml2_vpp/etcd_port': value => $etcd_port; - 'DEFAULT/host': value => $::fqdn; - } - - if $manage_service { - if $enabled { - $service_ensure = 'running' - } else { - $service_ensure = 'stopped' - } - } - - service { 'networking-vpp-agent': - ensure => $service_ensure, - name => 'networking-vpp-agent', - enable => $enabled, - } -}
\ No newline at end of file diff --git a/build/puppet-neutron/manifests/plugins/ml2/networking-vpp.pp b/build/puppet-neutron/manifests/plugins/ml2/networking-vpp.pp deleted file mode 100644 index cf8fe178..00000000 --- a/build/puppet-neutron/manifests/plugins/ml2/networking-vpp.pp +++ /dev/null @@ -1,51 +0,0 @@ -# -# Install the networking-vpp ML2 mechanism driver and generate config file -# from parameters in the other classes. -# -# === Parameters -# -# [*package_ensure*] -# (optional) The intended state of the networking-vpp -# package, i.e. any of the possible values of the 'ensure' -# property for a package resource type. -# Defaults to 'present' -# -# [*etcd_host*] -# (required) etcd server host name or IP. -# Defaults to '127.0.0.1' -# -# [*etcd_port*] -# (optional) etcd server listening port. -# Defaults to 4001. -# -# [*etcd_user*] -# (optional) User name for etcd authentication -# Defaults to ''. -# -# [*etcd_pass*] -# (optional) Password for etcd authentication -# Defaults to ''. -# -class neutron::plugins::ml2::networking-vpp ( - $package_ensure = 'present', - $etcd_host = '127.0.0.1', - $etcd_port = 4001, - $etcd_user = '', - $etcd_pass = '', -) { - require ::neutron::plugins::ml2 - - ensure_resource('package', 'networking-vpp', - { - ensure => $package_ensure, - tag => 'openstack', - } - ) - - neutron_plugin_ml2 { - 'ml2_vpp/etcd_host': value => $etcd_host; - 'ml2_vpp/etcd_port': value => $etcd_port; - 'ml2_vpp/etcd_user': value => $etcd_user; - 'ml2_vpp/etcd_pass': value => $etcd_pass; - } -} |