Refactored configuration options for nova/neutron in manila

Manila configuration for keystone authtoken, nova and neutron
were located on the manila-scheduler while they should
be located in manila-share.
Plus, we were missing some configs for nova/neutron.

This patch set fixes that.

Change-Id: I0cf2e242b0b547acf77888723305ef147f9e6184
Closes-Bug: #1818828
(cherry picked from commit 0f3e0cfecc)

puppet/services/manila-scheduler.yaml

@@ -30,18 +30,6 @@ parameters:
     description: Mapping of service endpoint -> protocol. Typically set
                  via parameter_defaults in the resource registry.
     type: json
-  NovaPassword:
-    type: string
-    description: The password for the nova service and db account
-    hidden: true
-  NeutronPassword:
-    description: The password for the neutron service and db account, used by neutron agents.
-    type: string
-    hidden: true
-  ManilaPassword:
-    description: The password for the manila service account.
-    type: string
-    hidden: true
   MonitoringSubscriptionManilaScheduler:
     default: 'overcloud-manila-scheduler'
     type: string
@@ -63,13 +51,6 @@ outputs:
     value:
       service_name: manila_scheduler
       monitoring_subscription: {get_param: MonitoringSubscriptionManilaScheduler}
-      config_settings:
-        map_merge:
-          - get_attr: [ManilaBase, role_data, config_settings]
-          - manila::compute::nova::auth_url: {get_param: [EndpointMap, KeystoneInternal, uri]}
-            manila::compute::nova::password: {get_param: NovaPassword}
-            manila::compute::nova::project_name: 'service'
-            manila::network::neutron::auth_url: {get_param: [EndpointMap, KeystoneInternal, uri]}
-            manila::network::neutron::password: {get_param: NeutronPassword}
+      config_settings: {get_attr: [ManilaBase, role_data, config_settings]}
       step_config: |
         include ::tripleo::profile::base::manila::scheduler

puppet/services/manila-share.yaml

@@ -59,11 +59,28 @@ outputs:
         map_merge:
           - get_attr: [ManilaBase, role_data, config_settings]
           - manila::volume::cinder::cinder_admin_tenant_name: 'service'
+            # keystone_authtoken
             manila::keystone::authtoken::password: {get_param: ManilaPassword}
             manila::keystone::authtoken::www_authenticate_uri: {get_param: [EndpointMap, KeystoneInternal, uri]}
             manila::keystone::authtoken::auth_uri: {get_param: [EndpointMap, KeystoneInternal, uri]}
             manila::keystone::authtoken::auth_url: { get_param: [EndpointMap, KeystoneInternal, uri_no_suffix] }
             manila::keystone::authtoken::project_name: 'service'
+            # compute
+            manila::compute::nova::username: 'manila'
+            manila::compute::nova::password: {get_param: ManilaPassword}
+            manila::compute::nova::auth_type: 'password'
+            manila::compute::nova::project_name: 'service'
+            manila::compute::nova::user_domain_name: 'Default'
+            manila::compute::nova::project_domain_name: 'Default'
+            manila::compute::nova::auth_url: {get_param: [EndpointMap, KeystoneInternal, uri_no_suffix]}
+            # network
+            manila::network::neutron::username: 'manila'
+            manila::network::neutron::password: {get_param: ManilaPassword}
+            manila::network::neutron::auth_type: 'password'
+            manila::network::neutron::project_name: 'service'
+            manila::network::neutron::user_domain_name: 'Default'
+            manila::network::neutron::project_domain_name: 'Default'
+            manila::network::neutron::auth_url: {get_param: [EndpointMap, KeystoneInternal, uri_no_suffix]}
       service_config_settings:
         get_attr: [ManilaBase, role_data, service_config_settings]
       step_config: |