cloudstack-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From chipchild...@apache.org
Subject git commit: refs/heads/master - BUG-ID: CLOUDSTACK-1713, CLOUDSTACK-1719
Date Tue, 26 Mar 2013 13:28:15 GMT
Updated Branches:
  refs/heads/master 854ab3955 -> 582f8a0f3


BUG-ID: CLOUDSTACK-1713, CLOUDSTACK-1719

Summary: EC2 REST API: AWS APIs are not getting translated on the CloudStack Management Server
and AWS API Installation Problems.

Fixing the class not found exception, key not found and other issues as mentioned in the above
two defects.

Signed-off-by: Pradeep <pradeep.soundararajan@citrix.com>


Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/582f8a0f
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/582f8a0f
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/582f8a0f

Branch: refs/heads/master
Commit: 582f8a0f38f99030bec643ba733a42ee0167f9b4
Parents: 854ab39
Author: Pradeep Soundararajan <pradeep.soundararajan@citrix.com>
Authored: Tue Mar 26 13:25:57 2013 +0000
Committer: Chip Childers <chip.childers@gmail.com>
Committed: Tue Mar 26 13:28:03 2013 +0000

----------------------------------------------------------------------
 .../util/EncryptionSecretKeyCheckerUtil.java       |    2 +-
 packaging/centos63/cloud.spec                      |    8 +++-----
 .../utils/crypt/EncryptionSecretKeyChanger.java    |    2 +-
 .../utils/crypt/EncryptionSecretKeyChecker.java    |    2 +-
 4 files changed, 6 insertions(+), 8 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cloudstack/blob/582f8a0f/awsapi/src/com/cloud/bridge/util/EncryptionSecretKeyCheckerUtil.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/cloud/bridge/util/EncryptionSecretKeyCheckerUtil.java b/awsapi/src/com/cloud/bridge/util/EncryptionSecretKeyCheckerUtil.java
index 0a65221..6f0049f 100644
--- a/awsapi/src/com/cloud/bridge/util/EncryptionSecretKeyCheckerUtil.java
+++ b/awsapi/src/com/cloud/bridge/util/EncryptionSecretKeyCheckerUtil.java
@@ -36,7 +36,7 @@ import org.jasypt.encryption.pbe.config.SimpleStringPBEConfig;
 public class EncryptionSecretKeyCheckerUtil {
     private static final Logger s_logger = Logger.getLogger(EncryptionSecretKeyCheckerUtil.class);
     
-    private static final String s_keyFile = "/etc/cloud/management/key";
+    private static final String s_keyFile = "/etc/cloudstack/management/key";
     private static final String s_envKey = "CLOUD_SECRET_KEY";
     private static StandardPBEStringEncryptor s_encryptor = new StandardPBEStringEncryptor();
     private static boolean s_useEncryption = false;

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/582f8a0f/packaging/centos63/cloud.spec
----------------------------------------------------------------------
diff --git a/packaging/centos63/cloud.spec b/packaging/centos63/cloud.spec
index 94e886b..893691c 100644
--- a/packaging/centos63/cloud.spec
+++ b/packaging/centos63/cloud.spec
@@ -297,22 +297,18 @@ install -D awsapi-setup/setup/cloud-setup-bridge ${RPM_BUILD_ROOT}%{_bindir}/clo
 install -D awsapi-setup/setup/cloudstack-aws-api-register ${RPM_BUILD_ROOT}%{_bindir}/cloudstack-aws-api-register
 cp -r awsapi-setup/db/mysql/* ${RPM_BUILD_ROOT}%{_datadir}/%{name}-bridge/setup
 
-for name in applicationContext.xml cloud-bridge.properties commons-logging.properties ; do
+for name in applicationContext.xml cloud-bridge.properties commons-logging.properties crypto.properties
xes.keystore ec2-service.properties ; do
   mv ${RPM_BUILD_ROOT}%{_datadir}/%{name}-bridge/webapps/awsapi/WEB-INF/classes/$name \
     ${RPM_BUILD_ROOT}%{_sysconfdir}/%{name}/management/$name
 done
 
-install -D ${RPM_BUILD_ROOT}%{_datadir}/%{name}-bridge/webapps/awsapi/WEB-INF/classes/ec2-service.properties
${RPM_BUILD_ROOT}%{_sysconfdir}/%{name}/management/ec2-service.properties
-
 #Don't package the below for AWS API
-rm -rf ${RPM_BUILD_ROOT}%{_datadir}/%{name}-bridge/webapps/awsapi/WEB-INF/classes/com
 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
 rm -rf ${RPM_BUILD_ROOT}%{_datadir}/%{name}-bridge/webapps/awsapi/WEB-INF/classes/log4j.properties
 rm -rf ${RPM_BUILD_ROOT}%{_datadir}/%{name}-bridge/webapps/awsapi/WEB-INF/classes/log4j-vmops.xml
 rm -rf ${RPM_BUILD_ROOT}%{_datadir}/%{name}-bridge/webapps/awsapi/WEB-INF/classes/META-INF
 rm -rf ${RPM_BUILD_ROOT}%{_datadir}/%{name}-bridge/webapps/awsapi/WEB-INF/classes/NOTICE.txt
-rm -rf ${RPM_BUILD_ROOT}%{_datadir}/%{name}-bridge/webapps/awsapi/WEB-INF/classes/org
 rm -rf ${RPM_BUILD_ROOT}%{_datadir}/%{name}-bridge/webapps/awsapi/WEB-INF/classes/services.xml
 
 %clean
@@ -398,6 +394,8 @@ fi
 %config(noreplace) %{_sysconfdir}/%{name}/management/cloud-bridge.properties
 %config(noreplace) %{_sysconfdir}/%{name}/management/commons-logging.properties
 %config(noreplace) %{_sysconfdir}/%{name}/management/ec2-service.properties
+%config(noreplace) %{_sysconfdir}/%{name}/management/crypto.properties
+%config(noreplace) %{_sysconfdir}/%{name}/management/xes.keystore
 %attr(0755,root,root) %{_initrddir}/%{name}-management
 %attr(0755,root,root) %{_bindir}/%{name}-setup-management
 %attr(0755,root,root) %{_bindir}/%{name}-update-xenserver-licenses

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/582f8a0f/utils/src/com/cloud/utils/crypt/EncryptionSecretKeyChanger.java
----------------------------------------------------------------------
diff --git a/utils/src/com/cloud/utils/crypt/EncryptionSecretKeyChanger.java b/utils/src/com/cloud/utils/crypt/EncryptionSecretKeyChanger.java
index 2be2749..9b13eb8 100755
--- a/utils/src/com/cloud/utils/crypt/EncryptionSecretKeyChanger.java
+++ b/utils/src/com/cloud/utils/crypt/EncryptionSecretKeyChanger.java
@@ -54,7 +54,7 @@ public class EncryptionSecretKeyChanger {
 
 	private StandardPBEStringEncryptor oldEncryptor = new StandardPBEStringEncryptor();
 	private StandardPBEStringEncryptor newEncryptor = new StandardPBEStringEncryptor();
-	private static final String keyFile = "/etc/cloud/management/key";
+	private static final String keyFile = "/etc/cloudstack/management/key";
 
 	public static void main(String[] args){
 		List<String> argsList = Arrays.asList(args);

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/582f8a0f/utils/src/com/cloud/utils/crypt/EncryptionSecretKeyChecker.java
----------------------------------------------------------------------
diff --git a/utils/src/com/cloud/utils/crypt/EncryptionSecretKeyChecker.java b/utils/src/com/cloud/utils/crypt/EncryptionSecretKeyChecker.java
index 5ffa14f..bf6c351 100755
--- a/utils/src/com/cloud/utils/crypt/EncryptionSecretKeyChecker.java
+++ b/utils/src/com/cloud/utils/crypt/EncryptionSecretKeyChecker.java
@@ -46,7 +46,7 @@ public class EncryptionSecretKeyChecker extends AdapterBase implements SystemInt
     private static final Logger s_logger = Logger.getLogger(EncryptionSecretKeyChecker.class);
 
     // Two possible locations with the new packaging naming
-    private static final String s_altKeyFile = "/etc/cloud/management/key";
+    private static final String s_altKeyFile = "/etc/cloudstack/management/key";
     private static final String s_keyFile = "/etc/cloudstack/management/key";
     private static final String s_envKey = "CLOUD_SECRET_KEY";
     private static StandardPBEStringEncryptor s_encryptor = new StandardPBEStringEncryptor();


Mime
View raw message