You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cloudstack.apache.org by ko...@apache.org on 2014/06/12 09:07:37 UTC
git commit: updated refs/heads/master to 0f2c66e
Repository: cloudstack
Updated Branches:
refs/heads/master 8b85bf9c2 -> 0f2c66e6c
CLOUDSTACK-6834: [Windows] 1. Added Port to the wizard to capture input from the admin.
Signed-off-by: Koushik Das <ko...@apache.org>
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/0f2c66e6
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/0f2c66e6
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/0f2c66e6
Branch: refs/heads/master
Commit: 0f2c66e6c981567367650d78d5b09c6f7ad04ce6
Parents: 8b85bf9
Author: Damodar Reddy <da...@citrix.com>
Authored: Wed Jun 11 11:53:13 2014 +0530
Committer: Koushik Das <ko...@apache.org>
Committed: Thu Jun 12 12:37:00 2014 +0530
----------------------------------------------------------------------
scripts/installer/windows/Setup_Databases.wxs | 10 ++++++----
scripts/installer/windows/acs.wxs | 3 +++
scripts/installer/windows/en-us.wxl | 1 +
3 files changed, 10 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/0f2c66e6/scripts/installer/windows/Setup_Databases.wxs
----------------------------------------------------------------------
diff --git a/scripts/installer/windows/Setup_Databases.wxs b/scripts/installer/windows/Setup_Databases.wxs
index 0254c61..f401e77 100644
--- a/scripts/installer/windows/Setup_Databases.wxs
+++ b/scripts/installer/windows/Setup_Databases.wxs
@@ -23,10 +23,12 @@
<Control Id="DbServerIpLabel" Type="Text" X="160" Y="38" Width="40" Height="20" TabSkip="no" Text="!(loc.DbServerIpLabel)" Transparent="yes"/>
<Control Id="DbServerIp" Type="Edit" Height="20" Width="92" X="220" Y="33" Property="DB_HOSTNAME" />
- <Control Id="DbUserNameLabel" Type="Text" X="160" Y="78" Width="40" Height="20" TabSkip="no" Text="!(loc.DbUserNameLabel)" Transparent="yes"/>
- <Control Id="DbUserName" Type="Edit" Height="20" Width="92" X="220" Y="73" Property="DB_USERNAME" />
- <Control Id="DbPasswordLabel" Type="Text" X="160" Y="118" Width="40" Height="20" TabSkip="no" Text="!(loc.DbPasswordLabel)" Transparent="yes"/>
- <Control Id="DbPassword" Type="Edit" Height="20" Width="92" X="220" Y="113" Property="DB_PASSWORD" Password="yes"/>
+ <Control Id="DbServerPortLabel" Type="Text" X="160" Y="68" Width="40" Height="20" TabSkip="no" Text="!(loc.DbServerPortLabel)" Transparent="yes"/>
+ <Control Id="DbServerPort" Type="Edit" Height="20" Width="92" X="220" Y="63" Property="DB_PORT" />
+ <Control Id="DbUserNameLabel" Type="Text" X="160" Y="98" Width="40" Height="20" TabSkip="no" Text="!(loc.DbUserNameLabel)" Transparent="yes"/>
+ <Control Id="DbUserName" Type="Edit" Height="20" Width="92" X="220" Y="93" Property="DB_USERNAME" />
+ <Control Id="DbPasswordLabel" Type="Text" X="160" Y="128" Width="40" Height="20" TabSkip="no" Text="!(loc.DbPasswordLabel)" Transparent="yes"/>
+ <Control Id="DbPassword" Type="Edit" Height="20" Width="92" X="220" Y="123" Property="DB_PASSWORD" Password="yes"/>
<Control Id="DbRootPasswordLabel" Type="Text" X="160" Y="158" Width="40" Height="20" TabSkip="no" Text="!(loc.DbRootPasswordLabel)" Transparent="yes"/>
<Control Id="DbRootPassword" Type="Edit" Height="20" Width="92" X="220" Y="153" Property="DB_ROOT_PASSWORD" Password="yes"/>
<Control Id="CreateDBCheckBox" Type="CheckBox" X="160" Y="207" Width="10" Height="10" CheckBoxValue="1" Property="CREATE_DATABASE"/>
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/0f2c66e6/scripts/installer/windows/acs.wxs
----------------------------------------------------------------------
diff --git a/scripts/installer/windows/acs.wxs b/scripts/installer/windows/acs.wxs
index 83bac54..bf09afc 100644
--- a/scripts/installer/windows/acs.wxs
+++ b/scripts/installer/windows/acs.wxs
@@ -62,6 +62,7 @@
<Property Id="DB_USERNAME" Value="cloud" />
<Property Id="DB_PASSWORD" Value="cloud" Hidden="yes"/>
<Property Id="DB_HOSTNAME" Value="localhost" />
+ <Property Id="DB_PORT" Value="3306" />
<Property Id="DB_ROOT_PASSWORD" Hidden="yes"/>
<Directory Id='TARGETDIR' Name='SourceDir'>
@@ -257,6 +258,7 @@
<CustomAction Id="GenerateSSLKey" Directory='CSMANAGEMENT'
ExeCommand='[PYTHON_HOME]\python "[CSMANAGEMENT]\webapps\client\WEB-INF\classes\scripts\common\keys\ssl-keys.py" "[CSMANAGEMENT]\lib"'
Execute="deferred" Return="check" />
+ <CustomAction Id="DbHostWithPort" Execute="immediate" Property="DB_HOSTNAME" Value="[DB_HOSTNAME]:[DB_PORT]" />
<CustomAction Id="DeployDB" Directory='CSMANAGEMENT'
ExeCommand='[PYTHON_HOME]\python "[INSTALLDIR]\scripts\cloud-setup-databases" [DB_USERNAME]:[DB_PASSWORD]@[DB_HOSTNAME] --deploy-as=root:[DB_ROOT_PASSWORD] -c "[CSMANAGEMENT]\lib" -f "[CSMANAGEMENT]\setup" -j "[CSMANAGEMENT]\webapps\client\WEB-INF\lib\jasypt-1.9.0.jar" -n "[CSMANAGEMENT]\lib\key" -b "[MYSQL]\bin"'
Execute="deferred" Return="check" Impersonate="no"/>
@@ -277,6 +279,7 @@
</Custom>
<Custom Action="CopySitePackages" After="GenerateSSLKey">NOT Installed</Custom>
<Custom Action="DeleteDirectory" After="CopySitePackages">NOT Installed</Custom>
+ <Custom Action="DbHostWithPort" After="InstallFiles"><![CDATA[DB_PORT]]></Custom>
<Custom Action="DeployDB" After="DeleteDirectory">(NOT Installed) AND (CREATE_DATABASE = "1")
</Custom>
<Custom Action="SetupDatabases" After="DeleteDirectory">(NOT Installed) AND (<![CDATA[CREATE_DATABASE <> "1"]]>)
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/0f2c66e6/scripts/installer/windows/en-us.wxl
----------------------------------------------------------------------
diff --git a/scripts/installer/windows/en-us.wxl b/scripts/installer/windows/en-us.wxl
index b5a98ec..2f34575 100644
--- a/scripts/installer/windows/en-us.wxl
+++ b/scripts/installer/windows/en-us.wxl
@@ -27,6 +27,7 @@
<String Id="DbUserNameLabel">User Name</String>
<String Id="DbPasswordLabel">Password</String>
<String Id="DbRootPasswordLabel">Root Password</String>
+ <String Id="DbServerPortLabel">Port</String>
<String Id="CreateDBCheckBoxLabel">Create Cloud Stack Database</String>
<String Id="GenerateSSLKey">Generating SSL Keys which is needed to talk to Management Server.</String>
<String Id="DeployDB">Creating Database and needed Schemas for management server.</String>