From 1705cbdd953ea43b84544d2714c8db2214b667b6 Mon Sep 17 00:00:00 2001 From: Paul Belanger Date: Thu, 2 Aug 2018 15:58:17 -0400 Subject: [PATCH] Switch to fedora-latest for testing This bumps testing on fedora to 28, it also allows openstack-infra in the future to make changes to fedora much easier. Also, Dogtag now pulls in python3-requests, so no need to remove the pip installed python2-requests, which is needed by keystone-manage. Change-Id: I7635f039848f8c3ab052f339344bb1cb8ea4aecd Signed-off-by: Paul Belanger --- .zuul.yaml | 12 ++++++------ devstack/lib/barbican | 4 +--- .../barbican-devstack-functional-base/post.yaml | 2 +- 3 files changed, 8 insertions(+), 10 deletions(-) diff --git a/.zuul.yaml b/.zuul.yaml index e66bfd5b4..67c3b0287 100644 --- a/.zuul.yaml +++ b/.zuul.yaml @@ -54,8 +54,8 @@ timeout: 4200 - job: - name: barbican-dogtag-devstack-functional-fedora-27 - nodeset: devstack-single-node-fedora-27 + name: barbican-dogtag-devstack-functional-fedora-latest + nodeset: devstack-single-node-fedora-latest parent: barbican-devstack-functional-base vars: services: barbican-dogtag,tempest,rabbit,mysql,key @@ -98,8 +98,8 @@ plugin: simple-crypto - job: - name: barbican-dogtag-devstack-fedora-27 - nodeset: devstack-single-node-fedora-27 + name: barbican-dogtag-devstack-fedora-latest + nodeset: devstack-single-node-fedora-latest parent: barbican-devstack-base vars: services: barbican-dogtag,tempest,keystone @@ -167,7 +167,7 @@ - barbican-simple-crypto-devstack-functional - barbican-simple-crypto-devstack-functional-py35 - barbican-simple-crypto-devstack-functional-postgres - - barbican-dogtag-devstack-functional-fedora-27 + - barbican-dogtag-devstack-functional-fedora-latest - barbican-kmip-devstack-functional: voting: false - barbican-vault-devstack-functional @@ -193,7 +193,7 @@ - barbican-simple-crypto-devstack-functional-py35 - barbican-kmip-devstack-functional: voting: false - - barbican-dogtag-devstack-functional-fedora-27 + - barbican-dogtag-devstack-functional-fedora-latest - barbican-vault-devstack-functional - grenade-devstack-barbican - openstack-tox-lower-constraints diff --git a/devstack/lib/barbican b/devstack/lib/barbican index c4d6cbc6e..51876e506 100644 --- a/devstack/lib/barbican +++ b/devstack/lib/barbican @@ -77,6 +77,7 @@ function configure_barbicanclient { # configure_dogtag_plugin - Change config to use dogtag plugin function configure_dogtag_plugin { + pip_install 'dogtag-pki' sudo openssl pkcs12 -in /root/.dogtag/pki-tomcat/ca_admin_cert.p12 -passin pass:PASSWORD -out $BARBICAN_CONF_DIR/kra_admin_cert.pem -nodes sudo chown $USER $BARBICAN_CONF_DIR/kra_admin_cert.pem iniset $BARBICAN_CONF dogtag_plugin dogtag_port 8373 @@ -555,9 +556,6 @@ EOF } function install_dogtag_plugin_dependencies { - # Removing the pip-installed python-requests package is needed because of: - # https://bugzilla.redhat.com/show_bug.cgi?id=1352554 - sudo rm -rf /usr/lib/python2.7/site-packages/requests install_package nss-devel 389-ds-base pki-ca pki-kra } diff --git a/playbooks/legacy/barbican-devstack-functional-base/post.yaml b/playbooks/legacy/barbican-devstack-functional-base/post.yaml index e07f5510a..502ff570c 100644 --- a/playbooks/legacy/barbican-devstack-functional-base/post.yaml +++ b/playbooks/legacy/barbican-devstack-functional-base/post.yaml @@ -1,4 +1,4 @@ -- hosts: primary +- hosts: all tasks: - name: Copy files from {{ ansible_user_dir }}/workspace/ on node