diff --git a/integration/scripts/files/elements/fedora-guest/install.d/21-use-fedora-certificates b/integration/scripts/files/elements/fedora-guest/install.d/21-use-fedora-certificates new file mode 100755 index 0000000000..8ef6c50a21 --- /dev/null +++ b/integration/scripts/files/elements/fedora-guest/install.d/21-use-fedora-certificates @@ -0,0 +1,11 @@ +#!/bin/sh + +# CONTEXT: GUEST during CONSTRUCTION as ROOT +# PURPOSE: configure trove-guest service to use system store of trusted certificates + +GUEST_UNIT_DROPINS="/etc/systemd/system/trove-guest.service.d" + +mkdir -v -p ${GUEST_UNIT_DROPINS} +echo -e '[Service]\nEnvironment=REQUESTS_CA_BUNDLE=/etc/pki/tls/certs' > ${GUEST_UNIT_DROPINS}/30-use-system-certificates.conf + + diff --git a/integration/scripts/files/elements/ubuntu-xenial-guest/install.d/21-use-ubuntu-certificates b/integration/scripts/files/elements/ubuntu-xenial-guest/install.d/21-use-ubuntu-certificates new file mode 100755 index 0000000000..ab9469ed93 --- /dev/null +++ b/integration/scripts/files/elements/ubuntu-xenial-guest/install.d/21-use-ubuntu-certificates @@ -0,0 +1,11 @@ +#!/bin/sh + +# CONTEXT: GUEST during CONSTRUCTION as ROOT +# PURPOSE: configure trove-guest service to use system store of trusted certificates + +GUEST_UNIT_DROPINS="/etc/systemd/system/trove-guest.service.d" + +mkdir -v -p ${GUEST_UNIT_DROPINS} +echo -e '[Service]\nEnvironment=REQUESTS_CA_BUNDLE=/etc/ssl/certs' > ${GUEST_UNIT_DROPINS}/30-use-system-certificates.conf + + diff --git a/integration/scripts/files/trove-guest.upstart.conf b/integration/scripts/files/trove-guest.upstart.conf index 2e20d6cfb9..f6a3dba24a 100644 --- a/integration/scripts/files/trove-guest.upstart.conf +++ b/integration/scripts/files/trove-guest.upstart.conf @@ -36,5 +36,7 @@ script fi - exec su -c "/home/GUEST_USERNAME/trove/contrib/trove-guestagent $TROVE_CONFIG" GUEST_USERNAME + # Requests: CA directories not supported in older Pythons, a custom bundle file is needed + cat /usr/local/share/ca-certificates/*.crt > /usr/local/share/ca-certificates/custom.bundle + exec su -c "REQUESTS_CA_BUNDLE=/usr/local/share/ca-certificates/custom.bundle /home/GUEST_USERNAME/trove/contrib/trove-guestagent $TROVE_CONFIG" GUEST_USERNAME end script