Clean up a few FIXME
Change-Id: I507efdf3e771789de8cae5e29bc312b4d27f6b25 glance: remove useless comments, they were implemented. ironic: remove the useless condition rabbitmq: remove useless comment zaqar: remove useless parameter, call class directly
This commit is contained in:
parent
8e4de1b75c
commit
0a2469304e
|
@ -193,11 +193,9 @@ class tripleo::profile::base::glance::api (
|
||||||
$http_store = ['http']
|
$http_store = ['http']
|
||||||
$glance_store = concat($http_store, $backend_store)
|
$glance_store = concat($http_store, $backend_store)
|
||||||
|
|
||||||
# TODO: notifications, scrubber, etc.
|
|
||||||
include ::glance
|
include ::glance
|
||||||
include ::glance::config
|
include ::glance::config
|
||||||
include ::glance::api::logging
|
include ::glance::api::logging
|
||||||
# TODO(jaosorior): Remove bind_host when we set it up conditionally in t-h-t
|
|
||||||
class { '::glance::api':
|
class { '::glance::api':
|
||||||
stores => $glance_store,
|
stores => $glance_store,
|
||||||
sync_db => $sync_db,
|
sync_db => $sync_db,
|
||||||
|
|
|
@ -73,17 +73,9 @@ class tripleo::profile::base::ironic_inspector (
|
||||||
|
|
||||||
if $step >= 4 or ($step >= 3 and $sync_db) {
|
if $step >= 4 or ($step >= 3 and $sync_db) {
|
||||||
include ::ironic::inspector::cors
|
include ::ironic::inspector::cors
|
||||||
# TODO(hjensas): Once https://review.openstack.org/557465 is merged remove
|
class { '::ironic::inspector':
|
||||||
# the condition.
|
sync_db => $sync_db,
|
||||||
if $inspection_subnets != [] {
|
dnsmasq_ip_subnets => $inspection_subnets_real,
|
||||||
class { '::ironic::inspector':
|
|
||||||
sync_db => $sync_db,
|
|
||||||
dnsmasq_ip_subnets => $inspection_subnets_real,
|
|
||||||
}
|
|
||||||
} else {
|
|
||||||
class { '::ironic::inspector':
|
|
||||||
sync_db => $sync_db,
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
include ::ironic::inspector::pxe_filter
|
include ::ironic::inspector::pxe_filter
|
||||||
|
|
|
@ -113,7 +113,7 @@
|
||||||
class tripleo::profile::base::rabbitmq (
|
class tripleo::profile::base::rabbitmq (
|
||||||
$certificate_specs = {},
|
$certificate_specs = {},
|
||||||
$config_variables = hiera('rabbitmq_config_variables'),
|
$config_variables = hiera('rabbitmq_config_variables'),
|
||||||
$enable_internal_tls = undef, # TODO(jaosorior): pass this via t-h-t
|
$enable_internal_tls = undef,
|
||||||
$environment = hiera('rabbitmq_environment'),
|
$environment = hiera('rabbitmq_environment'),
|
||||||
$ssl_versions = undef,
|
$ssl_versions = undef,
|
||||||
# lint:ignore:140chars
|
# lint:ignore:140chars
|
||||||
|
|
|
@ -119,9 +119,7 @@ class tripleo::profile::base::zaqar (
|
||||||
|
|
||||||
# TODO (bcrochet): At some point, the transports should be split out to
|
# TODO (bcrochet): At some point, the transports should be split out to
|
||||||
# separate services.
|
# separate services.
|
||||||
class { '::zaqar::server':
|
include ::zaqar::server
|
||||||
service_name => 'httpd', # TODO cleanup when passed by t-h-t.
|
|
||||||
}
|
|
||||||
class { '::zaqar::wsgi::apache':
|
class { '::zaqar::wsgi::apache':
|
||||||
ssl_cert => $tls_certfile,
|
ssl_cert => $tls_certfile,
|
||||||
ssl_key => $tls_keyfile,
|
ssl_key => $tls_keyfile,
|
||||||
|
|
Loading…
Reference in New Issue