Merge pull request #58 from raspbeguy/rbd-fix

network storage fix

Author: markgoddard

README.md

@@ -103,8 +103,8 @@ Role Variables
           `libvirt_volume_default_device` are valid here. Default is
           `libvirt_volume_default_type`.
         - `capacity`: volume capacity, can be suffixed with k, M, G, T, P or E when type is `network` or MB,GB,TB, etc when type is `disk` (required when type is `disk` or `network`)
-        - `auth`: Authentication details should they be required. If auth is required, `name`, `type`, `token` will need to be supplied.
-        - `source`: Where the remote volume comes from when type is `network`. `protocol`, `name`, `hostname` and `port` should be supplied.
+        - `auth`: Authentication details should they be required. If auth is required, `username`, `type`, and `uuid` or `usage` will need to be supplied. `uuid` and `usage` should not be both supplied.
+        - `source`: Where the remote volume comes from when type is `network`. `protocol`, `name` and `hosts_list` should be supplied. `port` is optional.
         - `format`: Format of the volume. All options for
           `libvirt_volume_default_format` are valid here. Default is
           `libvirt_volume_default_format`.
@@ -199,14 +199,17 @@ Example Playbook
                   format: 'raw'
                   capacity: '50G'
                   auth:
-                    name: 'admin'
+                    username: 'admin'
                     type: 'ceph'
-                    token: ''
+                    usage: 'rbd-pool'
                   source:
                     protocol: 'rbd'
-                    name: 'rbd/bigstore'
-                    hostname: 'ceph.example.org'
-                    port: '6789'
+                    name: 'rbd/volume'
+                    hosts_list:
+                      - 'mon1.example.org'
+                      - 'mon2.example.org'
+                      - 'mon3.example.org'
+ 
               interfaces:
                 - network: 'br-datacentre'
 

tasks/volumes.yml

@@ -27,7 +27,7 @@
     {% endif %}
     -a {{ ansible_check_mode }}
   with_items: "{{ volumes }}"
-  when: item.type | default(libvirt_volume_default_type) in ['volume', 'network']
+  when: item.type | default(libvirt_volume_default_type) == 'volume'
   environment: "{{ libvirt_vm_script_env }}"
   register: volume_result
   changed_when:

templates/vm.xml.j2

@@ -41,14 +41,16 @@
       {% if volume.type | default(libvirt_volume_default_type) == 'file' %}
       <source file='{{ volume.file_path |default(libvirt_volume_default_images_path) }}/{{ volume.name}}'/>
       {% elif volume.type is defined and volume.type == 'network' %}
-        {% if volume.auth.name is defined %}
-        <auth username='{{ volume.auth.name }}'>
-          <secret type='{{ volume.auth.type }}' uuid='{{ volume.auth.token }}'/>
+        {% if volume.auth.username is defined %}
+        <auth username='{{ volume.auth.username }}'>
+          <secret type='{{ volume.auth.type }}' {% if volume.auth.uuid is defined and volume.auth.uuid is not none %} uuid='{{ volume.auth.uuid }}' {% else %} usage='{{ volume.auth.usage }}' {% endif %}/>
         </auth>
-        {% endif %} {# End volume.auth.name check #}
+        {% endif %} {# End volume.auth.username check #}
         {% if volume.source.name is defined %}
         <source protocol='{{ volume.source.protocol }}' name='{{ volume.source.name }}'>
-          <host name='{{ volume.source.hostname }}' port='{{ volume.source.port }}'/>
+          {% for host in volume.source.hosts_list %}
+          <host name='{{ host }}' {% if volume.source.port is defined and volume.source.port is not none %} port='{{ volume.source.port }}' {% endif %}/>
+          {% endfor %}
         </source>
         {% endif %} {# End volume.source.name check #}
       {% else %} {# End elif volume.type is defined #}