From 44db9dea365fea4e1fb2156a69e919c7f3909367 Mon Sep 17 00:00:00 2001 From: Andy Ning Date: Wed, 5 Oct 2022 09:21:16 -0400 Subject: [PATCH] Revert "Disable openldap CA cert installation for upgrade" This reverts commit 6a704b12b86af12176475563b50eef867b3a2a0d. This breaks system deployment. Signed-off-by: Andy Ning Change-Id: I3be9a666d097a87fd268dcb091f5505b70d39242 --- .../upgrade-scripts/66-create-open-ldap-certificate.py | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/controllerconfig/controllerconfig/upgrade-scripts/66-create-open-ldap-certificate.py b/controllerconfig/controllerconfig/upgrade-scripts/66-create-open-ldap-certificate.py index 0db4688734..be7d25ef8d 100644 --- a/controllerconfig/controllerconfig/upgrade-scripts/66-create-open-ldap-certificate.py +++ b/controllerconfig/controllerconfig/upgrade-scripts/66-create-open-ldap-certificate.py @@ -41,9 +41,7 @@ def create_openldap_certificate(): """ playbooks_root = '/usr/share/ansible/stx-ansible/playbooks' upgrade_script = 'create-openldap-certificate-for-upgrade.yml' - # TODO(aning): remove the extra-vars option - cmd = 'ansible-playbook -e install_ca_cert=no {}/{}'.format( - playbooks_root, upgrade_script) + cmd = 'ansible-playbook {}/{}'.format(playbooks_root, upgrade_script) sub = subprocess.Popen(cmd, shell=True, stdout=subprocess.PIPE, stderr=subprocess.PIPE) stdout, stderr = sub.communicate()