Install cloud requirements to the existing venv

config.cfg

@@ -18,9 +18,6 @@ pki_in_tmpfs: true
 # If True re-init all existing certificates. Boolean
 keys_clean_all: False
 
-# Clean up cloud python environments
-clean_environment: false
-
 # Deploy StrongSwan to enable IPsec support
 ipsec_enabled: true
 

roles/cloud-azure/defaults/main.yml

@@ -1,5 +1,4 @@
 ---
-azure_venv: "{{ playbook_dir }}/configs/.venvs/azure"
 _azure_regions: >
   [
     {

roles/cloud-azure/tasks/main.yml

@@ -2,7 +2,6 @@
 - name: Build python virtual environment
   import_tasks: venv.yml
 
-- block:
 - name: Include prompts
   import_tasks: prompts.yml
 
@@ -37,5 +36,3 @@
 - set_fact:
     cloud_instance_ip: "{{ azure_rm_deployment.deployment.outputs.publicIPAddresses.value }}"
     ansible_ssh_user: ubuntu
-  environment:
-    PYTHONPATH: "{{ azure_venv }}/lib/python2.7/site-packages/"

roles/cloud-azure/tasks/venv.yml

@@ -1,10 +1,4 @@
 ---
-- name: Clean up the environment
-  file:
-    dest: "{{ azure_venv }}"
-    state: absent
-  when: clean_environment
-
 - name: Install requirements
   pip:
     name:
@@ -45,5 +39,4 @@
       - azure-mgmt-devtestlabs==3.0.0
       - azure-mgmt-loganalytics==0.2.0
     state: latest
-    virtualenv: "{{ azure_venv }}"
+    virtualenv_python: python3
-    virtualenv_python: python2.7

roles/cloud-cloudstack/defaults/main.yml

@@ -1,2 +0,0 @@
----
-cloudstack_venv: "{{ playbook_dir }}/configs/.venvs/cloudstack"

roles/cloud-cloudstack/tasks/main.yml

@@ -60,7 +60,6 @@
           cloud_instance_ip: "{{ cs_server.default_ip }}"
           ansible_ssh_user: ubuntu
       environment:
-        PYTHONPATH: "{{ cloudstack_venv }}/lib/python2.7/site-packages/"
         CLOUDSTACK_CONFIG: "{{ algo_cs_config }}"
         CLOUDSTACK_REGION: "{{ algo_cs_region }}"
 

roles/cloud-cloudstack/tasks/venv.yml

@@ -1,15 +1,8 @@
 ---
-- name: Clean up the environment
-  file:
-    dest: "{{ cloudstack_venv }}"
-    state: absent
-  when: clean_environment
-
 - name: Install requirements
   pip:
     name:
       - cs
       - sshpubkeys
     state: latest
-    virtualenv: "{{ cloudstack_venv }}"
+    virtualenv_python: python3
-    virtualenv_python: python2.7

roles/cloud-ec2/defaults/main.yml

@@ -4,5 +4,4 @@ encrypted: "{{ cloud_providers.ec2.encrypted }}"
 ec2_vpc_nets:
   cidr_block: 172.16.0.0/16
   subnet_cidr: 172.16.254.0/23
-ec2_venv: "{{ playbook_dir }}/configs/.venvs/aws"
 existing_eip: ""

roles/cloud-ec2/tasks/main.yml

@@ -2,7 +2,6 @@
 - name: Build python virtual environment
   import_tasks: venv.yml
 
-- block:
 - name: Include prompts
   import_tasks: prompts.yml
 
@@ -32,5 +31,3 @@
 - set_fact:
     cloud_instance_ip: "{{ stack.stack_outputs.ElasticIP }}"
     ansible_ssh_user: ubuntu
-  environment:
-    PYTHONPATH: "{{ ec2_venv }}/lib/python2.7/site-packages/"

roles/cloud-ec2/tasks/venv.yml

@@ -1,15 +1,8 @@
 ---
-- name: Clean up the environment
-  file:
-    dest: "{{ ec2_venv }}"
-    state: absent
-  when: clean_environment
-
 - name: Install requirements
   pip:
     name:
       - boto>=2.5
       - boto3
     state: latest
-    virtualenv: "{{ ec2_venv }}"
+    virtualenv_python: python3
-    virtualenv_python: python2.7

roles/cloud-gce/defaults/main.yml

@@ -1,2 +0,0 @@
----
-gce_venv: "{{ playbook_dir }}/configs/.venvs/gce"

roles/cloud-gce/tasks/venv.yml

@@ -5,3 +5,4 @@
       - requests>=2.18.4
       - google-auth>=1.3.0
     state: latest
+    virtualenv_python: python3

roles/cloud-hetzner/defaults/main.yml

@@ -1,2 +0,0 @@
----
-hetzner_venv: "{{ playbook_dir }}/configs/.venvs/hetzner"

roles/cloud-hetzner/tasks/main.yml

@@ -2,7 +2,6 @@
 - name: Build python virtual environment
   import_tasks: venv.yml
 
-- block:
 - name: Include prompts
   import_tasks: prompts.yml
 
@@ -30,5 +29,3 @@
 - set_fact:
     cloud_instance_ip: "{{ hcloud_server.hcloud_server.ipv4_address }}"
     ansible_ssh_user: root
-  environment:
-    PYTHONPATH: "{{ hetzner_venv }}/lib/python2.7/site-packages/"

roles/cloud-hetzner/tasks/venv.yml

@@ -1,14 +1,7 @@
 ---
-- name: Clean up the environment
-  file:
-    dest: "{{ hetzner_venv }}"
-    state: absent
-  when: clean_environment
-
 - name: Install requirements
   pip:
     name:
       - hcloud
     state: latest
-    virtualenv: "{{ hetzner_venv }}"
+    virtualenv_python: python3
-    virtualenv_python: python2.7

roles/cloud-lightsail/defaults/main.yml

@@ -1,2 +0,0 @@
----
-lightsail_venv: "{{ playbook_dir }}/configs/.venvs/aws"

roles/cloud-lightsail/tasks/main.yml

@@ -2,7 +2,6 @@
 - name: Build python virtual environment
   import_tasks: venv.yml
 
-- block:
 - name: Include prompts
   import_tasks: prompts.yml
 
@@ -40,5 +39,3 @@
 - set_fact:
     cloud_instance_ip: "{{ algo_instance['instance']['public_ip_address'] }}"
     ansible_ssh_user: ubuntu
-  environment:
-    PYTHONPATH: "{{ lightsail_venv }}/lib/python2.7/site-packages/"

roles/cloud-lightsail/tasks/venv.yml

@@ -1,15 +1,8 @@
 ---
-- name: Clean up the environment
-  file:
-    dest: "{{ lightsail_venv }}"
-    state: absent
-  when: clean_environment
-
 - name: Install requirements
   pip:
     name:
       - boto>=2.5
       - boto3
     state: latest
-    virtualenv: "{{ lightsail_venv }}"
+    virtualenv_python: python3
-    virtualenv_python: python2.7

roles/cloud-openstack/defaults/main.yml

@@ -1,2 +0,0 @@
----
-openstack_venv: "{{ playbook_dir }}/configs/.venvs/openstack"

roles/cloud-openstack/tasks/main.yml

@@ -6,7 +6,6 @@
 - name: Build python virtual environment
   import_tasks: venv.yml
 
-- block:
 - name: Security group created
   os_security_group:
     state: "{{ state|default('present') }}"
@@ -78,5 +77,3 @@
 - set_fact:
     cloud_instance_ip: "{{ os_server['openstack']['public_v4'] }}"
     ansible_ssh_user: ubuntu
-  environment:
-    PYTHONPATH: "{{ openstack_venv }}/lib/python2.7/site-packages/"

roles/cloud-openstack/tasks/venv.yml

@@ -1,13 +1,6 @@
 ---
-- name: Clean up the environment
-  file:
-    dest: "{{ openstack_venv }}"
-    state: absent
-  when: clean_environment
-
 - name: Install requirements
   pip:
     name: shade
     state: latest
-    virtualenv: "{{ openstack_venv }}"
+    virtualenv_python: python3
-    virtualenv_python: python2.7