Merge "Remove Python 2 leftovers"

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 %}

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

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

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: