Rename Cluster to FailoverCluster (#201)

Author: nyanhp

CHANGELOG.md

@@ -108,3 +108,6 @@ set to true when the LCM is already in ApplyAndAutoCorrect mode.
   due to an encoding issue with the psd1 file
 - Add missing documentation
 - Added Read-Only Domaincontroller Variable to AddsDomainController
+- WindowsFeatures: Include support for more elaborate lists of features, giving more control
+- Breaking Change: Cluster renamed to FailoverCluster, since FailoverClusterDsc provides Cluster resource
+  which is in conflict with the Cluster composite

RequiredModules.psd1

@@ -40,7 +40,7 @@
     xDhcpServer                  = '3.1.0'
     xDscDiagnostics              = '2.8.0'
     DnsServerDsc                 = '3.0.0'
-    xFailoverCluster             = '1.16.1'
+    FailoverClusterDsc           = '2.1.0'
     GPRegistryPolicyDsc          = '1.2.0'
     AuditPolicyDsc               = '1.4.0.0'
     SharePointDSC                = '4.8.0'

doc/Cluster.adoc doc/FailoverCluster.adocdoc/Cluster.adoc renamed to doc/FailoverCluster.adoc

@@ -1,15 +1,15 @@
 // CommonTasks YAML Reference: Cluster
 // ===================================
 
-:YmlCategory: Cluster
+:YmlCategory: FailoverCluster
 
 :abstract:    {YmlCategory} is used for the management and configuration of Windows Server Failover Cluster..
 
-[#dscyml_cluster, {YmlCategory}]
+[#dscyml_failovercluster, {YmlCategory}]
 = DSC Resource '{YmlCategory}'
 
 
-[[dscyml_cluster_abstract, {abstract}]]
+[[dscyml_failover_abstract, {abstract}]]
 {abstract}
 
 
@@ -85,7 +85,7 @@ If this is not specified then the cluster computer object must have been prestag
 This parameter is optional if the quorum type is set to `NodeMajority`.
 |
 
-| [[dscyml_cluster_disks, {YmlCategory}/Disks]]<<dscyml_cluster_disks_details, Disks>>
+| [[dscyml_failover_disks, {YmlCategory}/Disks]]<<dscyml_failover_disks_details, Disks>>
 |
 | Hashtable[]
 | Configures shared disks in a cluster.
@@ -129,8 +129,8 @@ When creating a cluster role the cluster service is creating the needed computer
 |===
 
 
-[[dscyml_cluster_disks_details]]
-.Attributes of DSC Resource '<<dscyml_cluster_disks>>'
+[[dscyml_failover_disks_details]]
+.Attributes of DSC Resource '<<dscyml_failover_disks>>'
 [cols="1,1,1,2a,1a" options="header"]
 |===
 | Parameter
@@ -146,13 +146,13 @@ When creating a cluster role the cluster service is creating the needed computer
 |
 
 | Label
-| 
+|
 | String
 | The disk label that should be assigned to the disk on the Failover Cluster disk resource.
 |
 
 | Ensure
-| 
+|
 | String
 | Define if the cluster disk should be added (`Present`) or removed.
 | - *Present* (default)
@@ -164,7 +164,7 @@ When creating a cluster role the cluster service is creating the needed computer
 .Example
 [source, yaml]
 ----
-Cluster:
+FailoverCluster:
   Name: Cluster1
   StaticIPAddress: 10.0.0.1
   IgnoreNetwork:

source/DSCResources/Cluster/Cluster.psd1 …ces/FailoverCluster/FailoverCluster.psd1source/DSCResources/Cluster/Cluster.psd1 renamed to source/DSCResources/FailoverCluster/FailoverCluster.psd1 source/DSCResources/Cluster/Cluster.psd1 renamed to source/DSCResources/FailoverCluster/FailoverCluster.psd1

@@ -1,5 +1,5 @@
 @{
-    RootModule           = 'Cluster.schema.psm1'
+    RootModule           = 'FailoverCluster.schema.psm1'
 
     ModuleVersion        = '0.0.1'
 
@@ -11,5 +11,5 @@
 
     Copyright            = 'NA'
 
-    DscResourcesToExport = @('Cluster')
+    DscResourcesToExport = @('FailoverCluster')
 }

…DSCResources/Cluster/Cluster.schema.psm1 …loverCluster/FailoverCluster.schema.psm1source/DSCResources/Cluster/Cluster.schema.psm1 renamed to source/DSCResources/FailoverCluster/FailoverCluster.schema.psm1 source/DSCResources/Cluster/Cluster.schema.psm1 renamed to source/DSCResources/FailoverCluster/FailoverCluster.schema.psm1

@@ -1,4 +1,4 @@
-configuration Cluster
+configuration FailoverCluster
 {
     param
     (
@@ -53,23 +53,23 @@ configuration Cluster
     )
 
     Import-DscResource -ModuleName PSDesiredStateConfiguration
-    Import-DscResource -ModuleName xFailoverCluster
+    Import-DscResource -ModuleName FailoverClusterDsc
     Import-DscResource -ModuleName ActiveDirectoryDsc
 
     if ($Join)
     {
-        xWaitForCluster WaitForCluster
+        WaitForCluster WaitForCluster
         {
             Name             = $Name
             RetryIntervalSec = $WaitForClusterRetryIntervalSec
             RetryCount       = $WaitForClusterRetryCount
         }
 
-        xCluster JoinSecondNodeToCluster
+        Cluster JoinSecondNodeToCluster
         {
             Name                          = $Name
             DomainAdministratorCredential = $DomainAdministratorCredential
-            DependsOn                     = '[xWaitForCluster]WaitForCluster'
+            DependsOn                     = '[WaitForCluster]WaitForCluster'
         }
     }
     else
@@ -85,12 +85,12 @@ configuration Cluster
             $parameters['IgnoreNetwork'] = $IgnoreNetwork
         }
 
-        (Get-DscSplattedResource -ResourceName xCluster -ExecutionName NewCluster -Properties $parameters -NoInvoke).Invoke($parameters)
+        (Get-DscSplattedResource -ResourceName Cluster -ExecutionName NewCluster -Properties $parameters -NoInvoke).Invoke($parameters)
     }
 
     foreach ($disk in $Disks)
     {
-        xClusterDisk $disk.Number
+        ClusterDisk $disk.Number
         {
             Number = $disk.Number
             Label  = $disk.Label
@@ -101,15 +101,15 @@ configuration Cluster
     {
         if ($QuorumType -eq 'NodeMajority')
         {
-            xClusterQuorum ClusterQuorum
+            ClusterQuorum ClusterQuorum
             {
                 IsSingleInstance = 'Yes'
                 Type             = $QuorumType
             }
         }
         elseif ($QuorumResource)
         {
-            xClusterQuorum ClusterQuorum
+            ClusterQuorum ClusterQuorum
             {
                 IsSingleInstance = 'Yes'
                 Type             = $QuorumType