Merge "Revert "Disable systemd-networkd & systemd-resolved""

This commit is contained in:
Jenkins 2017-07-24 20:47:16 +00:00 committed by Gerrit Code Review
commit 99dd25fb23
3 changed files with 0 additions and 17 deletions
puppet/services/database
releasenotes/notes

@ -56,7 +56,3 @@ 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

@ -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):

@ -1,9 +0,0 @@
---
fixes:
- |
Latest commits in puppet-systemd enabled by default systemd-networkd and
systemd-resolved but we don't want to manage them for now in TripleO.
MySQL and MongoDB services were managing some systemd resources so now
we ensure that these 2 systemd services are disabled. In the future, we
might want and activate these services and revert that patch but for now
we want to disable them.