Revert "Disable systemd-networkd & systemd-resolved"

https://github.com/camptocamp/puppet-systemd/pull/32 is disabling by default the services so we don't have to control them via TripleO.

This reverts commit d24874c7b2.

Change-Id: I4044f0b28b636c7a022912f6f24707bce22c8b98
Related-Bug: #1704160
This commit is contained in:
Emilien Macchi 2017-07-14 14:04:23 +00:00
parent 9f1fbcb40a
commit 0443e7a836
3 changed files with 0 additions and 17 deletions

View File

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

View File

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

View File

@ -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.