fuel9 related changes

cross-node task dependency
options filter fixes

Change-Id: Ifb0df0802a4be80e0a3e3c408d7a1e72795e9d32

deployment_tasks.yaml

@@ -120,7 +120,7 @@
 #  role: [scaleio-storage-tier1, scaleio-storage-tier2]
   role: [primary-controller, controller, compute]
   required_for: [post_deployment_end]
-  requires: [scaleio-gateway-server]
+  requires: [scaleio-gateway-server, scaleio-environment-existing-mdm-ips]
   type: puppet
   parameters:
     puppet_manifest: puppet/manifests/sds_server.pp
@@ -129,7 +129,7 @@
     
 - id: scaleio-sdc-server
   required_for: [post_deployment_end]
-  requires: [scaleio-sds-server]
+  requires: [scaleio-sds-server, scaleio-environment-existing-mdm-ips]
   role: [compute, cinder]
   type: puppet
   parameters:
@@ -151,6 +151,9 @@
   role: [primary-controller, controller]
   required_for: [post_deployment_end]
   requires: [scaleio-sdc]
+  cross-depends:
+    - name: scaleio-sds-server
+    - name: scaleio-sdc
   type: puppet
   parameters:
     puppet_manifest: puppet/manifests/cluster.pp
@@ -165,6 +168,8 @@
   required_for: [post_deployment_end]
   requires: [scaleio-configure-cluster]
   role: [compute]
+  cross-depends:
+    - name: scaleio-configure-cluster
   type: puppet
   parameters:
     puppet_manifest: puppet/manifests/nova.pp
@@ -174,6 +179,8 @@
 - id: scaleio-cinder
   required_for: [post_deployment_end]
   requires: [scaleio-configure-cluster]
+  cross-depends:
+    - name: scaleio-configure-cluster
   role: [cinder]
   type: puppet
   parameters:

environment_config.yaml

@@ -96,7 +96,7 @@ attributes:
       source: '^(\w+){1}((,){1}(?=\w+))*'
       error: "Can contain characters, numbers and underlines"
     restrictions:
-      - condition: "settings:scaleio.existing_cluster.value == true or cluster:fuel_version == '9.0'"
+      - condition: "settings:scaleio.existing_cluster.value == true or cluster:fuel_version == '10.0'"
         action: hide
 
   existing_storage_pools:
@@ -122,7 +122,7 @@ attributes:
       source: '^(/[a-zA-Z0-9:-_]+)+(,(/[a-zA-Z0-9:-_]+)+)*$'
       error: 'List of path is incorrect. It is comma separated list aka /dev/sdb,/dev/sdc'
     restrictions:
-      - condition: "settings:scaleio.existing_cluster.value == true or cluster:fuel_version == '9.0'"
+      - condition: "settings:scaleio.existing_cluster.value == true or cluster:fuel_version == '10.0'"
         action: hide
 
   sds_on_controller:
@@ -132,7 +132,7 @@ attributes:
     description: "Setup SDS-es on controller nodes."
     weight: 105
     restrictions:
-      - condition: "settings:scaleio.existing_cluster.value == true or cluster:fuel_version == '9.0'"
+      - condition: "settings:scaleio.existing_cluster.value == true or cluster:fuel_version == '10.0'"
         action: hide
 
   provisioning_type:
@@ -208,7 +208,7 @@ attributes:
       source: '^(/[a-zA-Z0-9:-_]+)*(,(/[a-zA-Z0-9:-_]+)+)*$'
       error: 'List of path is incorrect. It could be either empty or the comma separated list e.g. /dev/sdb,/dev/sdc'
     restrictions:
-      - condition: "settings:scaleio.existing_cluster.value == true or cluster:fuel_version == '9.0'"
+      - condition: "settings:scaleio.existing_cluster.value == true or cluster:fuel_version == '10.0'"
         action: hide
 
   cached_storage_pools:
@@ -221,7 +221,7 @@ attributes:
       source: '^(\w+)*((,){1}(?=\w+))*'
       error: 'List of storage pools incorrect. It could be either empty or the comma separated list e.g. pool1,pool2'
     restrictions:
-      - condition: "settings:scaleio.existing_cluster.value == true or cluster:fuel_version == '9.0'"
+      - condition: "settings:scaleio.existing_cluster.value == true or cluster:fuel_version == '10.0'"
         action: hide
 
   capacity_high_alert_threshold: