Add possibility to specify multiple disks for salt.control formula

Example:

parameters:
  salt:
    control:
      size: #RAM 4096,8192,16384,32768,65536
        openstack.control:
          cpu: 8
          ram: 32768
          disk_profile: small_two_disks
          net_profile: default

  virt:
    disk:
      small_two_disks:
        - system:
            size: 50000
            image: http:/path/to/image.qcow2
        - cinder-volume:
            size: 50000

Change-Id: Ie092b77627cb2b1d36ba4b7a2a7d749ad91881c8
diff --git a/tests/pillar/control_virt.sls b/tests/pillar/control_virt.sls
index e84c5dd..7587594 100644
--- a/tests/pillar/control_virt.sls
+++ b/tests/pillar/control_virt.sls
@@ -1,3 +1,14 @@
+virt:
+  disk:
+    three_disks:
+      - system:
+          size: 4096
+          image: ubuntu.qcow
+      - repository_snapshot:
+          size: 8192
+          image: snapshot.qcow
+      - cinder-volume:
+          size: 2048
 salt:
   minion:
     enabled: true
@@ -16,6 +27,10 @@
       large:
         cpu: 4
         ram: 8
+      medium_three_disks:
+        cpu: 2
+        ram: 4
+        disk_profile: three_disks
     cluster:
       vpc20_infra:
         domain: neco.virt.domain.com
@@ -32,3 +47,7 @@
             provider: node02.domain.com
             image: bubuntu.qcomw
             size: small
+          ubuntu3:
+            provider: node03.domain.com
+            image: meowbuntu.qcom2
+            size: medium_three_disks