openstack/barbican
Code Issues Proposed changes

Switch to fedora-latest for testing

Browse Source 
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 <pabelanger@redhat.com>
This commit is contained in:
Paul Belanger
2018-08-02 15:58:17 -04:00
committed by Ade Lee
parent 08ca2287dd
commit 1705cbdd95
3 changed files with 8 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
.zuul.yaml
View File

@@ -54,8 +54,8 @@
timeout: 4200 timeout: 4200
- job: - job:
name: barbican-dogtag-devstack-functional-fedora-27 name: barbican-dogtag-devstack-functional-fedora-latest
nodeset: devstack-single-node-fedora-27 nodeset: devstack-single-node-fedora-latest
parent: barbican-devstack-functional-base parent: barbican-devstack-functional-base
vars: vars:
services: barbican-dogtag,tempest,rabbit,mysql,key services: barbican-dogtag,tempest,rabbit,mysql,key
@@ -98,8 +98,8 @@
plugin: simple-crypto plugin: simple-crypto
- job: - job:
name: barbican-dogtag-devstack-fedora-27 name: barbican-dogtag-devstack-fedora-latest
nodeset: devstack-single-node-fedora-27 nodeset: devstack-single-node-fedora-latest
parent: barbican-devstack-base parent: barbican-devstack-base
vars: vars:
services: barbican-dogtag,tempest,keystone services: barbican-dogtag,tempest,keystone
@@ -167,7 +167,7 @@
- barbican-simple-crypto-devstack-functional - barbican-simple-crypto-devstack-functional
- barbican-simple-crypto-devstack-functional-py35 - barbican-simple-crypto-devstack-functional-py35
- barbican-simple-crypto-devstack-functional-postgres - barbican-simple-crypto-devstack-functional-postgres
- barbican-dogtag-devstack-functional-fedora-27 - barbican-dogtag-devstack-functional-fedora-latest
- barbican-kmip-devstack-functional: - barbican-kmip-devstack-functional:
voting: false voting: false
- barbican-vault-devstack-functional - barbican-vault-devstack-functional
@@ -193,7 +193,7 @@
- barbican-simple-crypto-devstack-functional-py35 - barbican-simple-crypto-devstack-functional-py35
- barbican-kmip-devstack-functional: - barbican-kmip-devstack-functional:
voting: false voting: false
- barbican-dogtag-devstack-functional-fedora-27 - barbican-dogtag-devstack-functional-fedora-latest
- barbican-vault-devstack-functional - barbican-vault-devstack-functional
- grenade-devstack-barbican - grenade-devstack-barbican
- openstack-tox-lower-constraints - openstack-tox-lower-constraints

4
devstack/lib/barbican
View File

@@ -77,6 +77,7 @@ function configure_barbicanclient {
# configure_dogtag_plugin - Change config to use dogtag plugin # configure_dogtag_plugin - Change config to use dogtag plugin
function configure_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 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 sudo chown $USER $BARBICAN_CONF_DIR/kra_admin_cert.pem
iniset $BARBICAN_CONF dogtag_plugin dogtag_port 8373 iniset $BARBICAN_CONF dogtag_plugin dogtag_port 8373
@@ -555,9 +556,6 @@ EOF
} }
function install_dogtag_plugin_dependencies { 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 install_package nss-devel 389-ds-base pki-ca pki-kra
} }

2
playbooks/legacy/barbican-devstack-functional-base/post.yaml
View File

@@ -1,4 +1,4 @@
- hosts: primary - hosts: all
tasks: tasks:
- name: Copy files from {{ ansible_user_dir }}/workspace/ on node - name: Copy files from {{ ansible_user_dir }}/workspace/ on node