Skip to content

Commit f18dd1d

Browse files
committed
Added the instance arg to the new-certificate command as per the docs at http://docs.octopusdeploy.com/display/OD/Automating+Tentacle+installation
1 parent 808cb1f commit f18dd1d

File tree

2 files changed

+2
-2
lines changed

2 files changed

+2
-2
lines changed

AzureWebFarm.OctopusDeploy.Tests/Infrastructure/OctopusDeployTests.WhenConfiguringTentacle_ThenTheCorrectCommandsShouldBeSentToTentacleExe.approved.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
c:\Install\Tentacle\Agent\Tentacle.exe create-instance --instance "Tentacle" --config "c:\Install\Tentacle.config" --console
2-
c:\Install\Tentacle\Agent\Tentacle.exe new-certificate --console
2+
c:\Install\Tentacle\Agent\Tentacle.exe new-certificate --instance "Tentacle" --console
33
c:\Install\Tentacle\Agent\Tentacle.exe configure --instance "Tentacle" --home "c:\Deployment" --console
44
c:\Install\Tentacle\Agent\Tentacle.exe configure --instance "Tentacle" --app "c:\Deployments\Applications" --console
55
c:\Install\Tentacle\Agent\Tentacle.exe register-with --instance "Tentacle" --server "%OctopusServer%" --environment "%TentacleEnvironment%" --role "%TentacleRole%" --apiKey "%OctopusApiKey%" --name "%machineName%" --comms-style TentacleActive --force --console

AzureWebFarm.OctopusDeploy/Infrastructure/OctopusDeploy.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ public void ConfigureTentacle()
3535
var tentaclePath = Path.Combine(Path.Combine(tentacleDir, "Agent"), "Tentacle.exe");
3636

3737
_processRunner.Run(tentaclePath, string.Format("create-instance {0} --config \"{1}\" --console", instanceArg, Path.Combine(tentacleInstallPath, "Tentacle.config")));
38-
_processRunner.Run(tentaclePath, string.Format("new-certificate --console"));
38+
_processRunner.Run(tentaclePath, string.Format("new-certificate {0} --console", instanceArg));
3939
_processRunner.Run(tentaclePath, string.Format("configure {0} --home \"{1}\" --console", instanceArg, tentacleDeploymentsPath.Substring(0, tentacleDeploymentsPath.Length - 1)));
4040
_processRunner.Run(tentaclePath, string.Format("configure {0} --app \"{1}\" --console", instanceArg, Path.Combine(tentacleDeploymentsPath, "Applications")));
4141
_processRunner.Run(tentaclePath, string.Format("register-with {0} --server \"{1}\" --environment \"{2}\" --role \"{3}\" --apiKey \"{4}\" --name \"{5}\" --comms-style TentacleActive --force --console", instanceArg, _config.OctopusServer, _config.TentacleEnvironment, _config.TentacleRole, _config.OctopusApiKey, _machineName));

0 commit comments

Comments
 (0)