windmill
/
windmill
Code Issues Proposed changes

Switch nodepool / shade / diskimage-builder to python3 

All three now are python3 compatible, so default to running them as
such.

Change-Id: I556b1cfa6a39284f19b22a9a6da121c2e02d3bc2
Depends-On: I2e544f8bdd48cdbdb973dec844a2a9b56c473aae
Depends-On: Id2505dfd949e72f603f3db692a7dbc59912b1b59
Signed-off-by: Paul Belanger <pabelanger@redhat.com>
This commit is contained in:
Paul Belanger 2017-05-30 14:33:21 -04:00
parent 3295c2c597
commit f1456fe5dc
No known key found for this signature in database
GPG Key ID: 611A80832067AF38
3 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
playbooks/group_vars/nodepool-builder.yaml
View File

@ -13,11 +13,13 @@
# under the License.
---
# windmill.diskimage-builder
diskimage_builder_pip_virtualenv_python: python3
diskimage_builder_pip_virtualenv: /opt/venv/nodepool-builder
# windmill.nodepool
nodepool_file_nodepool_builder_service_config_src: nodepool-builder/etc/systemd/system/nodepool-builder.service.d/override.conf.j2
nodepool_pip_virtualenv_python: python3
nodepool_pip_virtualenv: /opt/venv/nodepool-builder
nodepool_file_nodepool_launcher_service_config_manage: false
@ -25,6 +27,7 @@ nodepool_file_nodepool_launcher_service_manage: false
nodepool_service_nodepool_launcher_manage: false
# windmill.shade
shade_pip_virtualenv_python: python3
shade_pip_virtualenv: /opt/venv/nodepool-builder
# openstack.logrotate

2
playbooks/group_vars/nodepool-launcher.yaml
View File

@ -15,6 +15,7 @@
# windmill.nodepool
nodepool_file_nodepool_launcher_service_config_src: nodepool-launcher/etc/systemd/system/nodepool-launcher.service.d/override.conf.j2
nodepool_pip_virtualenv_python: python3
nodepool_pip_virtualenv: /opt/venv/nodepool-launcher
nodepool_file_nodepool_builder_service_config_manage: false
@ -22,6 +23,7 @@ nodepool_file_nodepool_builder_service_manage: false
nodepool_service_nodepool_builder_manage: false
# windmill.shade
shade_pip_virtualenv_python: python3
shade_pip_virtualenv: /opt/venv/nodepool-launcher
# openstack.logrotate

2
tox.ini
View File

@ -36,7 +36,7 @@ commands =
{toxinidir}/tools/install_bindep.sh
{toxinidir}/tools/install_roles.sh
# NOTE(pabelanger): Because ansible default ansible_user to null now, we need to pass it via CLI.
ansible-playbook -i playbooks/inventory playbooks/site.yaml -e ansible_user={env:USER} {posargs}
ansible-playbook -i playbooks/inventory playbooks/site.yaml -vv -e ansible_user={env:USER} {posargs}
passenv =
HOME
SSH_AUTH_SOCK