Adding support for a machine name suffix so that we can provide a nicer deployment scenario for a segregated farm

Author: stefansedich

AzureWebFarm.OctopusDeploy/Infrastructure/ConfigSettings.cs

@@ -11,22 +11,25 @@ internal class ConfigSettings
         private const string TentacleRoleConfigName = "TentacleRole";
         private const string TentacleDeploymentsPathConfigName = "Deployments";
         private const string TentacleInstallPathConfigName = "Install";
+        private const string TentacleMachineNameSuffixConfigName = "TentacleMachineNameSuffix";
 
-        private static readonly string[] ConfigSettingsNames = new[] { OctopusServerConfigName, OctopusApiKeyConfigName, TentacleEnvironmentConfigName, TentacleRoleConfigName };
+        private static readonly string[] ConfigSettingsNames = new[] { OctopusServerConfigName, OctopusApiKeyConfigName, TentacleEnvironmentConfigName, TentacleRoleConfigName, TentacleMachineNameSuffixConfigName };
 
         private static string _octopusServer;
         private static string _octopusApiKey;
         private static string _tentacleEnvironment;
         private static string _tentacleRole;
+        private readonly string _tentacleMachineNameSuffix;
         private readonly string _tentacleDeploymentsPath;
         private readonly string _tentacleInstallPath;
-
+        
         public ConfigSettings(Func<string, string> configSettingsGetter, Func<string, string> configPathGetter)
         {
             _octopusServer = configSettingsGetter(OctopusServerConfigName);
             _octopusApiKey = configSettingsGetter(OctopusApiKeyConfigName);
             _tentacleEnvironment = configSettingsGetter(TentacleEnvironmentConfigName);
             _tentacleRole = configSettingsGetter(TentacleRoleConfigName);
+            _tentacleMachineNameSuffix = configSettingsGetter(TentacleMachineNameSuffixConfigName);
 
             _tentacleDeploymentsPath = configPathGetter(TentacleDeploymentsPathConfigName);
             _tentacleInstallPath = configPathGetter(TentacleInstallPathConfigName);
@@ -36,6 +39,7 @@ public ConfigSettings(Func<string, string> configSettingsGetter, Func<string, st
         public string OctopusApiKey { get { return _octopusApiKey; } }
         public string TentacleEnvironment { get { return _tentacleEnvironment; } }
         public string TentacleRole { get { return _tentacleRole; } }
+        public string TentacleMachineNameSuffix { get { return _tentacleMachineNameSuffix; } }
 
         public string TentacleDeploymentsPath { get { return _tentacleDeploymentsPath; } }
         public string TentacleInstallPath { get { return _tentacleInstallPath; } }

AzureWebFarm.OctopusDeploy/WebFarmRole.cs

@@ -22,7 +22,7 @@ public WebFarmRole(string machineName = null)
             Log.Logger = AzureEnvironment.GetAzureLogger();
             var config = AzureEnvironment.GetConfigSettings();
 
-            machineName = machineName ?? AzureEnvironment.GetMachineName(config);
+            machineName = machineName ?? GetMachineName(config);
             var octopusRepository = Infrastructure.OctopusDeploy.GetRepository(config);
             var processRunner = new ProcessRunner();
             var registryEditor = new RegistryEditor();
@@ -78,7 +78,17 @@ public void OnStop()
             _octopusDeploy.DeleteMachine();
             IisEnvironment.WaitForAllHttpRequestsToEnd();
         }
-    }
 
-    
+        private static string GetMachineName(ConfigSettings config)
+        {
+            var machineName = AzureEnvironment.GetMachineName(config);
+
+            if (!string.IsNullOrEmpty(config.TentacleMachineNameSuffix))
+            {
+                machineName = machineName + "_" + config.TentacleMachineNameSuffix;
+            }
+
+            return machineName;
+        }
+    }
 }