Test swift python3 support
Change-Id: I22766ea3f96c2b0911e1fa3219fab5411fa2b5fc
This commit is contained in:
parent
5bfba3852d
commit
4f2f4d8f70
|
@ -267,8 +267,7 @@ function configure_inspector {
|
||||||
inspector_iniset iptables dnsmasq_interface $IRONIC_INSPECTOR_INTERFACE
|
inspector_iniset iptables dnsmasq_interface $IRONIC_INSPECTOR_INTERFACE
|
||||||
inspector_iniset database connection `database_connection_url ironic_inspector`
|
inspector_iniset database connection `database_connection_url ironic_inspector`
|
||||||
|
|
||||||
# FIXME(ankit) Remove this when swift supports python3
|
if is_service_enabled swift; then
|
||||||
if [[ "$USE_PYTHON3" == "False" ]] && is_service_enabled swift; then
|
|
||||||
configure_inspector_swift
|
configure_inspector_swift
|
||||||
fi
|
fi
|
||||||
|
|
||||||
|
|
|
@ -32,22 +32,6 @@
|
||||||
chdir: '{{ ansible_user_dir }}/workspace'
|
chdir: '{{ ansible_user_dir }}/workspace'
|
||||||
environment: '{{ zuul | zuul_legacy_vars }}'
|
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:
|
- shell:
|
||||||
cmd: |
|
cmd: |
|
||||||
cat << 'EOF' >> ironic-extra-vars
|
cat << 'EOF' >> ironic-extra-vars
|
||||||
|
|
Loading…
Reference in New Issue