Merge "Adds network/cidr mapping into a new service property"

diff --combined puppet/services/database/mongodb-base.yaml
index b1ec248,c218e8b..2881a5c
--- 1/puppet/services/database/mongodb-base.yaml
--- 2/puppet/services/database/mongodb-base.yaml
+++ b/puppet/services/database/mongodb-base.yaml
@@@ -15,6 -15,10 +15,10 @@@ parameters
    MongoDbReplset:
      type: string
      default: "tripleo"
+   ServiceData:
+     default: {}
+     description: Dictionary packing service data
+     type: json
    ServiceNetMap:
      default: {}
      description: Mapping of service_name -> network name. Typically set
@@@ -52,7 -56,3 +56,7 @@@ outputs
          mongodb::server::journal: false
          mongodb::server::ipv6: {get_param: MongoDbIPv6}
          mongodb::server::replset: {get_param: MongoDbReplset}
 +        # for now, we don't want to manage these services which are enabled
 +        # by default with recent changes in puppet-systemd.
 +        systemd::manage_networkd: false
 +        systemd::manage_resolved: false

diff --combined puppet/services/database/mysql.yaml
index 919b66c,8842a0c..9b8386c
--- 1/puppet/services/database/mysql.yaml
--- 2/puppet/services/database/mysql.yaml
+++ b/puppet/services/database/mysql.yaml
@@@ -5,6 -5,10 +5,10 @@@ description: 
  
  parameters:
    #Parameters not used EndpointMap
+   ServiceData:
+     default: {}
+     description: Dictionary packing service data
+     type: json
    ServiceNetMap:
      default: {}
      description: Mapping of service_name -> network name. Typically set
@@@ -92,10 -96,6 +96,10 @@@ outputs
                      - {get_param: [DefaultPasswords, mysql_root_password]}
              mysql_clustercheck_password: {get_param: MysqlClustercheckPassword}
              enable_galera: {get_param: EnableGalera}
 +            # for now, we don't want to manage these services which are enabled
 +            # by default with recent changes in puppet-systemd.
 +            systemd::manage_networkd: false
 +            systemd::manage_resolved: false
              # 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):