starlingx/config
Code Issues Proposed changes

Debian - Fix update ca certs command

Browse Source 
Correct update ca certs command for Debian.

Test Plan:
Verify: Bootstrap and adding a Subcloud on Debian
Verify: Bootstrap and adding a Subcloud on Centos

Story: 2010119
Task: 45763

Signed-off-by: Li Zhu <li.zhu@windriver.com>
Change-Id: I4a9d2758ce012557fad4a19b49aa9b5bfe4f1680
This commit is contained in:
Li Zhu 2022-07-11 13:04:13 -04:00
parent fb7eb9664c
commit 03f785e953
1 changed files with 11 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
controllerconfig/controllerconfig/scripts/controller_config
View File

@ -34,6 +34,15 @@ IMA_POLICY=/etc/ima.policy
PUPPET_CACHE=/etc/puppet/cache PUPPET_CACHE=/etc/puppet/cache
PUPPET_CACHE_TMP=/etc/puppet/cache.tmp PUPPET_CACHE_TMP=/etc/puppet/cache.tmp
ACTIVE_CONTROLLER_NOT_FOUND_FLAG="/var/run/.active_controller_not_found" ACTIVE_CONTROLLER_NOT_FOUND_FLAG="/var/run/.active_controller_not_found"
CERT_DIR=/etc/pki/ca-trust/source/anchors
OS_ID=$(grep '^ID=' /etc/os-release | cut -f2- -d= | sed -e 's/\"//g')
if [ "$OS_ID" == "debian" ]
then
UPDATE_CA_CMD="update-ca-certificates --localcertsdir ${CERT_DIR}"
else
UPDATE_CA_CMD="update-ca-trust extract"
fi
fatal_error() fatal_error()
{ {
@ -404,13 +413,13 @@ start()
if [ -e $CONFIG_DIR/dc-adminep-root-ca.crt ] if [ -e $CONFIG_DIR/dc-adminep-root-ca.crt ]
then then
cp $CONFIG_DIR/dc-adminep-root-ca.crt /etc/pki/ca-trust/source/anchors/ cp $CONFIG_DIR/dc-adminep-root-ca.crt $CERT_DIR
if [ $? -ne 0 ] if [ $? -ne 0 ]
then then
fatal_error "Unable to copy $CONFIG_DIR/dc-adminep-root-ca.crt to certificates dir" fatal_error "Unable to copy $CONFIG_DIR/dc-adminep-root-ca.crt to certificates dir"
fi fi
# Update system trusted CA cert list with the new CA cert. # Update system trusted CA cert list with the new CA cert.
update-ca-trust extract $UPDATE_CA_CMD
if [ $? -ne 0 ] if [ $? -ne 0 ]
then then
fatal_error "Unable to update system trusted CA certificate list" fatal_error "Unable to update system trusted CA certificate list"