summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--common/README1
-rw-r--r--common/services.yaml (renamed from services.yaml)0
-rwxr-xr-xextraconfig/tasks/pacemaker_common_functions.sh12
-rwxr-xr-xextraconfig/tasks/yum_update.sh4
-rw-r--r--overcloud-resource-registry-puppet.j2.yaml2
-rw-r--r--puppet/services/database/mongodb-base.yaml4
-rw-r--r--puppet/services/database/mysql.yaml4
-rw-r--r--releasenotes/notes/systemd-d9a41bb3709d0653.yaml9
8 files changed, 33 insertions, 3 deletions
diff --git a/common/README b/common/README
deleted file mode 100644
index 6a523118..00000000
--- a/common/README
+++ /dev/null
@@ -1 +0,0 @@
-This will contain some common templates but it needs to be added to the RPM spec first
diff --git a/services.yaml b/common/services.yaml
index 4d3ca8d1..4d3ca8d1 100644
--- a/services.yaml
+++ b/common/services.yaml
diff --git a/extraconfig/tasks/pacemaker_common_functions.sh b/extraconfig/tasks/pacemaker_common_functions.sh
index d1dd5d1d..367f50d7 100755
--- a/extraconfig/tasks/pacemaker_common_functions.sh
+++ b/extraconfig/tasks/pacemaker_common_functions.sh
@@ -371,3 +371,15 @@ function fixup_wrong_ipv6_vip {
fi
)
}
+
+# https://bugs.launchpad.net/tripleo/+bug/1704131 guard against yum update
+# waiting for an existing process until the heat stack time out
+function check_for_yum_lock {
+ if [[ -f /var/run/yum.pid ]] ; then
+ ERR="ERROR existing yum.pid detected - can't continue! Please ensure
+there is no other package update process for the duration of the minor update
+worfklow. Exiting."
+ echo $ERR
+ exit 1
+ fi
+}
diff --git a/extraconfig/tasks/yum_update.sh b/extraconfig/tasks/yum_update.sh
index 0c4a7928..8f804583 100755
--- a/extraconfig/tasks/yum_update.sh
+++ b/extraconfig/tasks/yum_update.sh
@@ -93,6 +93,7 @@ if [[ "$pacemaker_status" == "active" ]] ; then
fi
else
echo "Upgrading openstack-puppet-modules and its dependencies"
+ check_for_yum_lock
yum -q -y update openstack-puppet-modules
yum deplist openstack-puppet-modules | awk '/dependency/{print $2}' | xargs yum -q -y update
echo "Upgrading other packages is handled by config management tooling"
@@ -102,8 +103,9 @@ fi
command=${command:-update}
full_command="yum -q -y $command $command_arguments"
-echo "Running: $full_command"
+echo "Running: $full_command"
+check_for_yum_lock
result=$($full_command)
return_code=$?
echo "$result"
diff --git a/overcloud-resource-registry-puppet.j2.yaml b/overcloud-resource-registry-puppet.j2.yaml
index aaed2603..a1220d30 100644
--- a/overcloud-resource-registry-puppet.j2.yaml
+++ b/overcloud-resource-registry-puppet.j2.yaml
@@ -110,7 +110,7 @@ resource_registry:
OS::TripleO::DeployedServerEnvironment: OS::Heat::None
# services
- OS::TripleO::Services: services.yaml
+ OS::TripleO::Services: common/services.yaml
OS::TripleO::Services::Apache: puppet/services/apache.yaml
OS::TripleO::Services::CACerts: puppet/services/ca-certs.yaml
OS::TripleO::Services::CephMds: OS::Heat::None
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):
diff --git a/releasenotes/notes/systemd-d9a41bb3709d0653.yaml b/releasenotes/notes/systemd-d9a41bb3709d0653.yaml
new file mode 100644
index 00000000..af66f89d
--- /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.