From f78b279e8d9a33a8b70638249ef252a072ce426c Mon Sep 17 00:00:00 2001
From: Dmitry Teselkin <dteselkin@mirantis.com>
Date: Tue, 13 Aug 2013 12:56:03 +0400
Subject: [PATCH] Typos fixed.
Change-Id: I437cf888bc459360efeb5f00da475038e211ebe4
---
data/templates/agent/SetPassword.template | 2 +-
.../SqlServerCluster/InitializeAOAGPrimaryReplica.template | 2 +-
.../SqlServerCluster/InitializeAOAGSecondaryReplica.template | 2 +-
.../{SetLocalUserPassword.ps1 => Set-LocalUserPassword.ps1} | 0
muranoconductor/commands/windows_agent.py | 2 +-
5 files changed, 4 insertions(+), 4 deletions(-)
rename data/templates/agent/scripts/{SetLocalUserPassword.ps1 => Set-LocalUserPassword.ps1} (100%)
diff --git a/data/templates/agent/SetPassword.template b/data/templates/agent/SetPassword.template
index 02f7482..101db0e 100644
--- a/data/templates/agent/SetPassword.template
+++ b/data/templates/agent/SetPassword.template
@@ -1,7 +1,7 @@
{
"Scripts": [
"ImportCoreFunctions.ps1",
- "Set-LocalUserPasswordPassword.ps1"
+ "Set-LocalUserPassword.ps1"
],
"Commands": [
{
diff --git a/data/templates/agent/SqlServerCluster/InitializeAOAGPrimaryReplica.template b/data/templates/agent/SqlServerCluster/InitializeAOAGPrimaryReplica.template
index 54ca203..877a9f7 100644
--- a/data/templates/agent/SqlServerCluster/InitializeAOAGPrimaryReplica.template
+++ b/data/templates/agent/SqlServerCluster/InitializeAOAGPrimaryReplica.template
@@ -3,7 +3,7 @@
"ImportCoreFunctions.ps1",
"OptionParser.ps1",
"SQLServerOptionParsers.ps1",
- "SQLServerInsatller.ps1",
+ "SQLServerInstaller.ps1",
"Export-Function.ps1",
"Start-PowerShellProcess.ps1",
"SQLServerForAOAG.ps1"
diff --git a/data/templates/agent/SqlServerCluster/InitializeAOAGSecondaryReplica.template b/data/templates/agent/SqlServerCluster/InitializeAOAGSecondaryReplica.template
index 1af2865..604dae6 100644
--- a/data/templates/agent/SqlServerCluster/InitializeAOAGSecondaryReplica.template
+++ b/data/templates/agent/SqlServerCluster/InitializeAOAGSecondaryReplica.template
@@ -3,7 +3,7 @@
"ImportCoreFunctions.ps1",
"OptionParser.ps1",
"SQLServerOptionParsers.ps1",
- "SQLServerInstall.ps1",
+ "SQLServerInstaller.ps1",
"Export-Function.ps1",
"Start-PowerShellProcess.ps1",
"SQLServerForAOAG.ps1"
diff --git a/data/templates/agent/scripts/SetLocalUserPassword.ps1 b/data/templates/agent/scripts/Set-LocalUserPassword.ps1
similarity index 100%
rename from data/templates/agent/scripts/SetLocalUserPassword.ps1
rename to data/templates/agent/scripts/Set-LocalUserPassword.ps1
diff --git a/muranoconductor/commands/windows_agent.py b/muranoconductor/commands/windows_agent.py
index 870e845..6f275e0 100644
--- a/muranoconductor/commands/windows_agent.py
+++ b/muranoconductor/commands/windows_agent.py
@@ -47,7 +47,7 @@ class WindowsAgentExecutor(CommandBase):
template_data, queue, msg_id))
def encode_scripts(self, json_data, template_path):
- scripts_folder = ''.join([os.path.dirname(template_path), "/scripts/"])
+ scripts_folder = 'data/templates/agent/scripts'
script_files = json_data.get("Scripts", [])
scripts = []
for script in script_files: