Merge "Remove transformer to set [DEFAULT] router_id"
This commit is contained in:
commit
64aec48383
@ -1,28 +0,0 @@
|
||||
#
|
||||
# This manifest is intended to demonstrate the 'transform_to' argument
|
||||
# for converting the name of a Neutron router to its UUID for
|
||||
# inclusion in l3-agent.ini
|
||||
#
|
||||
# This manifest extends the one shown in base_provision.pp
|
||||
#
|
||||
|
||||
class { 'neutron':
|
||||
default_transport_url => 'rabbit://guest:password@localhost:5672/neutron',
|
||||
service_plugins => ['router']
|
||||
}
|
||||
|
||||
class { 'neutron::server':
|
||||
auth_password => 'password',
|
||||
database_connection => 'mysql+pymysql://neutron:password@192.168.1.1/neutron',
|
||||
}
|
||||
|
||||
# configure l3-agent to use the new router by name
|
||||
class { 'neutron::agents::l3':
|
||||
enabled => true,
|
||||
use_namespaces => false,
|
||||
require => Neutron_router['demo_router'],
|
||||
}
|
||||
|
||||
neutron_l3_agent_config {
|
||||
'DEFAULT/router_id': value => 'demo_router', transform_to => 'uuid';
|
||||
}
|
@ -14,17 +14,4 @@ Puppet::Type.type(:neutron_l3_agent_config).provide(
|
||||
def file_path
|
||||
self.class.file_path
|
||||
end
|
||||
|
||||
def to_uuid(name)
|
||||
neutron = Puppet::Provider::Neutron.new
|
||||
neutron.auth_neutron('router-show', "#{name}",
|
||||
'--format=value', '--column=id').chop
|
||||
end
|
||||
|
||||
def from_uuid(uuid)
|
||||
neutron = Puppet::Provider::Neutron.new
|
||||
neutron.auth_neutron('router-show', "#{uuid}",
|
||||
'--format=value', '--column=name').chop
|
||||
end
|
||||
|
||||
end
|
||||
|
@ -43,8 +43,6 @@ Puppet::Type.newtype(:neutron_l3_agent_config) do
|
||||
defaultto('<SERVICE DEFAULT>')
|
||||
end
|
||||
|
||||
newparam(:transform_to)
|
||||
|
||||
autorequire(:anchor) do
|
||||
['neutron::install::end']
|
||||
end
|
||||
|
@ -0,0 +1,5 @@
|
||||
---
|
||||
upgrade:
|
||||
- |
|
||||
The ``neutron_l3_agent_config`` resource type no longer supports
|
||||
the ``transform_to`` property.
|
Loading…
Reference in New Issue
Block a user