From d24874c7b2625e25630534a86864a93050f661d3 Mon Sep 17 00:00:00 2001 From: Emilien Macchi Date: Thu, 13 Jul 2017 21:09:38 -0700 Subject: [PATCH] Disable systemd-networkd & systemd-resolved 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. Change-Id: I42c6c9b643a71a0fbb1768bbae91e8bfa916ea00 Closes-Bug: #1704145 --- puppet/services/database/mongodb-base.yaml | 4 ++++ puppet/services/database/mysql.yaml | 4 ++++ releasenotes/notes/systemd-d9a41bb3709d0653.yaml | 9 +++++++++ 3 files changed, 17 insertions(+) create mode 100644 releasenotes/notes/systemd-d9a41bb3709d0653.yaml diff --git a/puppet/services/database/mongodb-base.yaml b/puppet/services/database/mongodb-base.yaml index b5fced4cb9..b1ec248fc5 100644 --- a/puppet/services/database/mongodb-base.yaml +++ b/puppet/services/database/mongodb-base.yaml @@ -52,3 +52,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 --git a/puppet/services/database/mysql.yaml b/puppet/services/database/mysql.yaml index 882ba2993c..919b66c1e3 100644 --- a/puppet/services/database/mysql.yaml +++ b/puppet/services/database/mysql.yaml @@ -92,6 +92,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): diff --git a/releasenotes/notes/systemd-d9a41bb3709d0653.yaml b/releasenotes/notes/systemd-d9a41bb3709d0653.yaml new file mode 100644 index 0000000000..af66f89d57 --- /dev/null +++ b/releasenotes/notes/systemd-d9a41bb3709d0653.yaml @@ -0,0 +1,9 @@ +--- +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.