x/packstack
Code Issues Proposed changes

Merge "Fix service configuration when AMQP SSL is requested"

Browse Source
This commit is contained in:
Jenkins 2017-08-25 18:26:19 +00:00 committed by Gerrit Code Review
commit 7775ab65fd
4 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
packstack/plugins/magnum_920.py
View File

@ -22,6 +22,7 @@ from packstack.installer import utils
from packstack.installer import validators from packstack.installer import validators
from packstack.modules.documentation import update_params_usage from packstack.modules.documentation import update_params_usage
from packstack.modules.ospluginutils import generate_ssl_cert
# ------------- Magnum Packstack Plugin Initialization -------------- # ------------- Magnum Packstack Plugin Initialization --------------
PLUGIN_NAME = "OS-Magnum" PLUGIN_NAME = "OS-Magnum"

2
packstack/puppet/modules/packstack/manifests/aodh/rabbitmq.pp
View File

@ -18,7 +18,7 @@ class packstack::aodh::rabbitmq ()
file { $files_to_set_owner: file { $files_to_set_owner:
owner => 'aodh', owner => 'aodh',
group => 'aodh', group => 'aodh',
require => Package['openstack-aodh-common'], require => Package['aodh'],
} }
File[$files_to_set_owner] ~> Service<| tag == 'aodh-service' |> File[$files_to_set_owner] ~> Service<| tag == 'aodh-service' |>
} }

2
packstack/puppet/modules/packstack/manifests/ceilometer/rabbitmq.pp
View File

@ -14,7 +14,7 @@ class packstack::ceilometer::rabbitmq ()
file { $files_to_set_owner: file { $files_to_set_owner:
owner => 'ceilometer', owner => 'ceilometer',
group => 'ceilometer', group => 'ceilometer',
require => Package['openstack-ceilometer-common'], require => Package['ceilometer-common'],
} }
File[$files_to_set_owner] ~> Service<| tag == 'ceilometer-service' |> File[$files_to_set_owner] ~> Service<| tag == 'ceilometer-service' |>
} }

4
packstack/puppet/modules/packstack/manifests/magnum/rabbitmq.pp
View File

@ -14,9 +14,9 @@ class packstack::magnum::rabbitmq ()
file { $files_to_set_owner: file { $files_to_set_owner:
owner => 'magnum', owner => 'magnum',
group => 'magnum', group => 'magnum',
require => Package['openstack-magnum-common'], require => Package['magnum-common'],
} }
File[$files_to_set_owner] ~> Service<||> File[$files_to_set_owner] ~> Service<| tag == 'magnum-service' |>
} }
class { '::magnum': class { '::magnum':