diff --git a/puppet/controller.yaml b/puppet/controller.yaml
index 65556df0a1..0bc628023f 100644
--- a/puppet/controller.yaml
+++ b/puppet/controller.yaml
@@ -513,10 +513,6 @@ resources:
             params:
               CLUSTER: {get_param: MysqlClusterUniquePart}
         neutron_metadata_proxy_shared_secret: {get_param: NeutronMetadataProxySharedSecret}
-        neutron_password: {get_param: NeutronPassword}
-        neutron_internal_url: { get_param: [ EndpointMap, NeutronInternal, uri ] }
-        neutron_auth_url: { get_param: [ EndpointMap, KeystoneV3Admin, uri ] }
-        nova_internal_url: { get_param: [ EndpointMap, NovaInternal, uri ] }
         aodh_internal_url: { get_param: [ EndpointMap, AodhInternal, uri ] }
         aodh_public_url: { get_param: [ EndpointMap, AodhPublic, uri ] }
         aodh_admin_url: { get_param: [ EndpointMap, AodhAdmin, uri ] }
@@ -741,9 +737,6 @@ resources:
                 nova::glance_api_servers: {get_input: glance_api_servers}
                 nova::api::neutron_metadata_proxy_shared_secret: {get_input: neutron_metadata_proxy_shared_secret}
                 nova::api::instance_name_template: {get_input: instance_name_template}
-                nova::network::neutron::neutron_password: {get_input: neutron_password}
-                nova::network::neutron::neutron_url: {get_input: neutron_internal_url}
-                nova::network::neutron::neutron_auth_url: {get_input: neutron_auth_url}
                 nova::vncproxy::host: {get_input: nova_api_network}
                 nova_enable_db_purge: {get_input: nova_enable_db_purge}
 
diff --git a/puppet/services/nova-base.yaml b/puppet/services/nova-base.yaml
index 868b76cf8f..5bc94b2b67 100644
--- a/puppet/services/nova-base.yaml
+++ b/puppet/services/nova-base.yaml
@@ -13,6 +13,10 @@ parameters:
     description: The password for the nova service and db account, used by nova-api.
     type: string
     hidden: true
+  NeutronPassword:
+    description: The password for the neutron service and db account, used by neutron agents.
+    type: string
+    hidden: true
   RabbitPassword:
     description: The password for RabbitMQ
     type: string
@@ -82,6 +86,9 @@ outputs:
         nova::network::neutron::neutron_project_name: 'service'
         nova::network::neutron::neutron_username: 'neutron'
         nova::network::neutron::dhcp_domain: ''
+        nova::network::neutron::neutron_password: {get_param: NeutronPassword}
+        nova::network::neutron::neutron_url: {get_param: [EndpointMap, NeutronInternal, uri]}
+        nova::network::neutron::neutron_auth_url: {get_param: [EndpointMap, KeystoneV3Admin, uri]}
         nova::rabbit_heartbeat_timeout_threshold: 60
         nova::cinder_catalog_info: 'volumev2:cinderv2:internalURL'
         nova::host: '"%{::fqdn}"'    # NOTE: extra quoting is needed.