X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=blobdiff_plain;f=puppet%2Fservices%2Fnova-base.yaml;h=8db00d8f4bae4dc1a8b6f3ed25c07956217c6fd4;hb=6fadcce8682bd37eb9698ac0b6bac0087fde7955;hp=9b1b07607ab2702069a36f79605ebad93ed09624;hpb=e09985682ff8b604558b9e76d483ae9f132a48f9;p=apex-tripleo-heat-templates.git

diff --git a/puppet/services/nova-base.yaml b/puppet/services/nova-base.yaml
index 9b1b0760..8db00d8f 100644
--- a/puppet/services/nova-base.yaml
+++ b/puppet/services/nova-base.yaml
@@ -4,6 +4,15 @@ description: >
   OpenStack Nova base service. Shared for all Nova services.
 
 parameters:
+  ServiceNetMap:
+    default: {}
+    description: Mapping of service_name -> network name. Typically set
+                 via parameter_defaults in the resource registry.  This
+                 mapping overrides those in ServiceNetMapDefaults.
+    type: json
+  DefaultPasswords:
+    default: {}
+    type: json
   EndpointMap:
     default: {}
     description: Mapping of service endpoint -> protocol. Typically set
@@ -86,20 +95,6 @@ outputs:
               - '@'
               - {get_param: [EndpointMap, MysqlInternal, host]}
               - '/nova_api'
-        nova::db::mysql::password: {get_input: nova_password}
-        nova::db::mysql::user: nova
-        nova::db::mysql::host: {get_param: [EndpointMap, MysqlInternal, host_nobrackets]}
-        nova::db::mysql::dbname: nova
-        nova::db::mysql::allowed_hosts:
-          - '%'
-          - "%{hiera('mysql_bind_host')}"
-        nova::db::mysql_api::password: {get_input: nova_password}
-        nova::db::mysql_api::user: nova_api
-        nova::db::mysql_api::host: {get_param: [EndpointMap, MysqlInternal, host_nobrackets]}
-        nova::db::mysql_api::dbname: nova_api
-        nova::db::mysql_api::allowed_hosts:
-          - '%'
-          - "%{hiera('mysql_bind_host')}"
         nova::debug: {get_param: Debug}
         nova::purge_config: {get_param: EnableConfigPurge}
         nova::network::neutron::neutron_project_name: 'service'
@@ -114,18 +109,6 @@ outputs:
         nova::notify_on_state_change: 'vm_and_task_state'
         nova::notification_driver: messagingv2
         nova::network::neutron::neutron_auth_type: 'v3password'
-        nova::db::mysql::user: nova
-        nova::db::mysql::host: {get_param: [EndpointMap, MysqlInternal, host_nobrackets]}
-        nova::db::mysql::dbname: nova
-        nova::db::mysql::allowed_hosts:
-          - '%'
-          - "%{hiera('mysql_bind_host')}"
-        nova::db::mysql_api::user: nova_api
-        nova::db::mysql_api::host: {get_param: [EndpointMap, MysqlInternal, host_nobrackets]}
-        nova::db::mysql_api::dbname: nova_api
-        nova::db::mysql_api::allowed_hosts:
-          - '%'
-          - "%{hiera('mysql_bind_host')}"
         nova::db::database_db_max_retries: -1
         nova::db::database_max_retries: -1
         nova::glance_api_servers: {get_param: [EndpointMap, GlanceInternal, uri]}