x/solar
Code Issues Proposed changes

Remove external class ref for neutron server resource

Browse Source 
* Fix rabbit inputs for neutron
* Decouple service neutron-server from neutron class

Signed-off-by: Bogdan Dobrelya <bdobrelia@mirantis.com>
This commit is contained in:
Bogdan Dobrelya 2015-08-04 11:59:24 +02:00
parent 8be490610c
commit 0570c4a670
2 changed files with 10 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
example-puppet.py
View File

@ -162,14 +162,14 @@ def setup_resources():
neutron_puppet = vr.create('neutron_puppet', 'resources/neutron_puppet', {})[0]
signals.connect(node1, neutron_puppet)
signals.connect(rabbitmq_service1, neutron_puppet, {
'ip': 'rabbitmq_host',
'port': 'rabbitmq_port'
'ip': 'rabbit_host',
'port': 'rabbit_port'
})
signals.connect(openstack_rabbitmq_user, neutron_puppet, {
'user_name': 'rabbitmq_user',
'password': 'rabbitmq_password'})
'user_name': 'rabbit_user',
'password': 'rabbit_password'})
signals.connect(openstack_vhost, neutron_puppet, {
'vhost_name': 'rabbitmq_virtual_host'})
'vhost_name': 'rabbit_virtual_host'})
# NEUTRON API (SERVER)
neutron_server_puppet = vr.create('neutron_server_puppet', 'resources/neutron_server_puppet', {

5
resources/neutron_server_puppet/actions/run.pp
View File

@ -87,4 +87,9 @@ class { 'neutron::server':
log_dir => $log_dir,
log_file => $log_file,
report_interval => $report_interval,
}
# Remove external class dependency
Service <| title == 'neutron-server' |> {
require => undef
}