Skip to content

Commit ab377e0

Browse files
committed
Revert "Migrated puppet code to future parser syntax (4.x). Use parser = future in puppet 3.x /etc/puppet/puppet.conf"
This reverts commit 0efecd2.
1 parent 0efecd2 commit ab377e0

4 files changed

Lines changed: 6 additions & 7 deletions

File tree

changelog.md

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,6 @@
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 code to future parser syntax (4.x). Use parser = future in puppet 3.x /etc/puppet/puppet.conf
76

87
## Version 1.1.0
98
- Initial release

manifests/databasehighavailability.pp

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@
3535
dsc_availabilitygroupname => $sqlavailabilitygroup,
3636
dsc_servername => $databaseserver,
3737
dsc_instancename => 'MSSQLSERVER',
38-
dsc_backuppath => "\\${sqldbbackuppath}",
38+
dsc_backuppath => $sqldbbackuppath,
3939
dsc_psdscrunascredential => {'user' => $svc_username, 'password' => $svc_password},
4040
#require => Dsc_sqldatabaserecoverymodel['SiteDatabaseRecoveryModel']
4141
}
@@ -45,7 +45,7 @@
4545
dsc_availabilitygroupname => $sqlavailabilitygroup,
4646
dsc_servername => $databaseserver,
4747
dsc_instancename => 'MSSQLSERVER',
48-
dsc_backuppath => "\\${sqldbbackuppath}",
48+
dsc_backuppath => $sqldbbackuppath,
4949
dsc_psdscrunascredential => {'user' => $svc_username, 'password' => $svc_password},
5050
#require => Dsc_sqldatabaserecoverymodel['LoggingDatabaseRecoveryModel']
5151
}
@@ -55,7 +55,7 @@
5555
dsc_availabilitygroupname => $sqlavailabilitygroup,
5656
dsc_servername => $databaseserver,
5757
dsc_instancename => 'MSSQLSERVER',
58-
dsc_backuppath => "\\${sqldbbackuppath}",
58+
dsc_backuppath => $sqldbbackuppath,
5959
dsc_psdscrunascredential => {'user' => $svc_username, 'password' => $svc_password},
6060
#require => Dsc_sqldatabaserecoverymodel['MonitorDatabaseRecoveryModel']
6161
}

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: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77

88
#Download SSL certificate
99
dsc_file{ 'SSLCert':
10-
dsc_sourcepath => "\\${sslCertificateSourcePath}",
10+
dsc_sourcepath => $sslCertificateSourcePath,
1111
dsc_destinationpath => 'c:\SSL\cert.pfx',
1212
dsc_type => 'File'
1313
}->
@@ -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)