diff options
author | Emilien Macchi <emilien@redhat.com> | 2017-07-13 21:09:38 -0700 |
---|---|---|
committer | Emilien Macchi <emilien@redhat.com> | 2017-07-14 04:10:55 +0000 |
commit | d24874c7b2625e25630534a86864a93050f661d3 (patch) | |
tree | a0cee740de22ab2028dcebc19662245ced26157a /puppet/services/database | |
parent | c031108b9ac358042f726c1745be4151eca4a812 (diff) |
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
Diffstat (limited to 'puppet/services/database')
-rw-r--r-- | puppet/services/database/mongodb-base.yaml | 4 | ||||
-rw-r--r-- | puppet/services/database/mysql.yaml | 4 |
2 files changed, 8 insertions, 0 deletions
diff --git a/puppet/services/database/mongodb-base.yaml b/puppet/services/database/mongodb-base.yaml index b5fced4c..b1ec248f 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 882ba299..919b66c1 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): |