Configure and Start RabbitMQ before starting OpenStack services
RabbitMQ should be up and confugred before starting OpenStack services. This change introduces ordering constraints so that all OpenStack services are started after RabbitMQ is configured and started. Also, a change in puppet-placement [1] has changed the default url for placement service. This patch is also updating the keystone endpoint for placement to align with this new default. [1] https://review.opendev.org/c/openstack/puppet-placement/+/819052 Change-Id: I9ad973e900ccd30e41c2166515f564eed49e2a90
This commit is contained in:
@@ -22,6 +22,7 @@ class packstack::aodh::rabbitmq ()
|
||||
}
|
||||
File[$files_to_set_owner] ~> Service<| tag == 'aodh-service' |>
|
||||
}
|
||||
Service<| name == 'rabbitmq-server' |> -> Service<| tag == 'aodh-service' |>
|
||||
|
||||
class { 'aodh::logging':
|
||||
debug => hiera('CONFIG_DEBUG_MODE'),
|
||||
|
||||
@@ -18,6 +18,7 @@ class packstack::ceilometer::rabbitmq ()
|
||||
}
|
||||
File[$files_to_set_owner] ~> Service<| tag == 'ceilometer-service' |>
|
||||
}
|
||||
Service<| name == 'rabbitmq-server' |> -> Service<| tag == 'ceilometer-service' |>
|
||||
|
||||
class { 'ceilometer::logging':
|
||||
debug => hiera('CONFIG_DEBUG_MODE'),
|
||||
|
||||
@@ -18,9 +18,10 @@ class packstack::cinder::rabbitmq ()
|
||||
owner => 'cinder',
|
||||
group => 'cinder',
|
||||
require => Class['cinder'],
|
||||
notify => Service['cinder-api'],
|
||||
}
|
||||
File[$files_to_set_owner] ~> Service<| tag == 'cinder-service' |>
|
||||
}
|
||||
Service<| name == 'rabbitmq-server' |> -> Service<| tag == 'cinder-service' |>
|
||||
|
||||
class { 'cinder::logging':
|
||||
debug => hiera('CONFIG_DEBUG_MODE'),
|
||||
|
||||
@@ -18,6 +18,8 @@ class packstack::glance::ceilometer ()
|
||||
notify => Service['glance-api'],
|
||||
}
|
||||
}
|
||||
Service<| name == 'rabbitmq-server' |> -> Service['glance-api']
|
||||
|
||||
class { 'glance::notify::rabbitmq':
|
||||
rabbit_notification_exchange => 'glance',
|
||||
rabbit_notification_topic => 'notifications',
|
||||
|
||||
@@ -21,6 +21,7 @@ class packstack::heat::rabbitmq ()
|
||||
}
|
||||
File[$files_to_set_owner] ~> Service<| tag == 'heat-service' |>
|
||||
}
|
||||
Service<| name == 'rabbitmq-server' |> -> Service<| tag == 'heat-service' |>
|
||||
|
||||
if hiera('CONFIG_CEILOMETER_INSTALL') == 'y' {
|
||||
$heat_notification_driver = 'messagingv2'
|
||||
|
||||
@@ -21,6 +21,7 @@ class packstack::ironic::rabbitmq ()
|
||||
}
|
||||
File[$files_to_set_owner] ~> Service<| tag == 'ironic-service' |>
|
||||
}
|
||||
Service<| name == 'rabbitmq-server' |> -> Service<| tag == 'ironic-service' |>
|
||||
|
||||
class { 'ironic::logging':
|
||||
debug => true,
|
||||
|
||||
@@ -3,7 +3,7 @@ class packstack::keystone::placement ()
|
||||
$placement_protocol = 'http'
|
||||
$placement_host = hiera('CONFIG_KEYSTONE_HOST_URL')
|
||||
$placement_port = '8778'
|
||||
$placement_url = "${placement_protocol}://${placement_host}:${placement_port}/placement"
|
||||
$placement_url = "${placement_protocol}://${placement_host}:${placement_port}"
|
||||
|
||||
class { 'placement::keystone::authtoken':
|
||||
password => hiera('CONFIG_NOVA_KS_PW'),
|
||||
|
||||
@@ -18,6 +18,7 @@ class packstack::magnum::rabbitmq ()
|
||||
}
|
||||
File[$files_to_set_owner] ~> Service<| tag == 'magnum-service' |>
|
||||
}
|
||||
Service<| name == 'rabbitmq-server' |> -> Service<| tag == 'magnum-service' |>
|
||||
|
||||
class { 'magnum':
|
||||
rabbit_use_ssl => hiera('CONFIG_AMQP_SSL_ENABLED'),
|
||||
|
||||
@@ -19,6 +19,7 @@ class packstack::manila::rabbitmq ()
|
||||
}
|
||||
File[$files_to_set_owner] ~> Service<| tag == 'manila-service' |>
|
||||
}
|
||||
Service<| name == 'rabbitmq-server' |> -> Service<| tag == 'manila-service' |>
|
||||
|
||||
$db_pw = hiera('CONFIG_MANILA_DB_PW')
|
||||
$mariadb_host = hiera('CONFIG_MARIADB_HOST_URL')
|
||||
|
||||
@@ -24,6 +24,7 @@ class packstack::neutron::rabbitmq ()
|
||||
}
|
||||
File[$files_to_set_owner] ~> Service<| tag == 'neutron-service' |>
|
||||
}
|
||||
Service<| name == 'rabbitmq-server' |> -> Service<| tag == 'neutron-service' |>
|
||||
|
||||
class { 'neutron::logging':
|
||||
debug => hiera('CONFIG_DEBUG_MODE'),
|
||||
|
||||
@@ -31,6 +31,7 @@ class packstack::nova ()
|
||||
}
|
||||
File[$files_to_set_owner] ~> Service<| tag == 'nova-service' |>
|
||||
}
|
||||
Service<| name == 'rabbitmq-server' |> -> Service<| tag == 'nova-service' |>
|
||||
|
||||
if hiera('CONFIG_CEILOMETER_INSTALL') == 'y' {
|
||||
$nova_common_notification_driver = 'messagingv2'
|
||||
|
||||
@@ -18,6 +18,7 @@ class packstack::nova::ceilometer::rabbitmq ()
|
||||
}
|
||||
File[$ceilometer_files_to_set_owner] ~> Service<| tag == 'ceilometer-service' |>
|
||||
}
|
||||
Service<| name == 'rabbitmq-server' |> -> Service<| tag == 'ceilometer-service' |>
|
||||
|
||||
class { 'ceilometer::logging':
|
||||
debug => hiera('CONFIG_DEBUG_MODE'),
|
||||
|
||||
@@ -21,6 +21,7 @@ class packstack::sahara::rabbitmq ()
|
||||
}
|
||||
File[$files_to_set_owner] ~> Service<| tag == 'sahara-service' |>
|
||||
}
|
||||
Service<| name == 'rabbitmq-server' |> -> Service<| tag == 'sahara-service' |>
|
||||
|
||||
class { 'sahara::keystone::authtoken':
|
||||
username => 'sahara',
|
||||
|
||||
@@ -5,6 +5,8 @@ class packstack::swift::ceilometer ()
|
||||
$rabbit_userid = hiera('CONFIG_AMQP_AUTH_USER')
|
||||
$rabbit_password = hiera('CONFIG_AMQP_AUTH_PASSWORD')
|
||||
|
||||
Service<| name == 'rabbitmq-server' |> -> Service['swift-proxy-server']
|
||||
|
||||
class { 'swift::proxy::ceilometer':
|
||||
default_transport_url => "rabbit://${rabbit_userid}:${rabbit_password}@${rabbit_host}:${rabbit_port}/",
|
||||
topic => 'notifications',
|
||||
|
||||
@@ -22,7 +22,7 @@ class packstack::trove::rabbitmq ()
|
||||
Package<|tag=='trove'|> -> File[$files_to_set_owner]
|
||||
File[$files_to_set_owner] ~> Service<| tag == 'trove-service' |>
|
||||
}
|
||||
|
||||
Service<| name == 'rabbitmq-server' |> -> Service<| tag == 'trove-service' |>
|
||||
|
||||
class { 'trove':
|
||||
rabbit_use_ssl => hiera('CONFIG_AMQP_SSL_ENABLED'),
|
||||
|
||||
Reference in New Issue
Block a user