Trove: Remove trove::use_neutron
... because the parameter was deprecated during Yoga cycle[1] and has had no effect since then. Depends-on: https://review.opendev.org/c/openstack/puppet-trove/+/830620 Change-Id: Ic627bfa002c190706c49cd3ffe7f7b7a8cf1c27f
This commit is contained in:
parent
552b45be5e
commit
edcd363dc6
|
@ -25,12 +25,11 @@ class packstack::trove::rabbitmq ()
|
|||
Service<| name == 'rabbitmq-server' |> -> Service<| tag == 'trove-service' |>
|
||||
|
||||
class { 'trove':
|
||||
rabbit_use_ssl => hiera('CONFIG_AMQP_SSL_ENABLED'),
|
||||
default_transport_url => "rabbit://${rabbit_userid}:${rabbit_password}@${rabbit_host}:${rabbit_port}/",
|
||||
database_connection => "mysql+pymysql://trove:${trove_rabmq_cfg_trove_db_pw}@${trove_rabmq_cfg_mariadb_host}/trove",
|
||||
use_neutron => hiera('CONFIG_NEUTRON_INSTALL'),
|
||||
kombu_ssl_ca_certs => $kombu_ssl_ca_certs,
|
||||
kombu_ssl_keyfile => $kombu_ssl_keyfile,
|
||||
kombu_ssl_certfile => $kombu_ssl_certfile,
|
||||
rabbit_use_ssl => hiera('CONFIG_AMQP_SSL_ENABLED'),
|
||||
default_transport_url => "rabbit://${rabbit_userid}:${rabbit_password}@${rabbit_host}:${rabbit_port}/",
|
||||
database_connection => "mysql+pymysql://trove:${trove_rabmq_cfg_trove_db_pw}@${trove_rabmq_cfg_mariadb_host}/trove",
|
||||
kombu_ssl_ca_certs => $kombu_ssl_ca_certs,
|
||||
kombu_ssl_keyfile => $kombu_ssl_keyfile,
|
||||
kombu_ssl_certfile => $kombu_ssl_certfile,
|
||||
}
|
||||
}
|
||||
|
|
Loading…
Reference in New Issue