diff --git a/ansible/group_vars/all b/ansible/group_vars/all index 37a59ca..8046a17 100644 --- a/ansible/group_vars/all +++ b/ansible/group_vars/all @@ -5,6 +5,6 @@ virtualenv_path: "{{ '/'.join([ansible_facts.env['HOME'], 'tenks-venv']) }}" # The URL of the upper constraints file to pass to pip when installing Python # packages. -# NOTE: Python 2 support dropped in Ussuri, Python 3.6 support dropped in Zed. +# NOTE: Python 3.6 support dropped in Zed. python_upper_constraints_url: >- - https://releases.openstack.org/constraints/upper/{% if ansible_facts.python.version.major == 2 %}train{% elif ansible_facts.python.version.minor <= 6 %}yoga{% else %}master{% endif %} + https://releases.openstack.org/constraints/upper/{% if ansible_facts.python.version.minor <= 6 %}yoga{% else %}master{% endif %} diff --git a/ansible/group_vars/hypervisors b/ansible/group_vars/hypervisors index f5024c6..b5bbd4f 100644 --- a/ansible/group_vars/hypervisors +++ b/ansible/group_vars/hypervisors @@ -4,7 +4,7 @@ physnet_mappings: {} system_requirements: - - "python{% if ansible_facts.python.version.major == 3 %}3{% endif %}-virtualenv" + - "python3-virtualenv" # Tenks bridge type. Options are "openvswitch", "linuxbridge". Default is # "openvswitch". Note that this relates to bridges created by Tenks, not the diff --git a/ansible/roles/virtualbmc-daemon/tasks/main.yml b/ansible/roles/virtualbmc-daemon/tasks/main.yml index 15a90dc..8324ff8 100644 --- a/ansible/roles/virtualbmc-daemon/tasks/main.yml +++ b/ansible/roles/virtualbmc-daemon/tasks/main.yml @@ -29,7 +29,7 @@ - name: Ensure Python requirements are installed pip: name: - - "virtualbmc>=1.4.0{% if ansible_facts.python.version.major == 2 %},<2{% endif %}" + - "virtualbmc>=1.4.0" # NOTE(priteau): Ignore PyYAML when installing system-wide to avoid the # following error: Cannot uninstall 'PyYAML'. It is a distutils installed # project and thus we cannot accurately determine which files belong to it diff --git a/playbooks/tenks-deploy-teardown/pre.yml b/playbooks/tenks-deploy-teardown/pre.yml index d0d472b..7744b4e 100644 --- a/playbooks/tenks-deploy-teardown/pre.yml +++ b/playbooks/tenks-deploy-teardown/pre.yml @@ -23,7 +23,6 @@ become: true package: name: python3 - when: ansible_facts.python.version.major == 3 - name: Create virtualenv for tenks pip: