Merge "Make various password descriptions consistent"

[apex-tripleo-heat-templates.git] / puppet / services / database / mysql.yaml

diff --git a/puppet/services/database/mysql.yaml b/puppet/services/database/mysql.yaml
index f39c971..abbe7a2 100644 (file)
--- a/puppet/services/database/mysql.yaml
+++ b/puppet/services/database/mysql.yaml
@@ -96,10 +96,6 @@ 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):