Continue refactoring role for UCI

Author: fabiendupont

Diff for: ansible/manageiq.v2v-conversion-host/tasks/check-transport-vddk-facts.yml

@@ -5,22 +5,6 @@
   ignore_errors: "yes"
   register: stat_vddk_library
 
-- name: Stat VDDK nbdkit plugin
-  stat:
-    path: "/usr/lib64/nbdkit/plugins/nbdkit-vddk-plugin.so"
-  ignore_errors: "yes"
-  register: stat_nbdkit_plugin
-
-- name: Check if VDDK nbdkit plugin works
-  command: nbdkit --dump-plugin vddk
-  environment:
-    LD_LIBRARY_PATH: "{{ v2v_vddk_install_dir }}/vmware-vix-disklib-distrib/lib64"
-  ignore_errors: "yes"
-  register: command_nbdkit_plugin
-  changed_when: false
-
-- name: Set VDDK and nbdkit facts
+- name: Set VDDK facts
   set_fact:
     v2v_vddk_library_installed: "{{ stat_vddk_library.stat.exists }}"
-    v2v_nbdkit_plugin_installed: "{{ stat_nbdkit_plugin.stat.exists }}"
-    v2v_nbdkit_plugin_working: "{{ command_nbdkit_plugin.rc == 0 }}"

Diff for: ansible/manageiq.v2v-conversion-host/tasks/check-transport-vddk.yml

@@ -5,13 +5,3 @@
   assert:
     that: "{{ v2v_vddk_library_installed }}"
     msg: "VDDK library is not installed"
-
-- name: Assert that VDDK nbdkit plugin is installed
-  assert:
-    that: "{{ v2v_nbdkit_plugin_installed }}"
-    msg: "VDDK nbdkit plugin is not installed"
-
-- name: Assert that VDDK nbdkit plugin test succeeded
-  assert:
-    that: "{{ v2v_nbdkit_plugin_working }}"
-    msg: "VDDK nbdkit plugin failed validation"

Diff for: ansible/manageiq.v2v-conversion-host/tasks/install-transport-ssh.yml

@@ -1,46 +1,31 @@
 ---
-- name: Set facts ssh_config_path, ssh_config_owner
-  set_fact:
-    ssh_config_path: "/var/lib/vdsm/.ssh"
-    ssh_config_owner: "vdsm"
-    ssh_config_group: "kvm"
-  when:
-    - "v2v_host_type == 'rhevm'"
-
-- name: Set facts ssh_config_path, ssh_config_owner
-  set_fact:
-    ssh_config_path: "/root/.ssh"
-    ssh_config_owner: "root"
-    ssh_config_group: "root"
-  when:
-    - "v2v_host_type == 'openstack'"
-
 - name: Look for existing SSH private key file
   stat:
-    path: "{{ ssh_config_path }}/id_rsa"
+    path: "/root/.ssh/id_rsa"
   ignore_errors: "yes"
   register: stat_ssh_key
 
 - block:
     - name: Check var v2v_ssh_private_key
       fail:
-        msg: "No file named '{{ ssh_config_path }}/id_rsa' found and no 'v2v_ssh_private_key' variable set"
+        msg: "No file named '/root/.ssh/id_rsa' found and no 'v2v_ssh_private_key' variable set"
       when:
         - "v2v_ssh_private_key is not defined"
 
     - name: Create .ssh directory
       file:
-        path: "{{ ssh_config_path }}"
-        owner: "{{ ssh_config_owner }}"
-        group: "{{ ssh_config_group }}"
+        path: "/root/.ssh"
+        owner: "root"
+        group: "root"
         mode: 0700
         state: directory
 
     - name: Create the SSH private key file
       copy:
-        dest: "{{ ssh_config_path }}/id_rsa"
+        dest: "/root/.ssh/id_rsa"
         content: "{{ v2v_ssh_private_key }}"
-        owner: "{{ ssh_config_owner }}"
+        owner: "root"
+        group: "root"
         mode: 0600
 
   when: not stat_ssh_key.stat.exists

Diff for: ansible/manageiq.v2v-conversion-host/tasks/install-transport-vddk.yml

@@ -28,11 +28,4 @@
         remote_src: true
 
   when:
-    - not v2v_vddk_library_installed or
-      not v2v_nbdkit_plugin_installed or
-      not v2v_nbdkit_plugin_working
-
-- name: Make sure VDDK plugin is installed
-  yum:
-    state: "{{ v2v_yum_check }}"
-    name: nbdkit-plugin-vddk
+    - not v2v_vddk_library_installed

Diff for: ansible/manageiq.v2v-conversion-host/tasks/uninstall-transport-ssh.yml

@@ -1,13 +1,7 @@
 ---
-- name: Set facts ssh_config_path, ssh_config_owner
-  set_fact:
-    ssh_config_path: "/root/.ssh"
-    ssh_config_owner: "root"
-
 - name: Delete SSH private key file for VMware host
   file:
-    path: "{{ ssh_config_path }}/id_rsa"
+    path: "/root/.ssh/id_rsa"
     state: absent
   when:
     - "v2v_ssh_private_key is defined"
-    - "ssh_config_path is defined"

Diff for: docs/Ansible.md

@@ -6,14 +6,12 @@ to be changed.
 
 | Variable                       | Default value | Description                                                                                                                   |
 | -----------------------------  | ------------- | ----------------------------------------------------------------------------------------------------------------------------- |
-| v2v_host_type                  |               | Platform where the conversion host is deployed. Valid values: `rhevm`, `openstack`.                                           |
 | v2v_transport_method           |               | Transport method to configure on the conversion host. Valid values: `vddk`, 'ssh`.                                            |
 | v2v_vddk_package_url           |               | URL to the VDDK library package.                                                                                              |
 | v2v_vddk_override              | false         | Normally the install role is not run if the plugin is already installed. To force the deployment set this variable to `true`. |
 | v2v_ssh_private_key            |               | The private key to use to connect to the VMware host.                                                                         |
 | v2v_ca_bundle                  |               | A bundle of CA certificates to allow connection to the provider where the conversion host belongs. See below for value.       |
 | v2v_checks_override            | false         | The install role does performs some compatibility checks. By setting `v2v_checks_override` to `true` one can disable them.    |
-| v2v_yum_check                  | latest        | Can be used to change the requirement on installed packages. Normally we check if the installed packages are at the latest version. This can cause troubles on disconnected or unconfigured systems. In that case the check can be ... by setting the value to `present`. (Since 1.7) |
 
 ## CA Bundle
 
@@ -32,10 +30,8 @@ all:
   vars:
   hosts:
     chost1.example.com:
-      v2v_host_type: rhevm
       v2v_transport_method: vddk
     chost2.example.com:
-      v2v_host_type: openstack
       v2v_transport_method: ssh
   vars:
     v2v_vddk_package_url: "http://content.example.com/VMware-vix-disklib-6.5.2-6195444.x86_64.tar.gz"