git commit: updated refs/heads/master to 1354605
Repository: cloudstack Updated Branches: refs/heads/master 7dbff9b42 -> 135460507 CLOUDSTACK-7373: Incorrect Japanese keyboard mapping with CentOS CLI guestOS on VMware host. This fix is to correct the JP keyboard mapping for VMs with windows and centOS GUI and CLI OS on VMware hypervisor. Also fixed some known issues on centOS CLI on XS hypervisor. Fix is not causing any regression. Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/13546050 Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/13546050 Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/13546050 Branch: refs/heads/master Commit: 13546050732964403301e5ee3ddcf4ec99e21f2a Parents: 7dbff9b Author: Sanjay Tripathi Authored: Tue Aug 19 16:42:10 2014 +0530 Committer: Sanjay Tripathi Committed: Wed Aug 20 14:34:28 2014 +0530 -- .../consoleproxy/ConsoleProxyClientBase.java| 2 +- systemvm/js/ajaxkeys.js | 120 +-- systemvm/js/ajaxviewer.js | 18 ++- 3 files changed, 99 insertions(+), 41 deletions(-) -- http://git-wip-us.apache.org/repos/asf/cloudstack/blob/13546050/services/console-proxy/server/src/com/cloud/consoleproxy/ConsoleProxyClientBase.java -- diff --git a/services/console-proxy/server/src/com/cloud/consoleproxy/ConsoleProxyClientBase.java b/services/console-proxy/server/src/com/cloud/consoleproxy/ConsoleProxyClientBase.java index eb38007..fc3bf4b 100644 --- a/services/console-proxy/server/src/com/cloud/consoleproxy/ConsoleProxyClientBase.java +++ b/services/console-proxy/server/src/com/cloud/consoleproxy/ConsoleProxyClientBase.java @@ -323,7 +323,7 @@ public abstract class ConsoleProxyClientBase implements ConsoleProxyClient, Cons "Japanese keyboard", "", "", "", "", "", "", "
git commit: updated refs/heads/hotfix/4.3/7038 to 2028ca4
Repository: cloudstack Updated Branches: refs/heads/hotfix/4.3/7038 [created] 2028ca4b2 CLOUDSTACK-7038: Add mysql client dependency for mgmt server/rpms Signed-off-by: Rohit Yadav Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/2028ca4b Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/2028ca4b Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/2028ca4b Branch: refs/heads/hotfix/4.3/7038 Commit: 2028ca4b2db89f78875fc0b42367185ef7c7cb78 Parents: e4ae5b2 Author: Rohit Yadav Authored: Wed Aug 20 11:47:00 2014 +0200 Committer: Rohit Yadav Committed: Wed Aug 20 11:47:00 2014 +0200 -- packaging/centos63/cloud.spec | 1 + 1 file changed, 1 insertion(+) -- http://git-wip-us.apache.org/repos/asf/cloudstack/blob/2028ca4b/packaging/centos63/cloud.spec -- diff --git a/packaging/centos63/cloud.spec b/packaging/centos63/cloud.spec index b363a2e..f5ff30c 100644 --- a/packaging/centos63/cloud.spec +++ b/packaging/centos63/cloud.spec @@ -70,6 +70,7 @@ Requires: /sbin/mount.nfs Requires: openssh-clients Requires: nfs-utils Requires: wget +Requires: mysql Requires: mysql-connector-java Requires: ws-commons-util Requires: jpackage-utils
git commit: updated refs/heads/hotfix/4.3/6892 to 907d39f
Repository: cloudstack
Updated Branches:
refs/heads/hotfix/4.3/6892 [created] 907d39fb9
CLOUDSTACK-6892: Create separate package for the mysql HA component
Manually picked from Hugo's fix: 539db08956eff322efd11771d46d29df0c7289b2
Signed-off-by: Rohit Yadav
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/907d39fb
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/907d39fb
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/907d39fb
Branch: refs/heads/hotfix/4.3/6892
Commit: 907d39fb949c9fc41ed83ba005774bfb14159a25
Parents: e4ae5b2
Author: Rohit Yadav
Authored: Wed Aug 20 12:00:08 2014 +0200
Committer: Rohit Yadav
Committed: Wed Aug 20 12:00:08 2014 +0200
--
client/tomcatconf/catalina.properties.in | 2 +-
packaging/centos63/cloud.spec| 36 +--
packaging/centos63/package.sh| 7 +-
3 files changed, 41 insertions(+), 4 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/907d39fb/client/tomcatconf/catalina.properties.in
--
diff --git a/client/tomcatconf/catalina.properties.in
b/client/tomcatconf/catalina.properties.in
index ce03ff6..282892b 100644
--- a/client/tomcatconf/catalina.properties.in
+++ b/client/tomcatconf/catalina.properties.in
@@ -44,7 +44,7 @@
package.definition=sun.,java.,org.apache.catalina.,org.apache.coyote.,org.apache
# "foo/*.jar": Add all the JARs of the specified folder as class
# repositories
# "foo/bar.jar": Add bar.jar as a class repository
-common.loader=${catalina.base}/lib,${catalina.base}/lib/*.jar,${catalina.home}/lib,${catalina.home}/lib/*.jar,/usr/share/java/mysql-connector-java.jar
+common.loader=${catalina.base}/lib,${catalina.base}/lib/*.jar,${catalina.home}/lib,${catalina.home}/lib/*.jar,/usr/share/java/mysql-connector-java.jar,/usr/share/cloudstack-mysql-ha/lib/*jar
#
# List of comma-separated paths defining the contents of the "server"
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/907d39fb/packaging/centos63/cloud.spec
--
diff --git a/packaging/centos63/cloud.spec b/packaging/centos63/cloud.spec
index b363a2e..22f4041 100644
--- a/packaging/centos63/cloud.spec
+++ b/packaging/centos63/cloud.spec
@@ -177,6 +177,17 @@ Group: System Environment/Libraries
%description awsapi
Apache Cloudstack AWS API compatibility wrapper
+%if "%{_ossnoss}" == "NOREDIST"
+%package mysql-ha
+Summary: Apache CloudStack Balancing Strategy for MySQL
+Requires: mysql-connector-java
+Requires: tomcat7
+Group: System Environmnet/Libraries
+%description mysql-ha
+Apache CloudStack Balancing Strategy for MySQL
+
+%endif
+
%prep
echo Doing CloudStack build
@@ -343,6 +354,12 @@ for name in cloud-bridge.properties
commons-logging.properties ec2-service.prope
${RPM_BUILD_ROOT}%{_sysconfdir}/%{name}/management/$name
done
+# MYSQL HA
+if [ "x%{_ossnoss}" == "xNOREDIST" ] ; then
+ mkdir -p ${RPM_BUILD_ROOT}%{_datadir}/%{name}-mysql-ha/lib
+ cp -r
plugins/database/mysql-ha/target/cloud-plugin-database-mysqlha-%{_maventag}.jar
${RPM_BUILD_ROOT}%{_datadir}/%{name}-mysql-ha/lib
+fi
+
#Don't package the below for AWS API
rm -rf
${RPM_BUILD_ROOT}%{_datadir}/%{name}-bridge/webapps/awsapi/WEB-INF/classes/db.properties
rm -rf
${RPM_BUILD_ROOT}%{_datadir}/%{name}-bridge/webapps/awsapi/WEB-INF/classes/LICENSE.txt
@@ -362,10 +379,15 @@ install -D tools/whisker/LICENSE
${RPM_BUILD_ROOT}%{_defaultdocdir}/%{name}-agen
install -D tools/whisker/NOTICE
${RPM_BUILD_ROOT}%{_defaultdocdir}/%{name}-usage-%{version}/NOTICE
install -D tools/whisker/LICENSE
${RPM_BUILD_ROOT}%{_defaultdocdir}/%{name}-usage-%{version}/LICENSE
install -D tools/whisker/NOTICE
${RPM_BUILD_ROOT}%{_defaultdocdir}/%{name}-awsapi-%{version}/NOTICE
-install -D tools/whisker/NOTICE
${RPM_BUILD_ROOT}%{_defaultdocdir}/%{name}-awsapi-%{version}/LICENSE
-install -D tools/whisker/LICENSE
${RPM_BUILD_ROOT}%{_defaultdocdir}/%{name}-cli-%{version}/NOTICE
+install -D tools/whisker/LICENSE
${RPM_BUILD_ROOT}%{_defaultdocdir}/%{name}-awsapi-%{version}/LICENSE
+install -D tools/whisker/NOTICE
${RPM_BUILD_ROOT}%{_defaultdocdir}/%{name}-cli-%{version}/NOTICE
install -D tools/whisker/LICENSE
${RPM_BUILD_ROOT}%{_defaultdocdir}/%{name}-cli-%{version}/LICENSE
+if [ "x%{_ossnoss}" == "xNOREDIST" ] ; then
+ install -D tools/whisker/LICENSE
${RPM_BUILD_ROOT}%{_defaultdocdir}/%{name}-mysql-ha-%{version}/LICENSE
+ install -D tools/whisker/NOTICE
${RPM_BUILD_ROOT}%{_defaultdocdir}/%{name}-mysql-ha-%{version}/NOTICE
+fi
+
%clean
[ ${RPM_BUILD_ROOT} != "/" ] && rm -rf ${RPM_BUILD_ROOT}
@@ -646,11 +668,21 @@ fi
%{_defaultdocdir}/%{name}-awsapi
git commit: updated refs/heads/hotfix/4.4/7038 to 3364b83
Repository: cloudstack Updated Branches: refs/heads/hotfix/4.4/7038 [created] 3364b836d CLOUDSTACK-7038: Add mysql client dependency for mgmt server/rpms Signed-off-by: Rohit Yadav (cherry picked from commit 2028ca4b2db89f78875fc0b42367185ef7c7cb78) Signed-off-by: Rohit Yadav Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/3364b836 Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/3364b836 Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/3364b836 Branch: refs/heads/hotfix/4.4/7038 Commit: 3364b836dea922992356c4f7e45de4a8ca1ac580 Parents: 4f0fc5c Author: Rohit Yadav Authored: Wed Aug 20 11:47:00 2014 +0200 Committer: Rohit Yadav Committed: Wed Aug 20 12:04:49 2014 +0200 -- packaging/centos63/cloud.spec | 1 + 1 file changed, 1 insertion(+) -- http://git-wip-us.apache.org/repos/asf/cloudstack/blob/3364b836/packaging/centos63/cloud.spec -- diff --git a/packaging/centos63/cloud.spec b/packaging/centos63/cloud.spec index e10aeaa..bb440bc 100644 --- a/packaging/centos63/cloud.spec +++ b/packaging/centos63/cloud.spec @@ -70,6 +70,7 @@ Requires: /sbin/mount.nfs Requires: openssh-clients Requires: nfs-utils Requires: wget +Requires: mysql Requires: mysql-connector-java Requires: ws-commons-util Requires: jpackage-utils
git commit: updated refs/heads/hotfix/4.4/7038 to 6a26e77
Repository: cloudstack
Updated Branches:
refs/heads/hotfix/4.4/7038 3364b836d -> 6a26e7751 (forced update)
CLOUDSTACK-7038: Add mysql client dependency for mgmt server, rpms and debs
Signed-off-by: Rohit Yadav
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/6a26e775
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/6a26e775
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/6a26e775
Branch: refs/heads/hotfix/4.4/7038
Commit: 6a26e77514b955e5c9cbb00e51183ec74d3887a3
Parents: 4f0fc5c
Author: Rohit Yadav
Authored: Wed Aug 20 11:47:00 2014 +0200
Committer: Rohit Yadav
Committed: Wed Aug 20 12:07:24 2014 +0200
--
debian/control| 2 +-
packaging/centos63/cloud.spec | 1 +
2 files changed, 2 insertions(+), 1 deletion(-)
--
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/6a26e775/debian/control
--
diff --git a/debian/control b/debian/control
index 68aadc7..5ba74ef 100644
--- a/debian/control
+++ b/debian/control
@@ -15,7 +15,7 @@ Description: A common package which contains files which are
shared by several C
Package: cloudstack-management
Architecture: all
-Depends: cloudstack-common (= ${source:Version}), tomcat6, sysvinit-utils,
sudo, jsvc, python-mysqldb, libmysql-java, python-paramiko, augeas-tools
+Depends: cloudstack-common (= ${source:Version}), tomcat6, sysvinit-utils,
sudo, jsvc, python-mysqldb, libmysql-java, python-paramiko, augeas-tools,
mysql-client
Conflicts: cloud-server, cloud-client, cloud-client-ui
Description: CloudStack server library
The CloudStack management server
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/6a26e775/packaging/centos63/cloud.spec
--
diff --git a/packaging/centos63/cloud.spec b/packaging/centos63/cloud.spec
index e10aeaa..bb440bc 100644
--- a/packaging/centos63/cloud.spec
+++ b/packaging/centos63/cloud.spec
@@ -70,6 +70,7 @@ Requires: /sbin/mount.nfs
Requires: openssh-clients
Requires: nfs-utils
Requires: wget
+Requires: mysql
Requires: mysql-connector-java
Requires: ws-commons-util
Requires: jpackage-utils
git commit: updated refs/heads/hotfix/4.4/7038 to b4601be
Repository: cloudstack
Updated Branches:
refs/heads/hotfix/4.4/7038 6a26e7751 -> b4601be4b
CLOUDSTACK-6892 Create separate package for the mysql HA component
(cherry picked from commit 539db08956eff322efd11771d46d29df0c7289b2)
Signed-off-by: Rohit Yadav
Conflicts:
packaging/centos63/cloud.spec
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/b4601be4
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/b4601be4
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/b4601be4
Branch: refs/heads/hotfix/4.4/7038
Commit: b4601be4bf782772bb0b05d38a276d2ba3beb002
Parents: 6a26e77
Author: Hugo Trippaers
Authored: Fri Jul 4 14:34:48 2014 +0200
Committer: Rohit Yadav
Committed: Wed Aug 20 12:11:37 2014 +0200
--
client/tomcatconf/catalina.properties.in | 2 +-
packaging/centos63/cloud.spec| 36 ---
packaging/centos63/package.sh| 7 +-
3 files changed, 40 insertions(+), 5 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/b4601be4/client/tomcatconf/catalina.properties.in
--
diff --git a/client/tomcatconf/catalina.properties.in
b/client/tomcatconf/catalina.properties.in
index ce03ff6..282892b 100644
--- a/client/tomcatconf/catalina.properties.in
+++ b/client/tomcatconf/catalina.properties.in
@@ -44,7 +44,7 @@
package.definition=sun.,java.,org.apache.catalina.,org.apache.coyote.,org.apache
# "foo/*.jar": Add all the JARs of the specified folder as class
# repositories
# "foo/bar.jar": Add bar.jar as a class repository
-common.loader=${catalina.base}/lib,${catalina.base}/lib/*.jar,${catalina.home}/lib,${catalina.home}/lib/*.jar,/usr/share/java/mysql-connector-java.jar
+common.loader=${catalina.base}/lib,${catalina.base}/lib/*.jar,${catalina.home}/lib,${catalina.home}/lib/*.jar,/usr/share/java/mysql-connector-java.jar,/usr/share/cloudstack-mysql-ha/lib/*jar
#
# List of comma-separated paths defining the contents of the "server"
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/b4601be4/packaging/centos63/cloud.spec
--
diff --git a/packaging/centos63/cloud.spec b/packaging/centos63/cloud.spec
index bb440bc..6527645 100644
--- a/packaging/centos63/cloud.spec
+++ b/packaging/centos63/cloud.spec
@@ -178,6 +178,17 @@ Group: System Environment/Libraries
%description awsapi
Apache Cloudstack AWS API compatibility wrapper
+%if "%{_ossnoss}" == "NOREDIST"
+%package mysql-ha
+Summary: Apache CloudStack Balancing Strategy for MySQL
+Requires: mysql-connector-java
+Requires: tomcat7
+Group: System Environmnet/Libraries
+%description mysql-ha
+Apache CloudStack Balancing Strategy for MySQL
+
+%endif
+
%prep
echo Doing CloudStack build
@@ -342,6 +353,12 @@ for name in cloud-bridge.properties
commons-logging.properties ec2-service.prope
${RPM_BUILD_ROOT}%{_sysconfdir}/%{name}/management/$name
done
+# MYSQL HA
+if [ "x%{_ossnoss}" == "xNOREDIST" ] ; then
+ mkdir -p ${RPM_BUILD_ROOT}%{_datadir}/%{name}-mysql-ha/lib
+ cp -r
plugins/database/mysql-ha/target/cloud-plugin-database-mysqlha-%{_maventag}.jar
${RPM_BUILD_ROOT}%{_datadir}/%{name}-mysql-ha/lib
+fi
+
#Don't package the below for AWS API
rm -rf
${RPM_BUILD_ROOT}%{_datadir}/%{name}-bridge/webapps/awsapi/WEB-INF/classes/db.properties
rm -rf
${RPM_BUILD_ROOT}%{_datadir}/%{name}-bridge/webapps/awsapi/WEB-INF/classes/LICENSE.txt
@@ -361,9 +378,13 @@ install -D tools/whisker/LICENSE
${RPM_BUILD_ROOT}%{_defaultdocdir}/%{name}-agen
install -D tools/whisker/NOTICE
${RPM_BUILD_ROOT}%{_defaultdocdir}/%{name}-usage-%{version}/NOTICE
install -D tools/whisker/LICENSE
${RPM_BUILD_ROOT}%{_defaultdocdir}/%{name}-usage-%{version}/LICENSE
install -D tools/whisker/NOTICE
${RPM_BUILD_ROOT}%{_defaultdocdir}/%{name}-awsapi-%{version}/NOTICE
-install -D tools/whisker/NOTICE
${RPM_BUILD_ROOT}%{_defaultdocdir}/%{name}-awsapi-%{version}/LICENSE
-install -D tools/whisker/LICENSE
${RPM_BUILD_ROOT}%{_defaultdocdir}/%{name}-cli-%{version}/NOTICE
+install -D tools/whisker/LICENSE
${RPM_BUILD_ROOT}%{_defaultdocdir}/%{name}-awsapi-%{version}/LICENSE
+install -D tools/whisker/NOTICE
${RPM_BUILD_ROOT}%{_defaultdocdir}/%{name}-cli-%{version}/NOTICE
install -D tools/whisker/LICENSE
${RPM_BUILD_ROOT}%{_defaultdocdir}/%{name}-cli-%{version}/LICENSE
+if [ "x%{_ossnoss}" == "xNOREDIST" ] ; then
+ install -D tools/whisker/LICENSE
${RPM_BUILD_ROOT}%{_defaultdocdir}/%{name}-mysql-ha-%{version}/LICENSE
+ install -D tools/whisker/NOTICE
${RPM_BUILD_ROOT}%{_defaultdocdir}/%{name}-mysql-ha-%{version}/NOTICE
+fi
%clean
[ ${RPM_BUILD_ROOT} != "/" ] && rm -rf ${RPM_BUILD_ROOT}
@@ -647,8 +668,
git commit: updated refs/heads/hotfix/4.3/7038 to f912bd7
Repository: cloudstack
Updated Branches:
refs/heads/hotfix/4.3/7038 2028ca4b2 -> f912bd7f2
CLOUDSTACK-7038: Add mysql client dependency for mgmt server pkg for debian
Signed-off-by: Rohit Yadav
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/f912bd7f
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/f912bd7f
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/f912bd7f
Branch: refs/heads/hotfix/4.3/7038
Commit: f912bd7f23beee628f1963f58232eb970fb541f1
Parents: 2028ca4
Author: Rohit Yadav
Authored: Wed Aug 20 12:16:13 2014 +0200
Committer: Rohit Yadav
Committed: Wed Aug 20 12:16:13 2014 +0200
--
debian/control | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
--
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/f912bd7f/debian/control
--
diff --git a/debian/control b/debian/control
index c23ab3a..563fde4 100644
--- a/debian/control
+++ b/debian/control
@@ -15,7 +15,7 @@ Description: A common package which contains files which are
shared by several C
Package: cloudstack-management
Architecture: all
-Depends: cloudstack-common (= ${source:Version}), tomcat6, sysvinit-utils,
sudo, jsvc, python-mysqldb, libmysql-java, python-paramiko, augeas-tools
+Depends: cloudstack-common (= ${source:Version}), tomcat6, sysvinit-utils,
sudo, jsvc, python-mysqldb, libmysql-java, python-paramiko, augeas-tools,
mysql-client
Conflicts: cloud-server, cloud-client, cloud-client-ui
Description: CloudStack server library
The CloudStack management server
git commit: updated refs/heads/master to 28ad34e
Repository: cloudstack
Updated Branches:
refs/heads/master 135460507 -> 28ad34e31
CLOUDSTACK-7038: Add mysql client dependency for mgmt server, rpms and debs
Signed-off-by: Rohit Yadav
(cherry picked from commit 6a26e77514b955e5c9cbb00e51183ec74d3887a3)
Signed-off-by: Rohit Yadav
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/28ad34e3
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/28ad34e3
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/28ad34e3
Branch: refs/heads/master
Commit: 28ad34e31e479bf6328cb06adcf647dcf295363e
Parents: 1354605
Author: Rohit Yadav
Authored: Wed Aug 20 11:47:00 2014 +0200
Committer: Rohit Yadav
Committed: Wed Aug 20 12:17:34 2014 +0200
--
debian/control| 2 +-
packaging/centos63/cloud.spec | 1 +
2 files changed, 2 insertions(+), 1 deletion(-)
--
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/28ad34e3/debian/control
--
diff --git a/debian/control b/debian/control
index 3659864..398a767 100644
--- a/debian/control
+++ b/debian/control
@@ -15,7 +15,7 @@ Description: A common package which contains files which are
shared by several C
Package: cloudstack-management
Architecture: all
-Depends: cloudstack-common (= ${source:Version}), tomcat6, sysvinit-utils,
sudo, jsvc, python-mysqldb, libmysql-java, python-paramiko, augeas-tools
+Depends: cloudstack-common (= ${source:Version}), tomcat6, sysvinit-utils,
sudo, jsvc, python-mysqldb, libmysql-java, python-paramiko, augeas-tools,
mysql-client
Conflicts: cloud-server, cloud-client, cloud-client-ui
Description: CloudStack server library
The CloudStack management server
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/28ad34e3/packaging/centos63/cloud.spec
--
diff --git a/packaging/centos63/cloud.spec b/packaging/centos63/cloud.spec
index 949f0b8..7565f95 100644
--- a/packaging/centos63/cloud.spec
+++ b/packaging/centos63/cloud.spec
@@ -70,6 +70,7 @@ Requires: /sbin/mount.nfs
Requires: openssh-clients
Requires: nfs-utils
Requires: wget
+Requires: mysql
Requires: mysql-connector-java
Requires: ws-commons-util
Requires: jpackage-utils
git commit: updated refs/heads/master to 14f3ad5
Repository: cloudstack
Updated Branches:
refs/heads/master 28ad34e31 -> 14f3ad55e
Fixed CLOUDSTACK-7374: added PaginationControl while querying ldap users
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/14f3ad55
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/14f3ad55
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/14f3ad55
Branch: refs/heads/master
Commit: 14f3ad55ecd5aff36b9b95bf0be5fdd27f5f1e8a
Parents: 28ad34e
Author: Rajani Karuturi
Authored: Wed Aug 20 15:56:36 2014 +0530
Committer: Rajani Karuturi
Committed: Wed Aug 20 15:58:08 2014 +0530
--
.../api/command/LdapCreateAccountCmd.java | 5 +-
.../cloudstack/ldap/LdapConfiguration.java | 9 +-
.../cloudstack/ldap/LdapContextFactory.java | 28 +-
.../org/apache/cloudstack/ldap/LdapManager.java | 4 +-
.../apache/cloudstack/ldap/LdapManagerImpl.java | 38 +-
.../apache/cloudstack/ldap/LdapUserManager.java | 73 ++-
.../ldap/LdapAuthenticatorSpec.groovy | 8 +-
.../ldap/LdapContextFactorySpec.groovy | 11 +-
.../ldap/LdapCreateAccountCmdSpec.groovy| 5 +-
.../cloudstack/ldap/LdapManagerImplSpec.groovy | 498 ++-
.../cloudstack/ldap/LdapUserManagerSpec.groovy | 9 +-
11 files changed, 356 insertions(+), 332 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/14f3ad55/plugins/user-authenticators/ldap/src/org/apache/cloudstack/api/command/LdapCreateAccountCmd.java
--
diff --git
a/plugins/user-authenticators/ldap/src/org/apache/cloudstack/api/command/LdapCreateAccountCmd.java
b/plugins/user-authenticators/ldap/src/org/apache/cloudstack/api/command/LdapCreateAccountCmd.java
index b753952..d1beffa 100644
---
a/plugins/user-authenticators/ldap/src/org/apache/cloudstack/api/command/LdapCreateAccountCmd.java
+++
b/plugins/user-authenticators/ldap/src/org/apache/cloudstack/api/command/LdapCreateAccountCmd.java
@@ -21,8 +21,6 @@ import java.security.SecureRandom;
import java.util.Map;
import javax.inject.Inject;
-import javax.naming.NamingException;
-
import org.apache.cloudstack.api.APICommand;
import org.apache.cloudstack.api.ApiConstants;
import org.apache.cloudstack.api.ApiErrorCode;
@@ -35,6 +33,7 @@ import org.apache.cloudstack.api.response.DomainResponse;
import org.apache.cloudstack.context.CallContext;
import org.apache.cloudstack.ldap.LdapManager;
import org.apache.cloudstack.ldap.LdapUser;
+import org.apache.cloudstack.ldap.NoLdapUserMatchingQueryException;
import org.apache.log4j.Logger;
import org.bouncycastle.util.encoders.Base64;
@@ -134,7 +133,7 @@ public class LdapCreateAccountCmd extends BaseCmd {
} else {
throw new ServerApiException(ApiErrorCode.INTERNAL_ERROR,
"Failed to create a user account");
}
-} catch (final NamingException e) {
+} catch (NoLdapUserMatchingQueryException e) {
throw new
ServerApiException(ApiErrorCode.RESOURCE_UNAVAILABLE_ERROR, "No LDAP user
exists with the username of " + username);
}
}
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/14f3ad55/plugins/user-authenticators/ldap/src/org/apache/cloudstack/ldap/LdapConfiguration.java
--
diff --git
a/plugins/user-authenticators/ldap/src/org/apache/cloudstack/ldap/LdapConfiguration.java
b/plugins/user-authenticators/ldap/src/org/apache/cloudstack/ldap/LdapConfiguration.java
index baf0de8..c171ebf 100644
---
a/plugins/user-authenticators/ldap/src/org/apache/cloudstack/ldap/LdapConfiguration.java
+++
b/plugins/user-authenticators/ldap/src/org/apache/cloudstack/ldap/LdapConfiguration.java
@@ -34,6 +34,9 @@ public class LdapConfiguration implements Configurable{
private static final ConfigKey ldapReadTimeout = new
ConfigKey(Long.class, "ldap.read.timeout", "Advanced", "1000",
"LDAP connection Timeout in milli sec", true, ConfigKey.Scope.Global,
1l);
+private static final ConfigKey ldapPageSize = new
ConfigKey(Integer.class, "ldap.request.page.size", "Advanced", "1000",
+
"page size sent to ldap server on each request to get user", true,
ConfigKey.Scope.Global, 1);
+
private final static int scope = SearchControls.SUBTREE_SCOPE;
@Inject
@@ -158,6 +161,10 @@ public class LdapConfiguration implements Configurable{
return ldapReadTimeout.value();
}
+public Integer getLdapPageSize() {
+return ldapPageSize.value();
+}
+
@Override
public String getConfigComponentName() {
return LdapConfiguration.class.getSimpleName();
@@ -165,6 +172
git commit: fix ldap section typo
Repository: cloudstack-docs-admin Updated Branches: refs/heads/master 75828eb47 -> 706219233 fix ldap section typo Project: http://git-wip-us.apache.org/repos/asf/cloudstack-docs-admin/repo Commit: http://git-wip-us.apache.org/repos/asf/cloudstack-docs-admin/commit/70621923 Tree: http://git-wip-us.apache.org/repos/asf/cloudstack-docs-admin/tree/70621923 Diff: http://git-wip-us.apache.org/repos/asf/cloudstack-docs-admin/diff/70621923 Branch: refs/heads/master Commit: 7062192336e931a67ad4b97216ab3bc2b17100d3 Parents: 75828eb Author: Pierre-Luc Dion Authored: Wed Aug 20 07:43:05 2014 -0400 Committer: Pierre-Luc Dion Committed: Wed Aug 20 07:43:05 2014 -0400 -- source/accounts.rst | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -- http://git-wip-us.apache.org/repos/asf/cloudstack-docs-admin/blob/70621923/source/accounts.rst -- diff --git a/source/accounts.rst b/source/accounts.rst index b555742..06a1660 100644 --- a/source/accounts.rst +++ b/source/accounts.rst @@ -219,7 +219,7 @@ default values are for openldap) Default value for AD and openldap is **givenname**. - ``ldap.username.attribute``: username attribute for a user within LDAP. - Default value is **SAMAccountName** for AD and **uid** for openldap. + Default value is **SAMAccountName** for AD and **uid** for openldap. Restricting LDAP users to a group:
git commit: fix ldap section typo
Repository: cloudstack-docs-admin Updated Branches: refs/heads/4.4 75828eb47 -> 343b43d63 fix ldap section typo Project: http://git-wip-us.apache.org/repos/asf/cloudstack-docs-admin/repo Commit: http://git-wip-us.apache.org/repos/asf/cloudstack-docs-admin/commit/343b43d6 Tree: http://git-wip-us.apache.org/repos/asf/cloudstack-docs-admin/tree/343b43d6 Diff: http://git-wip-us.apache.org/repos/asf/cloudstack-docs-admin/diff/343b43d6 Branch: refs/heads/4.4 Commit: 343b43d63e5480085702cccae43a3622ecbcbd73 Parents: 75828eb Author: Pierre-Luc Dion Authored: Wed Aug 20 07:43:05 2014 -0400 Committer: Pierre-Luc Dion Committed: Wed Aug 20 07:44:03 2014 -0400 -- source/accounts.rst | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -- http://git-wip-us.apache.org/repos/asf/cloudstack-docs-admin/blob/343b43d6/source/accounts.rst -- diff --git a/source/accounts.rst b/source/accounts.rst index b555742..06a1660 100644 --- a/source/accounts.rst +++ b/source/accounts.rst @@ -219,7 +219,7 @@ default values are for openldap) Default value for AD and openldap is **givenname**. - ``ldap.username.attribute``: username attribute for a user within LDAP. - Default value is **SAMAccountName** for AD and **uid** for openldap. + Default value is **SAMAccountName** for AD and **uid** for openldap. Restricting LDAP users to a group:
git commit: fix ldap section typo
Repository: cloudstack-docs-admin Updated Branches: refs/heads/4.3 6c77f6970 -> d92feaf0f fix ldap section typo Project: http://git-wip-us.apache.org/repos/asf/cloudstack-docs-admin/repo Commit: http://git-wip-us.apache.org/repos/asf/cloudstack-docs-admin/commit/d92feaf0 Tree: http://git-wip-us.apache.org/repos/asf/cloudstack-docs-admin/tree/d92feaf0 Diff: http://git-wip-us.apache.org/repos/asf/cloudstack-docs-admin/diff/d92feaf0 Branch: refs/heads/4.3 Commit: d92feaf0fdd5467734b3db654b0fa712045030b7 Parents: 6c77f69 Author: Pierre-Luc Dion Authored: Wed Aug 20 07:43:05 2014 -0400 Committer: Pierre-Luc Dion Committed: Wed Aug 20 07:44:51 2014 -0400 -- source/accounts.rst | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -- http://git-wip-us.apache.org/repos/asf/cloudstack-docs-admin/blob/d92feaf0/source/accounts.rst -- diff --git a/source/accounts.rst b/source/accounts.rst index b555742..06a1660 100644 --- a/source/accounts.rst +++ b/source/accounts.rst @@ -219,7 +219,7 @@ default values are for openldap) Default value for AD and openldap is **givenname**. - ``ldap.username.attribute``: username attribute for a user within LDAP. - Default value is **SAMAccountName** for AD and **uid** for openldap. + Default value is **SAMAccountName** for AD and **uid** for openldap. Restricting LDAP users to a group:
[1/2] git commit: updated refs/heads/master to ab7c1f3
Repository: cloudstack
Updated Branches:
refs/heads/master 14f3ad55e -> ab7c1f34d
kvm: Throw a proper exception when pool could not be fetched from libvirt
Otherwise NULL is returned and leads to a NPE further up the chain.
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/1ed0fe4e
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/1ed0fe4e
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/1ed0fe4e
Branch: refs/heads/master
Commit: 1ed0fe4ee710d33bdb5c14704bc40de01f49d540
Parents: 14f3ad5
Author: Wido den Hollander
Authored: Wed Aug 20 13:39:52 2014 +0200
Committer: Wido den Hollander
Committed: Wed Aug 20 13:39:52 2014 +0200
--
.../com/cloud/hypervisor/kvm/storage/KVMStoragePoolManager.java| 2 ++
1 file changed, 2 insertions(+)
--
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/1ed0fe4e/plugins/hypervisors/kvm/src/com/cloud/hypervisor/kvm/storage/KVMStoragePoolManager.java
--
diff --git
a/plugins/hypervisors/kvm/src/com/cloud/hypervisor/kvm/storage/KVMStoragePoolManager.java
b/plugins/hypervisors/kvm/src/com/cloud/hypervisor/kvm/storage/KVMStoragePoolManager.java
index 1d28804..f44bb03 100644
---
a/plugins/hypervisors/kvm/src/com/cloud/hypervisor/kvm/storage/KVMStoragePoolManager.java
+++
b/plugins/hypervisors/kvm/src/com/cloud/hypervisor/kvm/storage/KVMStoragePoolManager.java
@@ -204,6 +204,8 @@ public class KVMStoragePoolManager {
StoragePoolInformation info = _storagePools.get(uuid);
if (info != null) {
pool = createStoragePool(info.name, info.host, info.port,
info.path, info.userInfo, info.poolType, info.type);
+} else {
+throw new CloudRuntimeException("Could not fetch storage pool
" + uuid + " from libvirt");
}
}
return pool;
[2/2] git commit: updated refs/heads/master to ab7c1f3
kvm: Do not print the whole exception when pool is not found in libvirt
This causes the logs to be filled with Exceptions which aren't nice for
users to read
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/ab7c1f34
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/ab7c1f34
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/ab7c1f34
Branch: refs/heads/master
Commit: ab7c1f34d6212c68b7da89392b826e90eaf269ad
Parents: 1ed0fe4
Author: Wido den Hollander
Authored: Wed Aug 20 14:00:29 2014 +0200
Committer: Wido den Hollander
Committed: Wed Aug 20 14:00:29 2014 +0200
--
.../com/cloud/hypervisor/kvm/storage/LibvirtStorageAdaptor.java| 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
--
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/ab7c1f34/plugins/hypervisors/kvm/src/com/cloud/hypervisor/kvm/storage/LibvirtStorageAdaptor.java
--
diff --git
a/plugins/hypervisors/kvm/src/com/cloud/hypervisor/kvm/storage/LibvirtStorageAdaptor.java
b/plugins/hypervisors/kvm/src/com/cloud/hypervisor/kvm/storage/LibvirtStorageAdaptor.java
index e9c588e..90608c2 100644
---
a/plugins/hypervisors/kvm/src/com/cloud/hypervisor/kvm/storage/LibvirtStorageAdaptor.java
+++
b/plugins/hypervisors/kvm/src/com/cloud/hypervisor/kvm/storage/LibvirtStorageAdaptor.java
@@ -390,7 +390,7 @@ public class LibvirtStorageAdaptor implements
StorageAdaptor {
return pool;
} catch (LibvirtException e) {
-s_logger.debug("can't get storage pool", e);
+s_logger.debug("Could not find storage pool " + uuid + " in
libvirt");
throw new CloudRuntimeException(e.toString(), e);
}
}
git commit: updated refs/heads/master to 8d08178
Repository: cloudstack
Updated Branches:
refs/heads/master ab7c1f34d -> 8d0817860
CLOUDSTACK-7337: Volume state remains in allocated after volume creation
faliure from snapshot Volume should be marked to Destroy state after creation
faliure.
Signed-off-by: Koushik Das
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/8d081786
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/8d081786
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/8d081786
Branch: refs/heads/master
Commit: 8d0817860faa347eb738c28d30c98f549afb3096
Parents: ab7c1f3
Author: Harikrishna Patnala
Authored: Tue Aug 12 16:49:39 2014 +0530
Committer: Koushik Das
Committed: Wed Aug 20 17:39:53 2014 +0530
--
server/src/com/cloud/storage/VolumeApiServiceImpl.java | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/8d081786/server/src/com/cloud/storage/VolumeApiServiceImpl.java
--
diff --git a/server/src/com/cloud/storage/VolumeApiServiceImpl.java
b/server/src/com/cloud/storage/VolumeApiServiceImpl.java
index 8d83225..11d1f73 100644
--- a/server/src/com/cloud/storage/VolumeApiServiceImpl.java
+++ b/server/src/com/cloud/storage/VolumeApiServiceImpl.java
@@ -659,8 +659,9 @@ public class VolumeApiServiceImpl extends ManagerBase
implements VolumeApiServic
return volume;
} catch (Exception e) {
created = false;
-s_logger.debug("Failed to create volume: " + volume.getId(), e);
-return null;
+VolumeInfo vol = volFactory.getVolume(cmd.getEntityId());
+vol.stateTransit(Volume.Event.DestroyRequested);
+throw new CloudRuntimeException("Failed to create volume: " +
volume.getId(), e);
} finally {
if (!created) {
s_logger.trace("Decrementing volume resource count for account
id=" + volume.getAccountId() + " as volume failed to create on the backend");
[4/5] git commit: updated refs/heads/4.3 to 7e2888b
Merge branch 'hotfix/4.3/6892' into 4.3 Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/4d48f9f2 Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/4d48f9f2 Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/4d48f9f2 Branch: refs/heads/4.3 Commit: 4d48f9f238f53147ca703f3fbd4ac647e892b9df Parents: e4ae5b2 907d39f Author: Sebastien Goasguen Authored: Wed Aug 20 08:46:52 2014 -0400 Committer: Sebastien Goasguen Committed: Wed Aug 20 08:46:52 2014 -0400 -- client/tomcatconf/catalina.properties.in | 2 +- packaging/centos63/cloud.spec| 36 +-- packaging/centos63/package.sh| 7 +- 3 files changed, 41 insertions(+), 4 deletions(-) --
[5/5] git commit: updated refs/heads/4.3 to 7e2888b
Merge branch 'hotfix/4.3/7038' into 4.3 Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/7e2888b4 Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/7e2888b4 Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/7e2888b4 Branch: refs/heads/4.3 Commit: 7e2888b4cf3d64d748654fa697380e6caa75d9f0 Parents: 4d48f9f f912bd7 Author: Sebastien Goasguen Authored: Wed Aug 20 08:47:27 2014 -0400 Committer: Sebastien Goasguen Committed: Wed Aug 20 08:47:27 2014 -0400 -- debian/control| 2 +- packaging/centos63/cloud.spec | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) -- http://git-wip-us.apache.org/repos/asf/cloudstack/blob/7e2888b4/packaging/centos63/cloud.spec --
[1/5] git commit: updated refs/heads/4.3 to 7e2888b
Repository: cloudstack Updated Branches: refs/heads/4.3 e4ae5b20f -> 7e2888b4c CLOUDSTACK-7038: Add mysql client dependency for mgmt server/rpms Signed-off-by: Rohit Yadav Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/2028ca4b Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/2028ca4b Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/2028ca4b Branch: refs/heads/4.3 Commit: 2028ca4b2db89f78875fc0b42367185ef7c7cb78 Parents: e4ae5b2 Author: Rohit Yadav Authored: Wed Aug 20 11:47:00 2014 +0200 Committer: Rohit Yadav Committed: Wed Aug 20 11:47:00 2014 +0200 -- packaging/centos63/cloud.spec | 1 + 1 file changed, 1 insertion(+) -- http://git-wip-us.apache.org/repos/asf/cloudstack/blob/2028ca4b/packaging/centos63/cloud.spec -- diff --git a/packaging/centos63/cloud.spec b/packaging/centos63/cloud.spec index b363a2e..f5ff30c 100644 --- a/packaging/centos63/cloud.spec +++ b/packaging/centos63/cloud.spec @@ -70,6 +70,7 @@ Requires: /sbin/mount.nfs Requires: openssh-clients Requires: nfs-utils Requires: wget +Requires: mysql Requires: mysql-connector-java Requires: ws-commons-util Requires: jpackage-utils
[2/5] git commit: updated refs/heads/4.3 to 7e2888b
CLOUDSTACK-6892: Create separate package for the mysql HA component
Manually picked from Hugo's fix: 539db08956eff322efd11771d46d29df0c7289b2
Signed-off-by: Rohit Yadav
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/907d39fb
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/907d39fb
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/907d39fb
Branch: refs/heads/4.3
Commit: 907d39fb949c9fc41ed83ba005774bfb14159a25
Parents: e4ae5b2
Author: Rohit Yadav
Authored: Wed Aug 20 12:00:08 2014 +0200
Committer: Rohit Yadav
Committed: Wed Aug 20 12:00:08 2014 +0200
--
client/tomcatconf/catalina.properties.in | 2 +-
packaging/centos63/cloud.spec| 36 +--
packaging/centos63/package.sh| 7 +-
3 files changed, 41 insertions(+), 4 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/907d39fb/client/tomcatconf/catalina.properties.in
--
diff --git a/client/tomcatconf/catalina.properties.in
b/client/tomcatconf/catalina.properties.in
index ce03ff6..282892b 100644
--- a/client/tomcatconf/catalina.properties.in
+++ b/client/tomcatconf/catalina.properties.in
@@ -44,7 +44,7 @@
package.definition=sun.,java.,org.apache.catalina.,org.apache.coyote.,org.apache
# "foo/*.jar": Add all the JARs of the specified folder as class
# repositories
# "foo/bar.jar": Add bar.jar as a class repository
-common.loader=${catalina.base}/lib,${catalina.base}/lib/*.jar,${catalina.home}/lib,${catalina.home}/lib/*.jar,/usr/share/java/mysql-connector-java.jar
+common.loader=${catalina.base}/lib,${catalina.base}/lib/*.jar,${catalina.home}/lib,${catalina.home}/lib/*.jar,/usr/share/java/mysql-connector-java.jar,/usr/share/cloudstack-mysql-ha/lib/*jar
#
# List of comma-separated paths defining the contents of the "server"
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/907d39fb/packaging/centos63/cloud.spec
--
diff --git a/packaging/centos63/cloud.spec b/packaging/centos63/cloud.spec
index b363a2e..22f4041 100644
--- a/packaging/centos63/cloud.spec
+++ b/packaging/centos63/cloud.spec
@@ -177,6 +177,17 @@ Group: System Environment/Libraries
%description awsapi
Apache Cloudstack AWS API compatibility wrapper
+%if "%{_ossnoss}" == "NOREDIST"
+%package mysql-ha
+Summary: Apache CloudStack Balancing Strategy for MySQL
+Requires: mysql-connector-java
+Requires: tomcat7
+Group: System Environmnet/Libraries
+%description mysql-ha
+Apache CloudStack Balancing Strategy for MySQL
+
+%endif
+
%prep
echo Doing CloudStack build
@@ -343,6 +354,12 @@ for name in cloud-bridge.properties
commons-logging.properties ec2-service.prope
${RPM_BUILD_ROOT}%{_sysconfdir}/%{name}/management/$name
done
+# MYSQL HA
+if [ "x%{_ossnoss}" == "xNOREDIST" ] ; then
+ mkdir -p ${RPM_BUILD_ROOT}%{_datadir}/%{name}-mysql-ha/lib
+ cp -r
plugins/database/mysql-ha/target/cloud-plugin-database-mysqlha-%{_maventag}.jar
${RPM_BUILD_ROOT}%{_datadir}/%{name}-mysql-ha/lib
+fi
+
#Don't package the below for AWS API
rm -rf
${RPM_BUILD_ROOT}%{_datadir}/%{name}-bridge/webapps/awsapi/WEB-INF/classes/db.properties
rm -rf
${RPM_BUILD_ROOT}%{_datadir}/%{name}-bridge/webapps/awsapi/WEB-INF/classes/LICENSE.txt
@@ -362,10 +379,15 @@ install -D tools/whisker/LICENSE
${RPM_BUILD_ROOT}%{_defaultdocdir}/%{name}-agen
install -D tools/whisker/NOTICE
${RPM_BUILD_ROOT}%{_defaultdocdir}/%{name}-usage-%{version}/NOTICE
install -D tools/whisker/LICENSE
${RPM_BUILD_ROOT}%{_defaultdocdir}/%{name}-usage-%{version}/LICENSE
install -D tools/whisker/NOTICE
${RPM_BUILD_ROOT}%{_defaultdocdir}/%{name}-awsapi-%{version}/NOTICE
-install -D tools/whisker/NOTICE
${RPM_BUILD_ROOT}%{_defaultdocdir}/%{name}-awsapi-%{version}/LICENSE
-install -D tools/whisker/LICENSE
${RPM_BUILD_ROOT}%{_defaultdocdir}/%{name}-cli-%{version}/NOTICE
+install -D tools/whisker/LICENSE
${RPM_BUILD_ROOT}%{_defaultdocdir}/%{name}-awsapi-%{version}/LICENSE
+install -D tools/whisker/NOTICE
${RPM_BUILD_ROOT}%{_defaultdocdir}/%{name}-cli-%{version}/NOTICE
install -D tools/whisker/LICENSE
${RPM_BUILD_ROOT}%{_defaultdocdir}/%{name}-cli-%{version}/LICENSE
+if [ "x%{_ossnoss}" == "xNOREDIST" ] ; then
+ install -D tools/whisker/LICENSE
${RPM_BUILD_ROOT}%{_defaultdocdir}/%{name}-mysql-ha-%{version}/LICENSE
+ install -D tools/whisker/NOTICE
${RPM_BUILD_ROOT}%{_defaultdocdir}/%{name}-mysql-ha-%{version}/NOTICE
+fi
+
%clean
[ ${RPM_BUILD_ROOT} != "/" ] && rm -rf ${RPM_BUILD_ROOT}
@@ -646,11 +668,21 @@ fi
%{_defaultdocdir}/%{name}-awsapi-%{version}/LICENSE
%{_defaultdocdir}/%{name}-awsapi-%{version}/NOTICE
+%if "%{_ossnoss}" == "NOREDIS
[3/5] git commit: updated refs/heads/4.3 to 7e2888b
CLOUDSTACK-7038: Add mysql client dependency for mgmt server pkg for debian
Signed-off-by: Rohit Yadav
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/f912bd7f
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/f912bd7f
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/f912bd7f
Branch: refs/heads/4.3
Commit: f912bd7f23beee628f1963f58232eb970fb541f1
Parents: 2028ca4
Author: Rohit Yadav
Authored: Wed Aug 20 12:16:13 2014 +0200
Committer: Rohit Yadav
Committed: Wed Aug 20 12:16:13 2014 +0200
--
debian/control | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
--
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/f912bd7f/debian/control
--
diff --git a/debian/control b/debian/control
index c23ab3a..563fde4 100644
--- a/debian/control
+++ b/debian/control
@@ -15,7 +15,7 @@ Description: A common package which contains files which are
shared by several C
Package: cloudstack-management
Architecture: all
-Depends: cloudstack-common (= ${source:Version}), tomcat6, sysvinit-utils,
sudo, jsvc, python-mysqldb, libmysql-java, python-paramiko, augeas-tools
+Depends: cloudstack-common (= ${source:Version}), tomcat6, sysvinit-utils,
sudo, jsvc, python-mysqldb, libmysql-java, python-paramiko, augeas-tools,
mysql-client
Conflicts: cloud-server, cloud-client, cloud-client-ui
Description: CloudStack server library
The CloudStack management server
Git Push Summary
Repository: cloudstack Updated Branches: refs/heads/hotfix/4.3/6892 [deleted] 907d39fb9
Git Push Summary
Repository: cloudstack Updated Branches: refs/heads/hotfix/4.3/7038 [deleted] f912bd7f2
git commit: updated refs/heads/master to ffa4d73
Repository: cloudstack
Updated Branches:
refs/heads/master 8d0817860 -> ffa4d7329
Update to volume-resize logic
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/ffa4d732
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/ffa4d732
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/ffa4d732
Branch: refs/heads/master
Commit: ffa4d73290599390aea586517e12daab92e8ae64
Parents: 8d08178
Author: Mike Tutkowski
Authored: Wed Aug 20 13:18:06 2014 -0600
Committer: Mike Tutkowski
Committed: Wed Aug 20 13:18:33 2014 -0600
--
server/src/com/cloud/storage/VolumeApiServiceImpl.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
--
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/ffa4d732/server/src/com/cloud/storage/VolumeApiServiceImpl.java
--
diff --git a/server/src/com/cloud/storage/VolumeApiServiceImpl.java
b/server/src/com/cloud/storage/VolumeApiServiceImpl.java
index 11d1f73..fa104ed 100644
--- a/server/src/com/cloud/storage/VolumeApiServiceImpl.java
+++ b/server/src/com/cloud/storage/VolumeApiServiceImpl.java
@@ -998,7 +998,7 @@ public class VolumeApiServiceImpl extends ManagerBase
implements VolumeApiServic
StoragePoolVO storagePool =
_storagePoolDao.findById(vol.getPoolId());
if (currentSize != newSize && storagePool.isManaged()) {
-if (hosts.length > 0) {
+if (hosts != null && hosts.length > 0) {
volService.resizeVolumeOnHypervisor(volumeId, newSize,
hosts[0], instanceName);
}
[1/3] git commit: requester: use a better error message when urls don't start with http/s
Repository: cloudstack-cloudmonkey
Updated Branches:
refs/heads/5.2 b66b7dd62 -> 264ddcecb
requester: use a better error message when urls don't start with http/s
Signed-off-by: Rohit Yadav
Project: http://git-wip-us.apache.org/repos/asf/cloudstack-cloudmonkey/repo
Commit:
http://git-wip-us.apache.org/repos/asf/cloudstack-cloudmonkey/commit/eff67a30
Tree:
http://git-wip-us.apache.org/repos/asf/cloudstack-cloudmonkey/tree/eff67a30
Diff:
http://git-wip-us.apache.org/repos/asf/cloudstack-cloudmonkey/diff/eff67a30
Branch: refs/heads/5.2
Commit: eff67a3060cf8ec63b62ac6cf31b15390dd8cbd0
Parents: b66b7dd
Author: Rohit Yadav
Authored: Thu Aug 21 01:14:46 2014 +0200
Committer: Rohit Yadav
Committed: Thu Aug 21 01:14:46 2014 +0200
--
cloudmonkey/requester.py | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
--
http://git-wip-us.apache.org/repos/asf/cloudstack-cloudmonkey/blob/eff67a30/cloudmonkey/requester.py
--
diff --git a/cloudmonkey/requester.py b/cloudmonkey/requester.py
index 7073e79..d6d193b 100644
--- a/cloudmonkey/requester.py
+++ b/cloudmonkey/requester.py
@@ -143,7 +143,8 @@ def make_request(command, args, logger, url,
error = None
if not url.startswith('http'):
-error = "Protocol must be 'http' or 'https'"
+error = "Server URL should start with 'http' or 'https', " + \
+"please check and fix the url"
return None, error
if args is None:
[2/3] git commit: cloudmonkey: fix config change issue and credential usage issue
cloudmonkey: fix config change issue and credential usage issue
Signed-off-by: Rohit Yadav
Project: http://git-wip-us.apache.org/repos/asf/cloudstack-cloudmonkey/repo
Commit:
http://git-wip-us.apache.org/repos/asf/cloudstack-cloudmonkey/commit/f6fec24b
Tree:
http://git-wip-us.apache.org/repos/asf/cloudstack-cloudmonkey/tree/f6fec24b
Diff:
http://git-wip-us.apache.org/repos/asf/cloudstack-cloudmonkey/diff/f6fec24b
Branch: refs/heads/5.2
Commit: f6fec24bbf132455674f1e7fdfdeac5232749cd0
Parents: eff67a3
Author: Rohit Yadav
Authored: Thu Aug 21 01:34:56 2014 +0200
Committer: Rohit Yadav
Committed: Thu Aug 21 01:34:56 2014 +0200
--
cloudmonkey/cloudmonkey.py | 40 ++--
1 file changed, 26 insertions(+), 14 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/cloudstack-cloudmonkey/blob/f6fec24b/cloudmonkey/cloudmonkey.py
--
diff --git a/cloudmonkey/cloudmonkey.py b/cloudmonkey/cloudmonkey.py
index ac42944..c85bc15 100644
--- a/cloudmonkey/cloudmonkey.py
+++ b/cloudmonkey/cloudmonkey.py
@@ -30,7 +30,7 @@ try:
from cachemaker import loadcache, savecache, monkeycache, splitverbsubject
from config import __version__, __description__, __projecturl__
-from config import read_config, write_config, config_file
+from config import read_config, write_config, config_file, default_profile
from optparse import OptionParser
from prettytable import PrettyTable
from printer import monkeyprint
@@ -68,17 +68,15 @@ class CloudMonkeyShell(cmd.Cmd, object):
ruler = "="
config_options = []
verbs = []
+prompt = "ðµ > "
def __init__(self, pname, cfile):
self.program_name = pname
self.config_file = cfile
self.config_options = read_config(self.get_attr, self.set_attr,
self.config_file)
-self.credentials = {'apikey': self.apikey, 'secretkey': self.secretkey,
-'username': self.username,
-'password': self.password}
self.loadcache()
-
+self.init_credential_store()
logging.basicConfig(filename=self.log_file,
level=logging.DEBUG, format=log_fmt)
logger.debug("Loaded config fields:\n%s" % map(lambda x: "%s=%s" %
@@ -93,6 +91,11 @@ class CloudMonkeyShell(cmd.Cmd, object):
logger.debug("Error: Unable to read history. " + str(e))
atexit.register(readline.write_history_file, self.history_file)
+def init_credential_store(self):
+self.credentials = {'apikey': self.apikey, 'secretkey': self.secretkey,
+'username': self.username,
+'password': self.password}
+
def get_attr(self, field):
return getattr(self, field)
@@ -104,7 +107,7 @@ class CloudMonkeyShell(cmd.Cmd, object):
def cmdloop(self, intro=None):
print(self.intro)
-print "Using management server profile:", self.profile
+print "Using management server profile:", self.profile, "\n"
while True:
try:
super(CloudMonkeyShell, self).cmdloop(intro="")
@@ -411,9 +414,15 @@ class CloudMonkeyShell(cmd.Cmd, object):
if key in ['host', 'port', 'path', 'protocol']:
print "This parameter has been deprecated, please set 'url'
instead"
return
-setattr(self, key, value) # keys and attributes should have same names
+setattr(self, key, value)
write_config(self.get_attr, self.config_file)
-read_config(self.get_attr, self.set_attr, self.config_file)
+if key.strip() == 'profile':
+read_config(self.get_attr, self.set_attr, self.config_file)
+self.init_credential_store()
+print "\nLoaded server profile '%s' with options:" % key
+for option in default_profile.keys():
+print "%s = %s" % (option, self.get_attr(option))
+print
def complete_set(self, text, line, begidx, endidx):
mline = line.partition(" ")[2]
@@ -426,9 +435,12 @@ class CloudMonkeyShell(cmd.Cmd, object):
Login using stored credentials. Starts a session to be reused for
subsequent api calls
"""
-session, sessionkey = login(self.url, self.username, self.password)
-self.credentials['session'] = session
-self.credentials['sessionkey'] = sessionkey
+try:
+session, sessionkey = login(self.url, self.username, self.password)
+self.credentials['session'] = session
+self.credentials['sessionkey'] = sessionkey
+except Exception, e:
+print "Error while trying to log in to the server: ", str(e)
def
[3/3] git commit: config: simply config reading and writing logic
config: simply config reading and writing logic
- Treat all global variables, config dicts as readonly immutables
- Don't store anything outside method
- Remove need for first_time variable, checks for file before writing back
Signed-off-by: Rohit Yadav
Project: http://git-wip-us.apache.org/repos/asf/cloudstack-cloudmonkey/repo
Commit:
http://git-wip-us.apache.org/repos/asf/cloudstack-cloudmonkey/commit/264ddcec
Tree:
http://git-wip-us.apache.org/repos/asf/cloudstack-cloudmonkey/tree/264ddcec
Diff:
http://git-wip-us.apache.org/repos/asf/cloudstack-cloudmonkey/diff/264ddcec
Branch: refs/heads/5.2
Commit: 264ddcecb1274ead2ca4879627e373ba78780117
Parents: f6fec24
Author: Rohit Yadav
Authored: Thu Aug 21 01:36:40 2014 +0200
Committer: Rohit Yadav
Committed: Thu Aug 21 01:36:40 2014 +0200
--
cloudmonkey/config.py | 81 +-
1 file changed, 52 insertions(+), 29 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/cloudstack-cloudmonkey/blob/264ddcec/cloudmonkey/config.py
--
diff --git a/cloudmonkey/config.py b/cloudmonkey/config.py
index c99b294..6880c1a 100644
--- a/cloudmonkey/config.py
+++ b/cloudmonkey/config.py
@@ -56,7 +56,7 @@ config_fields['core']['profile'] = default_profile_name
# ui
config_fields['ui']['color'] = 'true'
-config_fields['ui']['prompt'] = '> '
+config_fields['ui']['prompt'] = 'ðµ > '
config_fields['ui']['display'] = 'default'
# default profile
@@ -69,16 +69,16 @@ default_profile['password'] = 'password'
default_profile['apikey'] = ''
default_profile['secretkey'] = ''
-def write_config(get_attr, config_file, first_time=False):
+def write_config(get_attr, config_file):
global config_fields, mandatory_sections, default_profile,
default_profile_name
config = ConfigParser()
-if os.path.exists(config_file) and not first_time:
-config = ConfigParser()
+if os.path.exists(config_file):
try:
with open(config_file, 'r') as cfg:
config.readfp(cfg)
except IOError, e:
print "Error: config_file not found", e
+
profile = None
try:
profile = get_attr('profile')
@@ -86,27 +86,42 @@ def write_config(get_attr, config_file, first_time=False):
pass
if profile is None or profile == '':
profile = default_profile_name
-config_fields['core']['profile'] = profile
if profile in mandatory_sections:
print "Server profile name cannot be", profile
sys.exit(1)
-new_profile = False
+
+has_profile_changed = False
+profile_in_use = default_profile_name
+try:
+profile_in_use = config.get('core', 'profile')
+except Exception:
+pass
+if profile_in_use != profile:
+has_profile_changed = True
+
for section in (mandatory_sections + [profile]):
if not config.has_section(section):
try:
config.add_section(section)
+if section not in mandatory_sections:
+for key in default_profile.keys():
+config.set(section, key, default_profile[key])
+else:
+for key in config_fields[section].keys():
+config.set(section, key, config_fields[section][key])
except ValueError, e:
print "Server profile name cannot be", profile
sys.exit(1)
-if section == profile and section not in config_fields:
-config_fields[section] = default_profile.copy()
-new_profile = True
-section_keys = config_fields[section].keys()
+if section in mandatory_sections:
+section_keys = config_fields[section].keys()
+else:
+section_keys = default_profile.keys()
for key in section_keys:
-if first_time or new_profile:
-config.set(section, key, config_fields[section][key])
-else:
-config.set(section, key, get_attr(key))
+try:
+if not (has_profile_changed and section == profile):
+config.set(section, key, get_attr(key))
+except Exception:
+pass
with open(config_file, 'w') as cfg:
config.write(cfg)
return config
@@ -121,40 +136,48 @@ def read_config(get_attr, set_attr, config_file):
config_fields[x].keys(), config_fields.keys()))
config_options += default_profile.keys()
+config = ConfigParser()
if os.path.exists(config_file):
-config = ConfigParser()
try:
with open(config_file, 'r') as cfg:
config.readfp(cfg)
except IOError, e:
print "Error: config_file not fou
svn commit: r6219 - /dev/cloudstack/cloudmonkey-5.2.0/
Author: bhaisaab Date: Wed Aug 20 23:41:06 2014 New Revision: 6219 Log: Committing release candidate artifacts for 5.2.0 to dist/dev/cloudstack in preparation for release vote Added: dev/cloudstack/cloudmonkey-5.2.0/apache-cloudstack-cloudmonkey-5.2.0-src.tar.bz2 (with props) dev/cloudstack/cloudmonkey-5.2.0/apache-cloudstack-cloudmonkey-5.2.0-src.tar.bz2.asc dev/cloudstack/cloudmonkey-5.2.0/apache-cloudstack-cloudmonkey-5.2.0-src.tar.bz2.md5 dev/cloudstack/cloudmonkey-5.2.0/apache-cloudstack-cloudmonkey-5.2.0-src.tar.bz2.sha Added: dev/cloudstack/cloudmonkey-5.2.0/apache-cloudstack-cloudmonkey-5.2.0-src.tar.bz2 == Binary file - no diff available. Propchange: dev/cloudstack/cloudmonkey-5.2.0/apache-cloudstack-cloudmonkey-5.2.0-src.tar.bz2 -- svn:mime-type = application/octet-stream Added: dev/cloudstack/cloudmonkey-5.2.0/apache-cloudstack-cloudmonkey-5.2.0-src.tar.bz2.asc == --- dev/cloudstack/cloudmonkey-5.2.0/apache-cloudstack-cloudmonkey-5.2.0-src.tar.bz2.asc (added) +++ dev/cloudstack/cloudmonkey-5.2.0/apache-cloudstack-cloudmonkey-5.2.0-src.tar.bz2.asc Wed Aug 20 23:41:06 2014 @@ -0,0 +1,17 @@ +-BEGIN PGP SIGNATURE- +Version: GnuPG v1.4.15 (Darwin) + +iQIcBAABAgAGBQJT9TGdAAoJEEhCSCEO49iElVsP/1SUn1kuouOF+36pvfboXLkC +W3FT7igbF9HJlmpg0ijTKyBi9LBNwFsvqI8buDeTZVU2qVabYHvxLstXJ/s5WUdu +90ux3Rb0BGhLtPfGHY93wKtatDDv4yhGt9HvS0mGbKjrkbT/FCtwZzjTzBeMGKHE +sEDcHPrUT8xpw+0ywv/LJ3Errq6sjy5XZFfTjlBZUR85cL0v5/exNWlYAYLHiAsV +m6IoNPoWM/WXcM8+0MA7Y3fgTuLkL96I04WrXlHDI7aqg9Hzrtllj6j3qTzcer8Y +cbqICI56XkdfnVFytUkbMeyN2GBmDfnsBSNYkPLmlyr9dIBdh19thz251ufsesCP +8yxOhLyGRNoDHJcnLfg5fRHGcqke8swDh3GTXS3zXv7MzKZKxdiCK4q1lz3QqVd2 ++oA5dl0eMIhapshMcx3RIyDCIz+Y9/fISlUVfK+KA4DM9n/YGOCKLVX8X91vTusE +zrL6wdKjn/1DXGCWu8zBpzxaG09HQ2kOgNYlzhUi1V9icckV0iGYJ7moGYdRhPj6 +FXjrm8xFcu4FIcrqbbZC8Mg+/6nLcN+UF5ZDVEvdIYH28U87ZzIgTwSd0obLHPL1 +gt5krghk/zJwwbrKDYT+qN8dH//QphcCBcM9dl2DIQkqjSKm2waeQU0GRgLjZ7IF +842TWYk22YxyVRayu1E5 +=3LDN +-END PGP SIGNATURE- Added: dev/cloudstack/cloudmonkey-5.2.0/apache-cloudstack-cloudmonkey-5.2.0-src.tar.bz2.md5 == --- dev/cloudstack/cloudmonkey-5.2.0/apache-cloudstack-cloudmonkey-5.2.0-src.tar.bz2.md5 (added) +++ dev/cloudstack/cloudmonkey-5.2.0/apache-cloudstack-cloudmonkey-5.2.0-src.tar.bz2.md5 Wed Aug 20 23:41:06 2014 @@ -0,0 +1,2 @@ +apache-cloudstack-cloudmonkey-5.2.0-src.tar.bz2: +69 17 2E B9 12 68 6E 04 8D 79 06 10 B4 E5 29 96 Added: dev/cloudstack/cloudmonkey-5.2.0/apache-cloudstack-cloudmonkey-5.2.0-src.tar.bz2.sha == --- dev/cloudstack/cloudmonkey-5.2.0/apache-cloudstack-cloudmonkey-5.2.0-src.tar.bz2.sha (added) +++ dev/cloudstack/cloudmonkey-5.2.0/apache-cloudstack-cloudmonkey-5.2.0-src.tar.bz2.sha Wed Aug 20 23:41:06 2014 @@ -0,0 +1,3 @@ +apache-cloudstack-cloudmonkey-5.2.0-src.tar.bz2: +3A1B8A6E BDB1E31C CED734BC 286315A4 74C1AC54 3A01C4B7 50BC32ED E75EFC6E 20864FBF + 5CE6A887 4A08BFA2 B543878D C861BB8D 4BB8E9F5 3D590394 E0766DE6
[3/3] git commit: config: simply config reading and writing logic
config: simply config reading and writing logic
- Treat all global variables, config dicts as readonly immutables
- Don't store anything outside method
- Remove need for first_time variable, checks for file before writing back
Signed-off-by: Rohit Yadav
Project: http://git-wip-us.apache.org/repos/asf/cloudstack-cloudmonkey/repo
Commit:
http://git-wip-us.apache.org/repos/asf/cloudstack-cloudmonkey/commit/264ddcec
Tree:
http://git-wip-us.apache.org/repos/asf/cloudstack-cloudmonkey/tree/264ddcec
Diff:
http://git-wip-us.apache.org/repos/asf/cloudstack-cloudmonkey/diff/264ddcec
Branch: refs/heads/master
Commit: 264ddcecb1274ead2ca4879627e373ba78780117
Parents: f6fec24
Author: Rohit Yadav
Authored: Thu Aug 21 01:36:40 2014 +0200
Committer: Rohit Yadav
Committed: Thu Aug 21 01:36:40 2014 +0200
--
cloudmonkey/config.py | 81 +-
1 file changed, 52 insertions(+), 29 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/cloudstack-cloudmonkey/blob/264ddcec/cloudmonkey/config.py
--
diff --git a/cloudmonkey/config.py b/cloudmonkey/config.py
index c99b294..6880c1a 100644
--- a/cloudmonkey/config.py
+++ b/cloudmonkey/config.py
@@ -56,7 +56,7 @@ config_fields['core']['profile'] = default_profile_name
# ui
config_fields['ui']['color'] = 'true'
-config_fields['ui']['prompt'] = '> '
+config_fields['ui']['prompt'] = 'ðµ > '
config_fields['ui']['display'] = 'default'
# default profile
@@ -69,16 +69,16 @@ default_profile['password'] = 'password'
default_profile['apikey'] = ''
default_profile['secretkey'] = ''
-def write_config(get_attr, config_file, first_time=False):
+def write_config(get_attr, config_file):
global config_fields, mandatory_sections, default_profile,
default_profile_name
config = ConfigParser()
-if os.path.exists(config_file) and not first_time:
-config = ConfigParser()
+if os.path.exists(config_file):
try:
with open(config_file, 'r') as cfg:
config.readfp(cfg)
except IOError, e:
print "Error: config_file not found", e
+
profile = None
try:
profile = get_attr('profile')
@@ -86,27 +86,42 @@ def write_config(get_attr, config_file, first_time=False):
pass
if profile is None or profile == '':
profile = default_profile_name
-config_fields['core']['profile'] = profile
if profile in mandatory_sections:
print "Server profile name cannot be", profile
sys.exit(1)
-new_profile = False
+
+has_profile_changed = False
+profile_in_use = default_profile_name
+try:
+profile_in_use = config.get('core', 'profile')
+except Exception:
+pass
+if profile_in_use != profile:
+has_profile_changed = True
+
for section in (mandatory_sections + [profile]):
if not config.has_section(section):
try:
config.add_section(section)
+if section not in mandatory_sections:
+for key in default_profile.keys():
+config.set(section, key, default_profile[key])
+else:
+for key in config_fields[section].keys():
+config.set(section, key, config_fields[section][key])
except ValueError, e:
print "Server profile name cannot be", profile
sys.exit(1)
-if section == profile and section not in config_fields:
-config_fields[section] = default_profile.copy()
-new_profile = True
-section_keys = config_fields[section].keys()
+if section in mandatory_sections:
+section_keys = config_fields[section].keys()
+else:
+section_keys = default_profile.keys()
for key in section_keys:
-if first_time or new_profile:
-config.set(section, key, config_fields[section][key])
-else:
-config.set(section, key, get_attr(key))
+try:
+if not (has_profile_changed and section == profile):
+config.set(section, key, get_attr(key))
+except Exception:
+pass
with open(config_file, 'w') as cfg:
config.write(cfg)
return config
@@ -121,40 +136,48 @@ def read_config(get_attr, set_attr, config_file):
config_fields[x].keys(), config_fields.keys()))
config_options += default_profile.keys()
+config = ConfigParser()
if os.path.exists(config_file):
-config = ConfigParser()
try:
with open(config_file, 'r') as cfg:
config.readfp(cfg)
except IOError, e:
print "Error: config_file not
[1/3] git commit: requester: use a better error message when urls don't start with http/s
Repository: cloudstack-cloudmonkey
Updated Branches:
refs/heads/master b66b7dd62 -> 264ddcecb
requester: use a better error message when urls don't start with http/s
Signed-off-by: Rohit Yadav
Project: http://git-wip-us.apache.org/repos/asf/cloudstack-cloudmonkey/repo
Commit:
http://git-wip-us.apache.org/repos/asf/cloudstack-cloudmonkey/commit/eff67a30
Tree:
http://git-wip-us.apache.org/repos/asf/cloudstack-cloudmonkey/tree/eff67a30
Diff:
http://git-wip-us.apache.org/repos/asf/cloudstack-cloudmonkey/diff/eff67a30
Branch: refs/heads/master
Commit: eff67a3060cf8ec63b62ac6cf31b15390dd8cbd0
Parents: b66b7dd
Author: Rohit Yadav
Authored: Thu Aug 21 01:14:46 2014 +0200
Committer: Rohit Yadav
Committed: Thu Aug 21 01:14:46 2014 +0200
--
cloudmonkey/requester.py | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
--
http://git-wip-us.apache.org/repos/asf/cloudstack-cloudmonkey/blob/eff67a30/cloudmonkey/requester.py
--
diff --git a/cloudmonkey/requester.py b/cloudmonkey/requester.py
index 7073e79..d6d193b 100644
--- a/cloudmonkey/requester.py
+++ b/cloudmonkey/requester.py
@@ -143,7 +143,8 @@ def make_request(command, args, logger, url,
error = None
if not url.startswith('http'):
-error = "Protocol must be 'http' or 'https'"
+error = "Server URL should start with 'http' or 'https', " + \
+"please check and fix the url"
return None, error
if args is None:
[2/3] git commit: cloudmonkey: fix config change issue and credential usage issue
cloudmonkey: fix config change issue and credential usage issue
Signed-off-by: Rohit Yadav
Project: http://git-wip-us.apache.org/repos/asf/cloudstack-cloudmonkey/repo
Commit:
http://git-wip-us.apache.org/repos/asf/cloudstack-cloudmonkey/commit/f6fec24b
Tree:
http://git-wip-us.apache.org/repos/asf/cloudstack-cloudmonkey/tree/f6fec24b
Diff:
http://git-wip-us.apache.org/repos/asf/cloudstack-cloudmonkey/diff/f6fec24b
Branch: refs/heads/master
Commit: f6fec24bbf132455674f1e7fdfdeac5232749cd0
Parents: eff67a3
Author: Rohit Yadav
Authored: Thu Aug 21 01:34:56 2014 +0200
Committer: Rohit Yadav
Committed: Thu Aug 21 01:34:56 2014 +0200
--
cloudmonkey/cloudmonkey.py | 40 ++--
1 file changed, 26 insertions(+), 14 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/cloudstack-cloudmonkey/blob/f6fec24b/cloudmonkey/cloudmonkey.py
--
diff --git a/cloudmonkey/cloudmonkey.py b/cloudmonkey/cloudmonkey.py
index ac42944..c85bc15 100644
--- a/cloudmonkey/cloudmonkey.py
+++ b/cloudmonkey/cloudmonkey.py
@@ -30,7 +30,7 @@ try:
from cachemaker import loadcache, savecache, monkeycache, splitverbsubject
from config import __version__, __description__, __projecturl__
-from config import read_config, write_config, config_file
+from config import read_config, write_config, config_file, default_profile
from optparse import OptionParser
from prettytable import PrettyTable
from printer import monkeyprint
@@ -68,17 +68,15 @@ class CloudMonkeyShell(cmd.Cmd, object):
ruler = "="
config_options = []
verbs = []
+prompt = "ðµ > "
def __init__(self, pname, cfile):
self.program_name = pname
self.config_file = cfile
self.config_options = read_config(self.get_attr, self.set_attr,
self.config_file)
-self.credentials = {'apikey': self.apikey, 'secretkey': self.secretkey,
-'username': self.username,
-'password': self.password}
self.loadcache()
-
+self.init_credential_store()
logging.basicConfig(filename=self.log_file,
level=logging.DEBUG, format=log_fmt)
logger.debug("Loaded config fields:\n%s" % map(lambda x: "%s=%s" %
@@ -93,6 +91,11 @@ class CloudMonkeyShell(cmd.Cmd, object):
logger.debug("Error: Unable to read history. " + str(e))
atexit.register(readline.write_history_file, self.history_file)
+def init_credential_store(self):
+self.credentials = {'apikey': self.apikey, 'secretkey': self.secretkey,
+'username': self.username,
+'password': self.password}
+
def get_attr(self, field):
return getattr(self, field)
@@ -104,7 +107,7 @@ class CloudMonkeyShell(cmd.Cmd, object):
def cmdloop(self, intro=None):
print(self.intro)
-print "Using management server profile:", self.profile
+print "Using management server profile:", self.profile, "\n"
while True:
try:
super(CloudMonkeyShell, self).cmdloop(intro="")
@@ -411,9 +414,15 @@ class CloudMonkeyShell(cmd.Cmd, object):
if key in ['host', 'port', 'path', 'protocol']:
print "This parameter has been deprecated, please set 'url'
instead"
return
-setattr(self, key, value) # keys and attributes should have same names
+setattr(self, key, value)
write_config(self.get_attr, self.config_file)
-read_config(self.get_attr, self.set_attr, self.config_file)
+if key.strip() == 'profile':
+read_config(self.get_attr, self.set_attr, self.config_file)
+self.init_credential_store()
+print "\nLoaded server profile '%s' with options:" % key
+for option in default_profile.keys():
+print "%s = %s" % (option, self.get_attr(option))
+print
def complete_set(self, text, line, begidx, endidx):
mline = line.partition(" ")[2]
@@ -426,9 +435,12 @@ class CloudMonkeyShell(cmd.Cmd, object):
Login using stored credentials. Starts a session to be reused for
subsequent api calls
"""
-session, sessionkey = login(self.url, self.username, self.password)
-self.credentials['session'] = session
-self.credentials['sessionkey'] = sessionkey
+try:
+session, sessionkey = login(self.url, self.username, self.password)
+self.credentials['session'] = session
+self.credentials['sessionkey'] = sessionkey
+except Exception, e:
+print "Error while trying to log in to the server: ", str(e)
d
git commit: updated refs/heads/hotfix/4.4/6508 to 6e20058
Repository: cloudstack
Updated Branches:
refs/heads/hotfix/4.4/6508 [created] 6e20058fb
CLOUDSTACK-6508: impossible to list projects from API with domainid set
(cherry picked from commit 19b72d6cf57665fc3935fdd7f7e9dad9117f0616)
Signed-off-by: Rohit Yadav
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/6e20058f
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/6e20058f
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/6e20058f
Branch: refs/heads/hotfix/4.4/6508
Commit: 6e20058fb7fd482b4bbcd30f3c78aaa59c6c09d3
Parents: 4f0fc5c
Author: Saksham Srivastava
Authored: Mon Jun 2 15:51:06 2014 +0530
Committer: Rohit Yadav
Committed: Thu Aug 21 03:17:32 2014 +0200
--
server/src/com/cloud/api/query/QueryManagerImpl.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
--
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/6e20058f/server/src/com/cloud/api/query/QueryManagerImpl.java
--
diff --git a/server/src/com/cloud/api/query/QueryManagerImpl.java
b/server/src/com/cloud/api/query/QueryManagerImpl.java
index 1182be5..18a155f 100644
--- a/server/src/com/cloud/api/query/QueryManagerImpl.java
+++ b/server/src/com/cloud/api/query/QueryManagerImpl.java
@@ -1298,7 +1298,7 @@ public class QueryManagerImpl extends ManagerBase
implements QueryService {
throw new PermissionDeniedException("Can't list account " +
accountName + " projects; unauthorized");
}
-if (domainId != null && domainId.equals(caller.getDomainId())) {
+if (domainId != null && !domainId.equals(caller.getDomainId())) {
throw new PermissionDeniedException("Can't list domain id= " +
domainId + " projects; unauthorized");
}
git commit: updated refs/heads/master to cab2b12
Repository: cloudstack
Updated Branches:
refs/heads/master ffa4d7329 -> cab2b12d7
CLOUDSTACK-7155 Re-copying templates to other zones doesn't work
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/cab2b12d
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/cab2b12d
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/cab2b12d
Branch: refs/heads/master
Commit: cab2b12d7d2a37bb4d8e157bd12dee3117d1e8f0
Parents: ffa4d73
Author: Bharat Kumar
Authored: Tue Aug 19 20:09:02 2014 +0530
Committer: root
Committed: Thu Aug 21 09:50:54 2014 +0530
--
.../storage/datastore/db/TemplateDataStoreDao.java| 2 ++
.../storage/image/db/TemplateDataStoreDaoImpl.java| 10 ++
.../src/com/cloud/template/HypervisorTemplateAdapter.java | 5 +
server/src/com/cloud/template/TemplateManagerImpl.java| 3 +++
4 files changed, 20 insertions(+)
--
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/cab2b12d/engine/schema/src/org/apache/cloudstack/storage/datastore/db/TemplateDataStoreDao.java
--
diff --git
a/engine/schema/src/org/apache/cloudstack/storage/datastore/db/TemplateDataStoreDao.java
b/engine/schema/src/org/apache/cloudstack/storage/datastore/db/TemplateDataStoreDao.java
index cb15949..13c4d31 100644
---
a/engine/schema/src/org/apache/cloudstack/storage/datastore/db/TemplateDataStoreDao.java
+++
b/engine/schema/src/org/apache/cloudstack/storage/datastore/db/TemplateDataStoreDao.java
@@ -76,4 +76,6 @@ public interface TemplateDataStoreDao extends
GenericDao listTemplateDownloadUrls();
+
+void removeByTemplateStore(long templateId, long imageStoreId);
}
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/cab2b12d/engine/storage/src/org/apache/cloudstack/storage/image/db/TemplateDataStoreDaoImpl.java
--
diff --git
a/engine/storage/src/org/apache/cloudstack/storage/image/db/TemplateDataStoreDaoImpl.java
b/engine/storage/src/org/apache/cloudstack/storage/image/db/TemplateDataStoreDaoImpl.java
index 50334f4..a5cf6f8 100644
---
a/engine/storage/src/org/apache/cloudstack/storage/image/db/TemplateDataStoreDaoImpl.java
+++
b/engine/storage/src/org/apache/cloudstack/storage/image/db/TemplateDataStoreDaoImpl.java
@@ -292,6 +292,16 @@ public class TemplateDataStoreDaoImpl extends
GenericDaoBase sc = storeTemplateSearch.create();
+sc.setParameters("template_id", templateId);
+sc.setParameters("store_id", imageStoreId);
+sc.setParameters("destroyed", false);
+expunge(sc);
+
+}
+
+@Override
public TemplateDataStoreVO findByTemplateZoneDownloadStatus(long
templateId, Long zoneId, Status... status) {
// get all elgible image stores
List imgStores = _storeMgr.getImageStoresByScope(new
ZoneScope(zoneId));
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/cab2b12d/server/src/com/cloud/template/HypervisorTemplateAdapter.java
--
diff --git a/server/src/com/cloud/template/HypervisorTemplateAdapter.java
b/server/src/com/cloud/template/HypervisorTemplateAdapter.java
index 72aaff5..42f4b55 100755
--- a/server/src/com/cloud/template/HypervisorTemplateAdapter.java
+++ b/server/src/com/cloud/template/HypervisorTemplateAdapter.java
@@ -27,6 +27,7 @@ import javax.inject.Inject;
import org.apache.log4j.Logger;
+import org.apache.cloudstack.storage.datastore.db.TemplateDataStoreDao;
import org.apache.cloudstack.api.command.user.iso.DeleteIsoCmd;
import org.apache.cloudstack.api.command.user.iso.RegisterIsoCmd;
import org.apache.cloudstack.api.command.user.template.DeleteTemplateCmd;
@@ -83,6 +84,7 @@ public class HypervisorTemplateAdapter extends
TemplateAdapterBase {
@Inject
AgentManager _agentMgr;
+@Inject TemplateDataStoreDao templateDataStoreDao;
@Inject
DataStoreManager storeMgr;
@Inject
@@ -306,6 +308,9 @@ public class HypervisorTemplateAdapter extends
TemplateAdapterBase {
templateZoneDao.remove(templateZone.getId());
}
}
+//mark all the occurrences of this template in the given
store as destroyed.
+
templateDataStoreDao.removeByTemplateStore(template.getId(),
imageStore.getId());
+
} catch (InterruptedException e) {
s_logger.debug("delete template Failed", e);
throw new CloudRuntimeException("delete template Failed",
e);
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/cab2b12d/server/src/com/cloud/template/TemplateManagerImpl.java
--
git commit: updated refs/heads/master to 76d050b
Repository: cloudstack
Updated Branches:
refs/heads/master cab2b12d7 -> 76d050ba5
CLOUDSTACK-4282: [SharedNetworks] Unable to create multiple shared networks
with different VLAN but with same CIDR
Signed-off-by: sanjeev
Incorporated review comments provided in review request 23610
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/76d050ba
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/76d050ba
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/76d050ba
Branch: refs/heads/master
Commit: 76d050ba538fd1a4f6e4c4e600e9338051a2683d
Parents: cab2b12
Author: sanjeevneelarapu
Authored: Tue Jul 15 17:33:50 2014 +0530
Committer: sanjeev
Committed: Thu Aug 21 10:22:19 2014 +0530
--
.../component/test_shared_networks.py | 410 +--
1 file changed, 294 insertions(+), 116 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/76d050ba/test/integration/component/test_shared_networks.py
--
diff --git a/test/integration/component/test_shared_networks.py
b/test/integration/component/test_shared_networks.py
index f99bfbf..ffc3609 100644
--- a/test/integration/component/test_shared_networks.py
+++ b/test/integration/component/test_shared_networks.py
@@ -17,7 +17,7 @@
""" P1 tests for shared networks
"""
-#Import Local Modules
+# Import Local Modules
from nose.plugins.attrib import attr
from marvin.cloudstackTestCase import cloudstackTestCase, unittest
from marvin.lib.base import (Account,
@@ -32,14 +32,15 @@ from marvin.lib.base import (Account,
ServiceOffering,
PublicIPAddress)
from marvin.lib.utils import (cleanup_resources,
+ validateList,
xsplit)
from marvin.lib.common import (get_domain,
get_zone,
get_template,
wait_for_cleanup,
get_free_vlan)
+from marvin.codes import *
import random
-
import netaddr
class Services:
@@ -67,8 +68,8 @@ class Services:
"name": "Tiny Instance",
"displaytext": "Tiny Instance",
"cpunumber": 1,
-"cpuspeed": 100, # in MHz
-"memory": 128, # In MBs
+"cpuspeed": 100, # in MHz
+"memory": 128, # In MBs
},
"network_offering": {
"name": 'MySharedOffering',
@@ -183,7 +184,7 @@ class TestSharedNetworks(cloudstackTestCase):
@classmethod
def tearDownClass(cls):
try:
-#Cleanup resources used
+# Cleanup resources used
cleanup_resources(cls.api_client, cls._cleanup)
except Exception as e:
raise Exception("Warning: Exception during cleanup : %s" % e)
@@ -195,15 +196,15 @@ class TestSharedNetworks(cloudstackTestCase):
# Set the subnet number of shared networks randomly prior to execution
# of each test case to avoid overlapping of ip addresses
-shared_network_subnet_number = random.randrange(1,254)
+shared_network_subnet_number = random.randrange(1, 254)
-self.services["network"]["gateway"] =
"172.16."+str(shared_network_subnet_number)+".1"
-self.services["network"]["startip"] =
"172.16."+str(shared_network_subnet_number)+".2"
-self.services["network"]["endip"] =
"172.16."+str(shared_network_subnet_number)+".20"
+self.services["network"]["gateway"] = "172.16." +
str(shared_network_subnet_number) + ".1"
+self.services["network"]["startip"] = "172.16." +
str(shared_network_subnet_number) + ".2"
+self.services["network"]["endip"] = "172.16." +
str(shared_network_subnet_number) + ".20"
-self.services["network1"]["gateway"] =
"172.16."+str(shared_network_subnet_number + 1)+".1"
-self.services["network1"]["startip"] =
"172.16."+str(shared_network_subnet_number + 1)+".2"
-self.services["network1"]["endip"] =
"172.16."+str(shared_network_subnet_number + 1)+".20"
+self.services["network1"]["gateway"] = "172.16." +
str(shared_network_subnet_number + 1) + ".1"
+self.services["network1"]["startip"] = "172.16." +
str(shared_network_subnet_number + 1) + ".2"
+self.services["network1"]["endip"] = "172.16." +
str(shared_network_subnet_number + 1
git commit: updated refs/heads/master to ac80535
Repository: cloudstack
Updated Branches:
refs/heads/master 76d050ba5 -> ac8053557
CLOUDSTACK-7368: Fixed network cleanup issue in test_add_remove_network.py
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/ac805355
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/ac805355
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/ac805355
Branch: refs/heads/master
Commit: ac8053557427e4345b0c8c98421ac8fa776dace8
Parents: 76d050b
Author: Gaurav Aradhye
Authored: Wed Aug 20 12:27:27 2014 +0530
Committer: Girish Shilamkar
Committed: Thu Aug 21 11:34:44 2014 +0530
--
test/integration/component/test_add_remove_network.py | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
--
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/ac805355/test/integration/component/test_add_remove_network.py
--
diff --git a/test/integration/component/test_add_remove_network.py
b/test/integration/component/test_add_remove_network.py
index 34af7bc..9b57761 100644
--- a/test/integration/component/test_add_remove_network.py
+++ b/test/integration/component/test_add_remove_network.py
@@ -579,6 +579,7 @@ class TestAddNetworkToVirtualMachine(cloudstackTestCase):
self.services["shared_network_2"]["vlan"] =
get_free_vlan(self.apiclient, self.zone.id)[1]
network =
Network.create(self.api_client,self.services["shared_network_2"],account.name,
account.domainid,
networkofferingid=self.shared_network_offering.id)
+self.cleanup.append(network)
if network is None:
self.skipTest("Network should not be none. Case not handled for
Network of type %s" % value)
@@ -632,9 +633,10 @@ class TestAddNetworkToVirtualMachine(cloudstackTestCase):
domainid=self.child_domain_2.id)
tempCleanupList.append(self.child_do_admin_2)
except Exception as e:
+self.fail(e)
+finally:
tempCleanupList.reverse()
self.cleanup += tempCleanupList
-self.fail(e)
network =
Network.create(self.api_client,self.services["isolated_network"],self.child_do_admin_1.name,
self.child_do_admin_1.domainid,networkofferingid=self.isolated_network_offering.id)
