Skip to content

Commit 6f25acf

Browse files
matt6697matt6697
committed
Renamed xd7mastercontroller to xd7deliverycontroller
1 parent 1e76606 commit 6f25acf

8 files changed

Lines changed: 109 additions & 109 deletions

File tree

‎README.markdown‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,7 @@ Migrated puppet example code in README.md to future parser syntax (4.x). Impact
5858

5959
~~~puppet
6060
node 'CXDC01' {
61-
class{'xd7mastercontroller':
61+
class{'xd7deliverycontroller':
6262
setup_svc_username => 'TESTLAB\svc-puppet',
6363
setup_svc_password => 'P@ssw0rd',
6464
sitename => 'XD7TestSite',
@@ -81,7 +81,7 @@ node 'CXDC01' {
8181
}
8282
8383
node 'CXDC02' {
84-
class{'xd7mastercontroller':
84+
class{'xd7deliverycontroller':
8585
setup_svc_username => 'TESTLAB\svc-puppet',
8686
setup_svc_password => 'P@ssw0rd',
8787
sitename => 'XD7TestSite',

‎changelog.md‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
1-
# Changelog - xd7mastercontroller #
1+
# Changelog - xd7deliverycontroller #
22

33
## Version 2.0.0 ##
4+
- **BREAKING CHANGE** : Merged **xd7mastercontroller** and **xd7slavecontroller** into **xd7deliverycontroller**. Added a **role** parameter to install a **primary** controller with XenDesktop site creation or a **secondary** controller joined to an existing XenDesktop site.
45
- **BREAKING CHANGE** : Require puppetlabs/dsc compiled with SQLServerDSC = 10.0.0.0
56
- **BREAKING CHANGE** : Removed unneeded $domainNetbiosName parameter.
67
- **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.
78
- **BREAKING CHANGE** : Changed all module parameters to lowercase to comply with puppet guidelines.
8-
- **BREAKING CHANGE** : Merged xd7mastercontroller and xd7slave controller into xd7deliverycontroller. Added a **role** parameter to install a **primary** controller with XenDesktop site creation or a **secondary** controller joined to an existing XenDesktop site.
99
- **BREAKING CHANGE** : Removed SQLServer Powershell resource from the module. Added **sqlservermodulesource** and **sqlservermodulesourcepath** parameters to install is from the internet or from an enterprise file share.
1010
- Compliance with puppet language style guide and puppet forge standards.
1111
- Class parameters data types.

‎manifests/databasehighavailability.pp‎

Lines changed: 32 additions & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -1,80 +1,80 @@
11
#Class configuring SQL Server AlwaysOn High-Availability feature for Citrix databases
2-
class xd7mastercontroller::databasehighavailability inherits xd7mastercontroller {
2+
class xd7deliverycontroller::databasehighavailability inherits xd7deliverycontroller {
33

4-
if ($xd7mastercontroller::role == 'primary') and ($xd7mastercontroller::sqlalwayson) {
4+
if ($xd7deliverycontroller::role == 'primary') and ($xd7deliverycontroller::sqlalwayson) {
55
#Recovery mode configuration
66
dsc_sqldatabaserecoverymodel{'SiteDatabaseRecoveryModel':
7-
dsc_name => $xd7mastercontroller::sitedatabasename,
7+
dsc_name => $xd7deliverycontroller::sitedatabasename,
88
dsc_recoverymodel => 'Full',
9-
dsc_servername => $xd7mastercontroller::databaseserver,
9+
dsc_servername => $xd7deliverycontroller::databaseserver,
1010
dsc_instancename => 'MSSQLSERVER',
1111
dsc_psdscrunascredential => {
12-
'user' => $xd7mastercontroller::setup_svc_username,
13-
'password' => $xd7mastercontroller::setup_svc_password
12+
'user' => $xd7deliverycontroller::setup_svc_username,
13+
'password' => $xd7deliverycontroller::setup_svc_password
1414
},
1515
require => Dsc_xd7site['XD7Site']
1616
}
1717

1818
dsc_sqldatabaserecoverymodel{'LoggingDatabaseRecoveryModel':
19-
dsc_name => $xd7mastercontroller::loggingdatabasename,
19+
dsc_name => $xd7deliverycontroller::loggingdatabasename,
2020
dsc_recoverymodel => 'Full',
21-
dsc_servername => $xd7mastercontroller::databaseserver,
21+
dsc_servername => $xd7deliverycontroller::databaseserver,
2222
dsc_instancename => 'MSSQLSERVER',
2323
dsc_psdscrunascredential => {
24-
'user' => $xd7mastercontroller::setup_svc_username,
25-
'password' => $xd7mastercontroller::setup_svc_password
24+
'user' => $xd7deliverycontroller::setup_svc_username,
25+
'password' => $xd7deliverycontroller::setup_svc_password
2626
},
2727
require => Dsc_xd7site['XD7Site']
2828
}
2929

3030
dsc_sqldatabaserecoverymodel{'MonitorDatabaseRecoveryModel':
31-
dsc_name => $xd7mastercontroller::monitordatabasename,
31+
dsc_name => $xd7deliverycontroller::monitordatabasename,
3232
dsc_recoverymodel => 'Full',
33-
dsc_servername => $xd7mastercontroller::databaseserver,
33+
dsc_servername => $xd7deliverycontroller::databaseserver,
3434
dsc_instancename => 'MSSQLSERVER',
3535
dsc_psdscrunascredential => {
36-
'user' => $xd7mastercontroller::setup_svc_username,
37-
'password' => $xd7mastercontroller::setup_svc_password
36+
'user' => $xd7deliverycontroller::setup_svc_username,
37+
'password' => $xd7deliverycontroller::setup_svc_password
3838
},
3939
require => Dsc_xd7site['XD7Site']
4040
}
4141

4242
#AlwaysOn cluster databases membership activation
4343
dsc_sqlagdatabase{'SiteDatabaseAlwaysOn':
44-
dsc_databasename => $xd7mastercontroller::sitedatabasename,
45-
dsc_availabilitygroupname => $xd7mastercontroller::sqlavailabilitygroup,
46-
dsc_servername => $xd7mastercontroller::databaseserver,
44+
dsc_databasename => $xd7deliverycontroller::sitedatabasename,
45+
dsc_availabilitygroupname => $xd7deliverycontroller::sqlavailabilitygroup,
46+
dsc_servername => $xd7deliverycontroller::databaseserver,
4747
dsc_instancename => 'MSSQLSERVER',
48-
dsc_backuppath => $xd7mastercontroller::sqldbbackuppath,
48+
dsc_backuppath => $xd7deliverycontroller::sqldbbackuppath,
4949
dsc_psdscrunascredential => {
50-
'user' => $xd7mastercontroller::setup_svc_username,
51-
'password' => $xd7mastercontroller::setup_svc_password
50+
'user' => $xd7deliverycontroller::setup_svc_username,
51+
'password' => $xd7deliverycontroller::setup_svc_password
5252
},
5353
#require => Dsc_sqldatabaserecoverymodel['SiteDatabaseRecoveryModel']
5454
}
5555

5656
dsc_sqlagdatabase{'LoggingDatabaseAlwaysOn':
57-
dsc_databasename => $xd7mastercontroller::loggingdatabasename,
58-
dsc_availabilitygroupname => $xd7mastercontroller::sqlavailabilitygroup,
59-
dsc_servername => $xd7mastercontroller::databaseserver,
57+
dsc_databasename => $xd7deliverycontroller::loggingdatabasename,
58+
dsc_availabilitygroupname => $xd7deliverycontroller::sqlavailabilitygroup,
59+
dsc_servername => $xd7deliverycontroller::databaseserver,
6060
dsc_instancename => 'MSSQLSERVER',
61-
dsc_backuppath => $xd7mastercontroller::sqldbbackuppath,
61+
dsc_backuppath => $xd7deliverycontroller::sqldbbackuppath,
6262
dsc_psdscrunascredential => {
63-
'user' => $xd7mastercontroller::setup_svc_username,
64-
'password' => $xd7mastercontroller::setup_svc_password
63+
'user' => $xd7deliverycontroller::setup_svc_username,
64+
'password' => $xd7deliverycontroller::setup_svc_password
6565
},
6666
#require => Dsc_sqldatabaserecoverymodel['LoggingDatabaseRecoveryModel']
6767
}
6868

6969
dsc_sqlagdatabase{'MonitorDatabaseAlwaysOn':
70-
dsc_databasename => $xd7mastercontroller::monitordatabasename,
71-
dsc_availabilitygroupname => $xd7mastercontroller::sqlavailabilitygroup,
72-
dsc_servername => $xd7mastercontroller::databaseserver,
70+
dsc_databasename => $xd7deliverycontroller::monitordatabasename,
71+
dsc_availabilitygroupname => $xd7deliverycontroller::sqlavailabilitygroup,
72+
dsc_servername => $xd7deliverycontroller::databaseserver,
7373
dsc_instancename => 'MSSQLSERVER',
74-
dsc_backuppath => $xd7mastercontroller::sqldbbackuppath,
74+
dsc_backuppath => $xd7deliverycontroller::sqldbbackuppath,
7575
dsc_psdscrunascredential => {
76-
'user' => $xd7mastercontroller::setup_svc_username,
77-
'password' => $xd7mastercontroller::setup_svc_password
76+
'user' => $xd7deliverycontroller::setup_svc_username,
77+
'password' => $xd7deliverycontroller::setup_svc_password
7878
},
7979
#require => Dsc_sqldatabaserecoverymodel['MonitorDatabaseRecoveryModel']
8080
}

‎manifests/init.pp‎

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
# Class: xd7mastercontroller
1+
# Class: xd7deliverycontroller
22
#
3-
# This module manages xd7mastercontroller
3+
# This module manages xd7deliverycontroller
44
#
55
# Parameters: none
66
#
@@ -10,7 +10,7 @@
1010
#
1111
# Sample Usage:
1212
#
13-
class xd7mastercontroller (
13+
class xd7deliverycontroller (
1414
String $setup_svc_username,
1515
String $setup_svc_password,
1616
String $sitename,
@@ -35,15 +35,15 @@
3535
)
3636

3737
{
38-
contain xd7mastercontroller::install
39-
contain xd7mastercontroller::siteconfig
40-
contain xd7mastercontroller::databasehighavailability
41-
contain xd7mastercontroller::sslconfig
38+
contain xd7deliverycontroller::install
39+
contain xd7deliverycontroller::siteconfig
40+
contain xd7deliverycontroller::databasehighavailability
41+
contain xd7deliverycontroller::sslconfig
4242

43-
Class['::xd7mastercontroller::install']
44-
->Class['::xd7mastercontroller::siteconfig']
45-
#->Class['::xd7mastercontroller::databasehighavailability']
46-
->Class['::xd7mastercontroller::sslconfig']
43+
Class['::xd7deliverycontroller::install']
44+
->Class['::xd7deliverycontroller::siteconfig']
45+
#->Class['::xd7deliverycontroller::databasehighavailability']
46+
->Class['::xd7deliverycontroller::sslconfig']
4747

4848
reboot { 'dsc_reboot':
4949
when => pending

‎manifests/install.pp‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
#Class installing Citrix XenDesktop Delivery Controller and SQLServer powershell module
2-
class xd7mastercontroller::install inherits xd7mastercontroller {
2+
class xd7deliverycontroller::install inherits xd7deliverycontroller {
33

44
reboot { 'after_run':
55
apply => immediately,
@@ -46,14 +46,14 @@
4646
dsc_xd7features { 'XD7DeliveryController':
4747
dsc_issingleinstance => 'Yes',
4848
dsc_role => ['Studio', 'Controller'],
49-
dsc_sourcepath => $xd7mastercontroller::sourcepath,
49+
dsc_sourcepath => $xd7deliverycontroller::sourcepath,
5050
dsc_ensure => 'present',
5151
require => Dsc_windowsfeature['iis'],
5252
notify => Reboot['after_run']
5353
}
5454

5555
#Download and install SQLSERVER powershell module. Required for database high availability setup (always on citrix databases membership)
56-
if ($xd7mastercontroller::sqlservermodulesource == 'internet') {
56+
if ($xd7deliverycontroller::sqlservermodulesource == 'internet') {
5757
exec { 'InstallNuGetProviderPSGallery':
5858
command => 'Install-PackageProvider -Name NuGet -Confirm:$false -Force',
5959
onlyif => 'if (Get-PackageProvider -ListAvailable -Name Nuget) { exit 1 }',
@@ -68,7 +68,7 @@
6868
}
6969
else {
7070
file{ 'C:\Program Files\WindowsPowerShell\Modules\sqlserver_powershell_module.zip':
71-
source => $xd7mastercontroller::sqlservermodulesourcepath,
71+
source => $xd7deliverycontroller::sqlservermodulesourcepath,
7272
source_permissions => ignore,
7373
}
7474

0 commit comments

Comments
 (0)