Merge "Fixed NoneType issue when monitoring-environment.yaml"

[apex-tripleo-heat-templates.git] / puppet / services / manila-base.yaml

diff --git a/puppet/services/manila-base.yaml b/puppet/services/manila-base.yaml
index f4ec88c..d228577 100644 (file)
--- a/puppet/services/manila-base.yaml
+++ b/puppet/services/manila-base.yaml
@@ -52,11 +52,5 @@ outputs:
         manila::rabbit_use_ssl: {get_param: RabbitClientUseSSL}
         manila::rabbit_port: {get_param: RabbitClientPort}
         manila::debug: {get_param: Debug}
-        manila::db::mysql::user: manila
-        manila::db::mysql::host: {get_param: [EndpointMap, MysqlInternal, host_nobrackets]}
-        manila::db::mysql::dbname: manila
         manila::db::database_db_max_retries: -1
         manila::db::database_max_retries: -1
-        manila::db::mysql::allowed_hosts:
-          - '%'
-          - "%{hiera('mysql_bind_host')}"