Citrix Files

aws-quickstart · Sep 19, 2018 · 6055bc1 · 6055bc1
1 parent 8e93735
commit 6055bc1
Show file tree

Hide file tree

Showing 8 changed files with 46 additions and 15 deletions.
diff --git a/.DS_Store b/.DS_Store
diff --git a/modules/Citrix.zip b/modules/Citrix.zip
diff --git a/modules/cwcXenDesktop/cwcXenDesktop.psm1 b/modules/cwcXenDesktop/cwcXenDesktop.psm1
@@ -394,15 +394,18 @@ function Install-VdaServer {
         [Parameter(Position=9,Mandatory=$false)] [switch]$EnableRemoteAssistance=$false,
         [Parameter(Position=10,Mandatory=$false)] [switch]$MasterImage=$false,
         [Parameter(Position=11,Mandatory=$false)] [switch]$EnableRemoteManagement=$false,
-		[Parameter(Position=12,Mandatory=$false)] [string]$ExcludedPackages = $null
+        [Parameter(Position=12,Mandatory=$false)] [string]$ExcludedPackages = $null,
+        # [Parameter(Position=12,Mandatory=$false)] [string]$InstallCitrixFilesForWindows=$true
+        [Parameter(Position=12,Mandatory=$false)] [string]$IncludeAdditional = $null
     )            
     # Get args for installing the VDA Server.
     $installargs = cwcXenDesktop\Get-VDAInstallArgs -InstallVDAWorkstation:$false -InstallPvd:$InstallPvd `
                                       -InstallPlugin:$InstallPlugin -EnableHDXPorts:$EnableHDXPorts `
                                       -Reboot:$Reboot -LogPath $LogPath `
                                       -Controllers $Controllers -UseIbizaVdaArgs:$false -EnableRemoteAssistance:$EnableRemoteAssistance `
                                       -MasterImage:$MasterImage -InstallVDAServer:$InstallVDAServer -XAServerLocation $XAServerLocation `
-                                      -EnableRemoteManagement:$EnableRemoteManagement -ExcludedPackages:$ExcludedPackages
+                                      -EnableRemoteManagement:$EnableRemoteManagement -ExcludedPackages:$ExcludedPackages -IncludeAdditional:$IncludeAdditional
+                                    #   -InstallCitrixFilesForWindows:$InstallCitrixFilesForWindows
     If ($Reboot){
         $expectedExitCode = 0 # reboot expected to be handled by the installer, in this case windows is shutting down 
                               # the process -Wait flag is set to not wait and return 0 immediately for test driven reboot
@@ -477,8 +480,9 @@ function Get-VDAInstallArgs {
         [Parameter(Position=12,Mandatory=$false)] [switch]$EnableRemoteManagement,
         [Parameter(Position=13,Mandatory=$false)] [string]$ExcludedPackages = $null,
         [Parameter(Position=14,Mandatory=$false)] [switch]$UseXenAppBranding = $false,
-        [Parameter(Position=15,Mandatory=$false)] [string]$InstallDir        
-
+        [Parameter(Position=15,Mandatory=$false)] [string]$InstallDir,        
+        # [Parameter(Position=16,Mandatory=$false)] [string]$InstallCitrixFilesForWindows   
+        [Parameter(Position=16,Mandatory=$false)] [string]$IncludeAdditional = $null   
     )    
 
     Write-Verbose "Installer logs located in:$LogPath"
@@ -533,7 +537,7 @@ function Get-VDAInstallArgs {
     $components += '"'
     $installargs.Add($components) | Out-Null
     # END components    
-    
+
     if ($InstallPvd) {
         $installargs.Add("/BASEIMAGE") | Out-Null
     }    
@@ -582,6 +586,16 @@ function Get-VDAInstallArgs {
 			}
 			write-Host "Excluding packages: $ExcludedPackages"
 			$installargs.Add("/EXCLUDE $ExcludedPackages") | Out-Null
+    }
+
+	if (-not([string]::isNullOrempty($IncludeAdditional))) {
+		write-verbose "Requested to include these additional packages: '$IncludeAdditional'"
+			# always enclose the string in double-quotes
+			if ($IncludeAdditional[0] -ne '"') {
+				$IncludeAdditional = """$IncludeAdditional"""
+			}
+			write-Host "Include Additional: $IncludeAdditional"
+			$installargs.Add("/includeadditional $IncludeAdditional") | Out-Null
 	}
     Write-Verbose "Install Arguments: $($installargs)"
     return $installargs.ToArray()

diff --git a/scripts/Install-VDA.ps1 b/scripts/Install-VDA.ps1
@@ -33,11 +33,12 @@ try {
     $VDA_Controller1 = cwcTools\New-FQDN -ComputerName $VDA_Controller1 -DomainName $VDA_DNSDomainName
     $VDA_Controller2 = cwcTools\New-FQDN -ComputerName $VDA_Controller2 -DomainName $VDA_DNSDomainName
     $VDA_Controllers = "$VDA_Controller1,$VDA_Controller2"
+    $IncludeAdditional = "Citrix Files for Windows"
 
     Invoke-Command -ComputerName localhost -ScriptBlock {
         Start-Process -FilePath attrib.exe -LoadUserProfile
-        cwcXenDesktop\Install-VdaServer -InstallerPath $args[0] -installPvd:$false -Controllers $args[1] -EnableRemoteAssistance -verbose
-    } -argumentlist @($setupPath, $VDA_Controllers) 
+        cwcXenDesktop\Install-VdaServer -InstallerPath $args[0]  -installPvd:$false -Controllers $args[1] -EnableRemoteAssistance -IncludeAdditional $args[2] -verbose
+    } -argumentlist @($setupPath, $VDA_Controllers, $IncludeAdditional) 
 
     cwcOS-Tools\Dismount-Iso $driveLetter
 

diff --git a/templates/citrix-virtualapps-service-connectors.yaml b/templates/citrix-virtualapps-service-connectors.yaml
@@ -371,6 +371,8 @@ Resources:
           Value: !Sub '${CitrixCloudConnector1HostName}-${QSDeploymentID}'
         - Key: App
           Value: Citrix
+        - Key: QSDeplomentID
+          Value: !Sub ${QSDeploymentID}              
 
   CitrixCloudConnector2:
     Type: 'AWS::EC2::Instance'
@@ -517,6 +519,8 @@ Resources:
           Value: !Sub '${CitrixCloudConnector2HostName}-${QSDeploymentID}'
         - Key: App
           Value: Citrix
+        - Key: QSDeplomentID
+          Value: !Sub ${QSDeploymentID}              
 
   CitrixCloudConnector1WaitHandle:
     Type: 'AWS::CloudFormation::WaitConditionHandle'

diff --git a/templates/citrix-virtualapps-service-resourcelocation-master.yaml b/templates/citrix-virtualapps-service-resourcelocation-master.yaml
@@ -307,13 +307,15 @@ Resources:
         https://${QSS3BucketName}.s3.amazonaws.com/${QSS3KeyPrefix}templates/citrix-virtualapps-service-qsdeploymentid.yaml
 
   CitrixCloudSecurityGroups:
-     Type: AWS::CloudFormation::Stack
-     Properties:
-       TemplateURL: !Sub >-
+    Type: AWS::CloudFormation::Stack
+    DependsOn: 'QSDeploymentID'
+    Properties:
+      TemplateURL: !Sub >-
         https://${QSS3BucketName}.s3.amazonaws.com/${QSS3KeyPrefix}templates/citrix-virtualapps-service-securitygroups.yaml
-       Parameters:
-        VPCID:                             !Ref VPCID                
-        BastionSecurityGroupID:                !Ref BastionSecurityGroupID                 
+      Parameters:
+        VPCID:                              !Ref VPCID                
+        BastionSecurityGroupID:             !Ref BastionSecurityGroupID
+        QSDeploymentID:                     !GetAtt QSDeploymentID.Outputs.ParameterQSDeploymentID                         
 
   CitrixCloudConnectors:
     Type: 'AWS::CloudFormation::Stack'

diff --git a/templates/citrix-virtualapps-service-securitygroups.yaml b/templates/citrix-virtualapps-service-securitygroups.yaml
@@ -6,11 +6,14 @@ Parameters:
   BastionSecurityGroupID:
     Description: ID of the Bastion Security Group (e.g., sg-7f16e910),
     Type: 'AWS::EC2::SecurityGroup::Id'
+  QSDeploymentID:
+    Type: 'AWS::SSM::Parameter::Value<String>'
 
 Resources:
   CCSecurityGroup:
     Type: AWS::EC2::SecurityGroup
     Properties:
+      GroupName: !Sub 'SG-CitrixCloudConnectors-${QSDeploymentID}'
       GroupDescription: Security group which allows access to the Cloud Connectors
       VpcId: !Ref VPCID
       SecurityGroupIngress:
@@ -20,9 +23,11 @@ Resources:
           ToPort: 3389
       Tags:
       - Key: Name
-        Value: 'AWS Quick Start Citrix Cloud Connectors'
+        Value: !Sub 'AWS Quick Start Citrix Cloud Connector (QSDeployment ID: ${QSDeploymentID})'
       - Key: App
         Value: Citrix
+      - Key: QSDeplomentID
+        Value: !Sub ${QSDeploymentID}        
 
   CCSecurityGroupTCPIngress:
     Type: AWS::EC2::SecurityGroupIngress
@@ -56,6 +61,7 @@ Resources:
   VDASecurityGroup:
     Type: AWS::EC2::SecurityGroup
     Properties:
+      GroupName: !Sub 'SG-CitrixVDA-${QSDeploymentID}'    
       GroupDescription: Security group which allows access to the VDA Workers
       VpcId: !Ref VPCID
       SecurityGroupIngress:
@@ -85,9 +91,11 @@ Resources:
           ToPort: 3389
       Tags:
       - Key: Name
-        Value: 'AWS Quick Start Citrix VDA'
+        Value: !Sub 'AWS Quick Start Citrix VDA (QSDeployment ID: ${QSDeploymentID})'
       - Key: App
         Value: Citrix
+      - Key: QSDeplomentID
+        Value: !Sub ${QSDeploymentID}
 
   VDASecurityGroupTCPIngress:
     Type: AWS::EC2::SecurityGroupIngress

diff --git a/templates/citrix-virtualapps-service-vda-serveros.yaml b/templates/citrix-virtualapps-service-vda-serveros.yaml
@@ -484,6 +484,8 @@ Resources:
           Value: !Sub '${CitrixVDAHostName}-${QSDeploymentID}'
         - Key: App
           Value: Citrix
+        - Key: QSDeplomentID
+          Value: !Sub ${QSDeploymentID}          
       UserData: !Base64 
         'Fn::Join':
           - ''