Mv keystone, mongo, manila out of controller.yaml

This patch moves keystone, mongodb, and manila
bind host settings out of controller.yaml and into
composable services.

Change-Id: I1874dc47fffa30606107999da702442badde35c9

4 files changed, 25 insertions, 16 deletions

diff --git a/puppet/controller.yaml b/puppet/controller.yaml
index 90cb7434..5badb7bc 100644
--- a/puppet/controller.yaml
+++ b/puppet/controller.yaml
@@ -428,10 +428,6 @@ resources:
         pcsd_password: {get_param: PcsdPassword}
         enable_package_upgrade: {get_attr: [UpdateDeployment, update_managed_packages]}
         glance_api_servers: { get_param: [EndpointMap, GlanceInternal, uri]}
-        keystone_public_api_network: {get_attr: [NetIpMap, net_ip_map, {get_param: [ServiceNetMap, KeystonePublicApiNetwork]}]}
-        keystone_admin_api_network: {get_attr: [NetIpMap, net_ip_map, {get_param: [ServiceNetMap, KeystoneAdminApiNetwork]}]}
-        manila_api_network: {get_attr: [NetIpMap, net_ip_map, {get_param: [ServiceNetMap, ManilaApiNetwork]}]}
-        mongo_db_network: {get_attr: [NetIpMap, net_ip_map, {get_param: [ServiceNetMap, MongodbNetwork]}]}
         neutron_api_network: {get_attr: [NetIpMap, net_ip_map, {get_param: [ServiceNetMap, NeutronApiNetwork]}]}
         neutron_local_ip: {get_attr: [NetIpMap, net_ip_map, {get_param: [ServiceNetMap, NeutronTenantNetwork]}]}
         ceilometer_api_network: {get_attr: [NetIpMap, net_ip_map, {get_param: [ServiceNetMap, CeilometerApiNetwork]}]}
@@ -514,18 +510,6 @@ resources:
                 corosync_ipv6: {get_input: corosync_ipv6}
                 tripleo::fencing::config: {get_input: fencing_config}
 
-                # Keystone
-                keystone::admin_bind_host: {get_input: keystone_admin_api_network}
-                keystone::public_bind_host: {get_input: keystone_public_api_network}
-                keystone::wsgi::apache::bind_host: {get_input: keystone_public_api_network}
-                keystone::wsgi::apache::admin_bind_host: {get_input: keystone_admin_api_network}
-
-                # Manila
-                manila::api::bind_host: {get_input: manila_api_network}
-
-                # MongoDB
-                mongodb::server::bind_ip: {get_input: mongo_db_network}
-
                 # Neutron
                 neutron::bind_host: {get_input: neutron_api_network}
                 neutron::agents::ml2::ovs::local_ip: {get_input: neutron_local_ip}
diff --git a/puppet/services/database/mongodb.yaml b/puppet/services/database/mongodb.yaml
index b6eb4803..36962a34 100644
--- a/puppet/services/database/mongodb.yaml
+++ b/puppet/services/database/mongodb.yaml
@@ -45,5 +45,12 @@ outputs:
                 dport: 27018
               '103 mongod':
                 dport: 27017
+            # NOTE: bind IP is found in Heat replacing the network name with the
+            # local node IP for the given network; replacement examples
+            # (eg. for internal_api):
+            # internal_api -> IP
+            # internal_api_uri -> [IP]
+            # internal_api_subnet - > IP/CIDR
+            mongodb::server::bind_ip: {get_param: [ServiceNetMap, MongodbNetwork]}
       step_config: |
         include ::tripleo::profile::base::database::mongodb
diff --git a/puppet/services/keystone.yaml b/puppet/services/keystone.yaml
index 0a5193df..c763c391 100644
--- a/puppet/services/keystone.yaml
+++ b/puppet/services/keystone.yaml
@@ -149,5 +149,16 @@ outputs:
               - 13000
               - 35357
               - 13357
+        # NOTE: bind IP is found in Heat replacing the network name with the
+        # local node IP for the given network; replacement examples
+        # (eg. for internal_api):
+        # internal_api -> IP
+        # internal_api_uri -> [IP]
+        # internal_api_subnet - > IP/CIDR
+        # NOTE: this applies to all 4 bind IP settings below...
+        keystone::admin_bind_host: {get_param: [ServiceNetMap, KeystoneAdminApiNetwork]}
+        keystone::public_bind_host: {get_param: [ServiceNetMap, KeystonePublicApiNetwork]}
+        keystone::wsgi::apache::bind_host: {get_param: [ServiceNetMap, KeystonePublicApiNetwork]}
+        keystone::wsgi::apache::admin_bind_host: {get_param: [ServiceNetMap, KeystoneAdminApiNetwork]}
       step_config: |
         include ::tripleo::profile::base::keystone
diff --git a/puppet/services/manila-api.yaml b/puppet/services/manila-api.yaml
index 633e75ba..b3987747 100644
--- a/puppet/services/manila-api.yaml
+++ b/puppet/services/manila-api.yaml
@@ -55,6 +55,13 @@ outputs:
             manila::keystone::auth::admin_url_v2: {get_param: [EndpointMap, ManilaAdmin, uri]}
             manila::keystone::auth::password: {get_param: ManilaPassword }
             manila::keystone::auth::region: {get_param: KeystoneRegion }
+            # NOTE: bind IP is found in Heat replacing the network name with the
+            # local node IP for the given network; replacement examples
+            # (eg. for internal_api):
+            # internal_api -> IP
+            # internal_api_uri -> [IP]
+            # internal_api_subnet - > IP/CIDR
+            manila::api::bind_host: {get_param: [ServiceNetMap, ManilaApiNetwork]}
       step_config: |
         include ::tripleo::profile::base::manila::api