Merge "Test swift python3 support"

This commit is contained in:
Zuul 2018-10-12 15:50:12 +00:00 committed by Gerrit Code Review
commit 672b7eea66
2 changed files with 1 additions and 18 deletions

View File

@ -267,8 +267,7 @@ function configure_inspector {
inspector_iniset iptables dnsmasq_interface $IRONIC_INSPECTOR_INTERFACE
inspector_iniset database connection `database_connection_url ironic_inspector`
# FIXME(ankit) Remove this when swift supports python3
if [[ "$USE_PYTHON3" == "False" ]] && is_service_enabled swift; then
if is_service_enabled swift; then
configure_inspector_swift
fi

View File

@ -32,22 +32,6 @@
chdir: '{{ ansible_user_dir }}/workspace'
environment: '{{ zuul | zuul_legacy_vars }}'
- shell:
cmd: |
set -e
set -x
cat << 'EOF' >>"/tmp/dg-local.conf"
[[local|localrc]]
disable_service s-account
disable_service s-container
disable_service s-object
disable_service s-proxy
EOF
executable: /bin/bash
chdir: '{{ ansible_user_dir }}/workspace'
environment: '{{ zuul | zuul_legacy_vars }}'
- shell:
cmd: |
cat << 'EOF' >> ironic-extra-vars