Added csdef/cscfg updates for new config setting

robdmoore · robdmoore · commit 1427156245b0 · 2014-05-05T22:32:04.000+08:00
diff --git a/AzureWebFarm.OctopusDeploy.Example/ServiceConfiguration.Cloud.cscfg b/AzureWebFarm.OctopusDeploy.Example/ServiceConfiguration.Cloud.cscfg
@@ -13,6 +13,7 @@
       <Setting name="OctopusApiKey" value="API-OCTOPUSAPIKEY" />
       <Setting name="TentacleEnvironment" value="ENVIRONMENT" />
       <Setting name="TentacleRole" value="ROLE" />
+      <Setting name="TentacleMachineNameSuffix" value="" />
     </ConfigurationSettings>
     <Certificates>
       <Certificate name="Microsoft.WindowsAzure.Plugins.RemoteAccess.PasswordEncryption" thumbprint="5BFCF449A37F73EF3875A1682BE5AE5CCB1B553F" thumbprintAlgorithm="sha1" />
diff --git a/AzureWebFarm.OctopusDeploy.Example/ServiceConfiguration.Local.cscfg b/AzureWebFarm.OctopusDeploy.Example/ServiceConfiguration.Local.cscfg
@@ -13,6 +13,7 @@
       <Setting name="OctopusApiKey" value="API-OCTOPUSAPIKEY" />
       <Setting name="TentacleEnvironment" value="ENVIRONMENT" />
       <Setting name="TentacleRole" value="ROLE" />
+      <Setting name="TentacleMachineNameSuffix" value="" />
     </ConfigurationSettings>
     <Certificates>
       <Certificate name="Microsoft.WindowsAzure.Plugins.RemoteAccess.PasswordEncryption" thumbprint="5BFCF449A37F73EF3875A1682BE5AE5CCB1B553F" thumbprintAlgorithm="sha1" />
diff --git a/AzureWebFarm.OctopusDeploy.Example/ServiceDefinition.csdef b/AzureWebFarm.OctopusDeploy.Example/ServiceDefinition.csdef
@@ -41,6 +41,7 @@
       <Setting name="OctopusApiKey" />
       <Setting name="TentacleEnvironment" />
       <Setting name="TentacleRole" />
+      <Setting name="TentacleMachineNameSuffix" />
     </ConfigurationSettings>
   </WebRole>
 </ServiceDefinition>
diff --git a/AzureWebFarm.OctopusDeploy.Tests/Tools/ExampleFiles/ServiceConfiguration.transformed.cscfg b/AzureWebFarm.OctopusDeploy.Tests/Tools/ExampleFiles/ServiceConfiguration.transformed.cscfg
@@ -12,6 +12,7 @@
       <Setting name="OctopusApiKey" value="API-CZYCNXCPAMBWFMDUTPUQUC0O2ZY" />
       <Setting name="TentacleEnvironment" value="Production" />
       <Setting name="TentacleRole" value="webserver" />
+      <Setting name="TentacleMachineNameSuffix" value="" />
     </ConfigurationSettings>
     <Certificates>
       <Certificate name="Microsoft.WindowsAzure.Plugins.RemoteAccess.PasswordEncryption" thumbprint="5BFCF449A37F73EF3875A1682BE5AE5CCB1B553F" thumbprintAlgorithm="sha1" />
diff --git a/AzureWebFarm.OctopusDeploy.Tests/Tools/ExampleFiles/ServiceDefinition.transformed.csdef b/AzureWebFarm.OctopusDeploy.Tests/Tools/ExampleFiles/ServiceDefinition.transformed.csdef
@@ -40,6 +40,7 @@
       <Setting name="OctopusApiKey" />
       <Setting name="TentacleEnvironment" />
       <Setting name="TentacleRole" />
+      <Setting name="TentacleMachineNameSuffix" />
     </ConfigurationSettings>
   </WebRole>
 </ServiceDefinition>
diff --git a/AzureWebFarm.OctopusDeploy.Tests/Tools/XdtTests.WhenExecutingServiceConfigurationTransform_ThenCorrectlyTransformExampleFile.approved.xml b/AzureWebFarm.OctopusDeploy.Tests/Tools/XdtTests.WhenExecutingServiceConfigurationTransform_ThenCorrectlyTransformExampleFile.approved.xml
@@ -12,6 +12,7 @@
       <Setting name="OctopusApiKey" value="API-CZYCNXCPAMBWFMDUTPUQUC0O2ZY" />
       <Setting name="TentacleEnvironment" value="Production" />
       <Setting name="TentacleRole" value="webserver" />
+      <Setting name="TentacleMachineNameSuffix" value="" />
     </ConfigurationSettings>
     <Certificates>
       <Certificate name="Microsoft.WindowsAzure.Plugins.RemoteAccess.PasswordEncryption" thumbprint="5BFCF449A37F73EF3875A1682BE5AE5CCB1B553F" thumbprintAlgorithm="sha1" />
diff --git a/AzureWebFarm.OctopusDeploy.Tests/Tools/XdtTests.WhenExecutingServiceDefinitionTransform_ThenCorrectlyTransformExampleFile.approved.xml b/AzureWebFarm.OctopusDeploy.Tests/Tools/XdtTests.WhenExecutingServiceDefinitionTransform_ThenCorrectlyTransformExampleFile.approved.xml
@@ -40,6 +40,7 @@
       <Setting name="OctopusApiKey" />
       <Setting name="TentacleEnvironment" />
       <Setting name="TentacleRole" />
+      <Setting name="TentacleMachineNameSuffix" />
     </ConfigurationSettings>
   </WebRole>
 </ServiceDefinition>
diff --git a/AzureWebFarm.OctopusDeploy/Tools/ServiceConfiguration.cscfg.xdt.xml b/AzureWebFarm.OctopusDeploy/Tools/ServiceConfiguration.cscfg.xdt.xml
@@ -6,6 +6,7 @@
       <x:Setting name="OctopusApiKey" value="API-OCTOPUSAPIKEY" xdt:Transform="InsertIfMissing" xdt:Locator="Match(name)" />
       <x:Setting name="TentacleEnvironment" value="ENVIRONMENT" xdt:Transform="InsertIfMissing" xdt:Locator="Match(name)" />
       <x:Setting name="TentacleRole" value="ROLE" xdt:Transform="InsertIfMissing" xdt:Locator="Match(name)" />
+      <x:Setting name="TentacleMachineNameSuffix" value="" xdt:Transform="InsertIfMissing" xdt:Locator="Match(name)" />
     </x:ConfigurationSettings>
   </x:Role>
 </x:ServiceConfiguration>
diff --git a/AzureWebFarm.OctopusDeploy/Tools/ServiceDefinition.csdef.xdt.xml b/AzureWebFarm.OctopusDeploy/Tools/ServiceDefinition.csdef.xdt.xml
@@ -30,6 +30,7 @@
       <x:Setting name="OctopusApiKey" xdt:Transform="InsertIfMissing" xdt:Locator="Match(name)" />
       <x:Setting name="TentacleEnvironment" xdt:Transform="InsertIfMissing" xdt:Locator="Match(name)" />
       <x:Setting name="TentacleRole" xdt:Transform="InsertIfMissing" xdt:Locator="Match(name)" />
+      <x:Setting name="TentacleMachineNameSuffix" xdt:Transform="InsertIfMissing" xdt:Locator="Match(name)" />
     </x:ConfigurationSettings>
   </x:WebRole>
 </x:ServiceDefinition>
