Merge "Update upgrade migration scripts for openldap"

controllerconfig/controllerconfig/upgrade-scripts/66-create-open-ldap-certificate.py

@@ -1,55 +0,0 @@
-#!/usr/bin/python
-# Copyright (c) 2022 Wind River Systems, Inc.
-#
-# SPDX-License-Identifier: Apache-2.0
-#
-# This script creates the openldap certificate on kubernetes
-#
-import subprocess
-import sys
-from controllerconfig.common import log
-LOG = log.get_logger(__name__)
-
-
-def main():
-    action = None
-    from_release = None
-    to_release = None
-    arg = 1
-    while arg < len(sys.argv):
-        if arg == 1:
-            from_release = sys.argv[arg]
-        elif arg == 2:
-            to_release = sys.argv[arg]
-        elif arg == 3:
-            action = sys.argv[arg]
-        else:
-            print("Invalid option %s." % sys.argv[arg])
-            return 1
-        arg += 1
-    log.configure()
-
-    if action == 'activate' and to_release == '22.12':
-        LOG.info("%s invoked with from_release = %s to_release = %s "
-                 "action = %s"
-                 % (sys.argv[0], from_release, to_release, action))
-        create_openldap_certificate()
-
-
-def create_openldap_certificate():
-    """Run openldap certificate ansible playbook
-    """
-    playbooks_root = '/usr/share/ansible/stx-ansible/playbooks'
-    upgrade_script = 'create-openldap-certificate-for-upgrade.yml'
-    cmd = 'ansible-playbook {}/{}'.format(playbooks_root, upgrade_script)
-    sub = subprocess.Popen(cmd, shell=True,
-                           stdout=subprocess.PIPE, stderr=subprocess.PIPE)
-    stdout, stderr = sub.communicate()
-    if sub.returncode != 0:
-        LOG.error('Command failed:\n %s\n. %s\n%s' % (cmd, stdout, stderr))
-        raise Exception('Cannot create openldap certificate')
-    LOG.info('Successfully created openldap certificate')
-
-
-if __name__ == "__main__":
-    sys.exit(main())

controllerconfig/controllerconfig/upgrade-scripts/67-update-openldap-users.sh

@@ -0,0 +1,42 @@
+#!/bin/bash
+#
+# Copyright (c) 2022 Wind River Systems, Inc.
+#
+# SPDX-License-Identifier: Apache-2.0
+#
+#
+# This migration script is used for update openldap users during the
+# activate stage of a platform upgrade. It will:
+# - change admin user's primary group from 'root' to 'users'
+
+# The migration scripts are passed these parameters:
+NAME=$(basename $0)
+FROM_RELEASE=$1
+TO_RELEASE=$2
+ACTION=$3
+
+# This will log to /var/log/platform.log
+function log {
+    logger -p local1.info $1
+}
+
+# Script start
+log "$NAME: Starting updating openldap users from release $FROM_RELEASE to $TO_RELEASE with action $ACTION"
+
+if [[ "${ACTION}" == "activate" ]] && [[ "${TO_RELEASE}" == "22.12" ]]; then
+
+    /usr/sbin/ldapsetprimarygroup admin users
+
+    RC=$?
+    if [ ${RC} -eq 0 ]; then
+        log "$NAME: Successfully updated openldap users."
+    else
+        log "$NAME: ERROR - failed to update openldap users. (RETURNED: $RC)"
+        exit 1
+    fi
+else
+    log "$NAME: No actions required for from release $FROM_RELEASE to $TO_RELEASE with action $ACTION"
+fi
+
+exit 0
+