summaryrefslogtreecommitdiffstats
path: root/puppet
diff options
context:
space:
mode:
authorJenkins <jenkins@review.openstack.org>2017-07-14 12:52:46 +0000
committerGerrit Code Review <review@openstack.org>2017-07-14 12:52:46 +0000
commitd1fcf403dc85b25882c25d36b36ea97b56f05186 (patch)
treeeed92c9535ae5af820d2dfd3434995422bd9f692 /puppet
parentaa5c511b827e4c3a7d6cd6021892648093427dbc (diff)
parentd24874c7b2625e25630534a86864a93050f661d3 (diff)
Merge "Disable systemd-networkd & systemd-resolved"
Diffstat (limited to 'puppet')
-rw-r--r--puppet/services/database/mongodb-base.yaml4
-rw-r--r--puppet/services/database/mysql.yaml4
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):