Skip to content

Commit d93730a

Browse files
committed
Migrated puppet code to future parser syntax (4.x) v2
1 parent ab377e0 commit d93730a

4 files changed

Lines changed: 11 additions & 8 deletions

File tree

README.markdown

Lines changed: 8 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,8 @@ The SSL certificate provided needs to be a password protected p12/pfx certificat
1515

1616
The module can be installed on a Standard, Datacenter version of Windows 2012R2 or Windows 2016. **Core version is not supported by Citrix for delivery Controller installation**.
1717

18+
Migrated puppet example code in README.md to future parser syntax (4.x). Impact on parameters refering to remote locations (file shares) which have to be prefixed with \\\\ instead of the classical \\. This is because of Puppet >= 4.x parsing \\ as a single \ in single-quoted strings. Use parser = future in puppet 3.x /etc/puppet/puppet.conf to use this new configuration in your Puppet 3.x and prepare Puppet 4.x migration.
19+
1820
## Usage
1921
- **svc_username** : (string) Privileged account used by Puppet for installing the software and the Xendesktop Site (cred_ssp server and client, SQL server write access, local administrator privilèges needed)
2022
- **svc_password** : (string) Password of the privileged account. Should be encrypted with hiera-eyaml.
@@ -24,13 +26,13 @@ The module can be installed on a Standard, Datacenter version of Windows 2012R2
2426
- **sitedatabasename** : (string) Name of the citrix site database to be created
2527
- **loggingdatabasename** : (string) Name of the citrix logging database to be created
2628
- **monitordatabasename** : (string) Name of the citrix monitor database to be created
27-
- **sourcepath** : (string) Path of a folder containing the Xendesktop 7.x installer (unarchive the ISO image in this folder).
29+
- **sourcepath** : (string) Path of a folder containing the Xendesktop 7.x installer (unarchive the ISO image in this folder). Has to be prefixed with \\\\ instead of the classical \\ if using UNC Path and Puppet >= 4.x or Puppet 3.x future parser.
2830
- **xd7administrator** : (string) ActiveDirectory user or group which will be granted Citrix Administrator rights.
2931
- **sqlalwayson** : (boolean) : true or false. Activate database AlwaysOn availability group membership ? Default is false. Needs to be true for a production grade environment
3032
- **sqlavailabilitygroup** : (string) (optionnal if sqlalwayson = false) : Name of the SQL AlwaysOn availability group.
31-
- **sqldbbackuppath** : (string) (optionnal if sqlalwayson = false) : UNC path of a writable network folder to backup/restore databases during AlwaysOn availability group membership configuration. needs to be writable from the sql server nodes.
33+
- **sqldbbackuppath** : (string) (optionnal if sqlalwayson = false) : UNC path of a writable network folder to backup/restore databases during AlwaysOn availability group membership configuration. needs to be writable from the sql server nodes. Has to be prefixed with \\\\ instead of the classical \\ if using Puppet >= 4.x or Puppet 3.x future parser.
3234
- **https** : (boolean) : true or false. Deploy SSL certificate and activate SSL access to Citrix XML service ? Default : false
33-
- **sslCertificateSourcePath** : (string) Location of the SSL certificate (p12 / PFX format with private key). Can be local folder, UNC path, HTTP URL)
35+
- **sslCertificateSourcePath** : (string) Location of the SSL certificate (p12 / PFX format with private key). Can be local folder, UNC path, HTTP URL). Has to be prefixed with \\\\ instead of the classical \\ if using UNC Path and Puppet >= 4.x or Puppet 3.x future parser.
3436
- **sslCertificatePassword** : (string) Password protecting the p12/pfx SSL certificate file.
3537
- **sslCertificateThumbprint** : (string) Thumbprint of the SSL certificate (available in the SSL certificate).
3638

@@ -47,13 +49,13 @@ node 'CXDC' {
4749
sitedatabasename => 'SITE_DB',
4850
loggingdatabasename => 'LOG_DB',
4951
monitordatabasename => 'MONITOR_DB',
50-
sourcepath => '\\fileserver\xendesktop715',
52+
sourcepath => '\\\\fileserver\xendesktop715',
5153
xd7administrator => 'TESTLAB\Domain Admins',
5254
sqlalwayson => true,
5355
sqlavailabilitygroup => 'CLSDB01',
54-
sqldbbackuppath => '\\fileserver\backup\sql',
56+
sqldbbackuppath => '\\\\fileserver\backup\sql',
5557
https => true,
56-
sslCertificateSourcePath => '\\fileserver\ssl\cxdc.pfx',
58+
sslCertificateSourcePath => '\\\\fileserver\ssl\cxdc.pfx',
5759
sslCertificatePassword => 'P@ssw0rd',
5860
sslCertificateThumbprint => '44cce73845feef4da4d369a37386c862eb3bd4e1'
5961
}

changelog.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@
33
## Unreleased
44
- **BREAKING CHANGE** : Require puppetlabs/dsc compiled with SQLServerDSC = 10.0.0.0
55
- **BREAKING CHANGE** : Removed unneeded $domainNetbiosName parameter.
6+
- **BREAKING CHANGE** : Migrated puppet example code in README.md to future parser syntax (4.x). Impact on parameters refering to remote locations (file shares) which have to be prefixed with \\\\ instead of the classical \\. This is because of Puppet >= 4.x parsing \\ as a single \ in single-quoted strings. Use parser = future in puppet 3.x /etc/puppet/puppet.conf to use this new configuration in your Puppet 3.x and prepare Puppet 4.x migration.
67

78
## Version 1.1.0
89
- Initial release

manifests/install.pp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@
2626
#Install Delivery Controller
2727
dsc_xd7features { 'XD7DeliveryController':
2828
dsc_issingleinstance => 'Yes',
29-
dsc_role => [Studio, Controller],
29+
dsc_role => ['Studio', 'Controller'],
3030
dsc_sourcepath => $sourcepath,
3131
dsc_ensure => 'present',
3232
require => Dsc_windowsfeature['iis'],

manifests/sslconfig.pp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@
4242
ensure => present,
4343
type => 'dword',
4444
data => '443',
45-
require => Dsc_xd7features ['XD7DeliveryController']
45+
require => Dsc_xd7features['XD7DeliveryController']
4646
}
4747
}
4848
}

0 commit comments

Comments
 (0)