Use single venv for nodepool services

To help simplify our install process, move nodepool services into a
single venv. This helps avoid the issue where nodepool-builder and
nodepool-launcher ansible groups could run different versions.

Change-Id: Ieda5c88069af6bfbe02812b68abf097ae65b8cea
Signed-off-by: Paul Belanger <pabelanger@redhat.com>

playbooks/group_vars/nodepool-builder.yaml

@@ -14,13 +14,13 @@
 ---
 # windmill.diskimage-builder
 diskimage_builder_pip_virtualenv_python: python3
-diskimage_builder_pip_virtualenv: /opt/venv/nodepool-builder
+diskimage_builder_pip_virtualenv: /opt/venv/nodepool
 
 # 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_pip_virtualenv: /opt/venv/nodepool
 
 nodepool_file_nodepool_launcher_service_config_manage: false
 nodepool_file_nodepool_launcher_service_manage: false
@@ -28,7 +28,7 @@ nodepool_service_nodepool_launcher_manage: false
 
 # windmill.shade
 shade_pip_virtualenv_python: python3
-shade_pip_virtualenv: /opt/venv/nodepool-builder
+shade_pip_virtualenv: /opt/venv/nodepool
 
 # openstack.logrotate
 logrotate_configs:

playbooks/group_vars/nodepool-launcher.yaml

@@ -16,7 +16,7 @@
 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_pip_virtualenv: /opt/venv/nodepool
 
 nodepool_file_nodepool_builder_service_config_manage: false
 nodepool_file_nodepool_builder_service_manage: false
@@ -24,7 +24,7 @@ nodepool_service_nodepool_builder_manage: false
 
 # windmill.shade
 shade_pip_virtualenv_python: python3
-shade_pip_virtualenv: /opt/venv/nodepool-launcher
+shade_pip_virtualenv: /opt/venv/nodepool
 
 # openstack.logrotate
 logrotate_configs:

playbooks/roles/test.nodepool-builder/tasks/main.yaml

@@ -12,12 +12,12 @@
 # License for the specific language governing permissions and limitations
 # under the License.
 ---
-- name: Register /opt/venv/nodepool-builder
+- name: Register /opt/venv/nodepool
   stat:
-    path: /opt/venv/nodepool-builder
+    path: /opt/venv/nodepool
   register: test_nodepool_pip_virtualenv_stat
 
-- name: Assert /opt/venv/nodepool-builder tests
+- name: Assert /opt/venv/nodepool tests
   assert:
     that:
       - test_nodepool_pip_virtualenv_stat.stat.exists
@@ -40,7 +40,7 @@
 - name: Validate /etc/nodepool/nodepool.yaml
   become: yes
   become_user: nodepool
-  command: /opt/venv/nodepool-builder/bin/nodepool -c /etc/nodepool/nodepool.yaml config-validate
+  command: /opt/venv/nodepool/bin/nodepool -c /etc/nodepool/nodepool.yaml config-validate
 
 - name: Ensure nodepool-builder is running
   become: yes

playbooks/roles/test.nodepool-launcher/tasks/main.yaml

@@ -12,12 +12,12 @@
 # License for the specific language governing permissions and limitations
 # under the License.
 ---
-- name: Register /opt/venv/nodepool-launcher
+- name: Register /opt/venv/nodepool
   stat:
-    path: /opt/venv/nodepool-launcher
+    path: /opt/venv/nodepool
   register: test_nodepool_pip_virtualenv_stat
 
-- name: Assert /opt/venv/nodepool-launcher tests
+- name: Assert /opt/venv/nodepool tests
   assert:
     that:
       - test_nodepool_pip_virtualenv_stat.stat.exists
@@ -26,7 +26,7 @@
 - name: Validate /etc/nodepool/nodepool.yaml
   become: yes
   become_user: nodepool
-  command: /opt/venv/nodepool-launcher/bin/nodepool -c /etc/nodepool/nodepool.yaml config-validate
+  command: /opt/venv/nodepool/bin/nodepool -c /etc/nodepool/nodepool.yaml config-validate
 
 - name: Ensure nodepool-launcher is running
   become: yes

playbooks/roles/test.prove/files/test_dib_image_list.sh

@@ -15,6 +15,6 @@
 IMAGE=$1
 STATUS=$2
 
-VENV=/opt/venv/nodepool-builder
+VENV=/opt/venv/nodepool
 
 $VENV/bin/nodepool dib-image-list | awk '{print $2,$10;}' | grep $IMAGE | grep $STATUS