Skip to content

Commit 582f8a0

Browse files
Pradeep Soundararajanchipchilders
Pradeep Soundararajan
authored and
chipchilders
committed
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>
1 parent 854ab39 commit 582f8a0

4 files changed

Lines changed: 6 additions & 8 deletions

File tree

‎awsapi/src/com/cloud/bridge/util/EncryptionSecretKeyCheckerUtil.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@
3636
public class EncryptionSecretKeyCheckerUtil {
3737
private static final Logger s_logger = Logger.getLogger(EncryptionSecretKeyCheckerUtil.class);
3838

39-
private static final String s_keyFile = "/etc/cloud/management/key";
39+
private static final String s_keyFile = "/etc/cloudstack/management/key";
4040
private static final String s_envKey = "CLOUD_SECRET_KEY";
4141
private static StandardPBEStringEncryptor s_encryptor = new StandardPBEStringEncryptor();
4242
private static boolean s_useEncryption = false;

‎packaging/centos63/cloud.spec‎

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -297,22 +297,18 @@ install -D awsapi-setup/setup/cloud-setup-bridge ${RPM_BUILD_ROOT}%{_bindir}/clo
297297
install -D awsapi-setup/setup/cloudstack-aws-api-register ${RPM_BUILD_ROOT}%{_bindir}/cloudstack-aws-api-register
298298
cp -r awsapi-setup/db/mysql/* ${RPM_BUILD_ROOT}%{_datadir}/%{name}-bridge/setup
299299

300-
for name in applicationContext.xml cloud-bridge.properties commons-logging.properties ; do
300+
for name in applicationContext.xml cloud-bridge.properties commons-logging.properties crypto.properties xes.keystore ec2-service.properties ; do
301301
mv ${RPM_BUILD_ROOT}%{_datadir}/%{name}-bridge/webapps/awsapi/WEB-INF/classes/$name \
302302
${RPM_BUILD_ROOT}%{_sysconfdir}/%{name}/management/$name
303303
done
304304

305-
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
306-
307305
#Don't package the below for AWS API
308-
rm -rf ${RPM_BUILD_ROOT}%{_datadir}/%{name}-bridge/webapps/awsapi/WEB-INF/classes/com
309306
rm -rf ${RPM_BUILD_ROOT}%{_datadir}/%{name}-bridge/webapps/awsapi/WEB-INF/classes/db.properties
310307
rm -rf ${RPM_BUILD_ROOT}%{_datadir}/%{name}-bridge/webapps/awsapi/WEB-INF/classes/LICENSE.txt
311308
rm -rf ${RPM_BUILD_ROOT}%{_datadir}/%{name}-bridge/webapps/awsapi/WEB-INF/classes/log4j.properties
312309
rm -rf ${RPM_BUILD_ROOT}%{_datadir}/%{name}-bridge/webapps/awsapi/WEB-INF/classes/log4j-vmops.xml
313310
rm -rf ${RPM_BUILD_ROOT}%{_datadir}/%{name}-bridge/webapps/awsapi/WEB-INF/classes/META-INF
314311
rm -rf ${RPM_BUILD_ROOT}%{_datadir}/%{name}-bridge/webapps/awsapi/WEB-INF/classes/NOTICE.txt
315-
rm -rf ${RPM_BUILD_ROOT}%{_datadir}/%{name}-bridge/webapps/awsapi/WEB-INF/classes/org
316312
rm -rf ${RPM_BUILD_ROOT}%{_datadir}/%{name}-bridge/webapps/awsapi/WEB-INF/classes/services.xml
317313

318314
%clean
@@ -398,6 +394,8 @@ fi
398394
%config(noreplace) %{_sysconfdir}/%{name}/management/cloud-bridge.properties
399395
%config(noreplace) %{_sysconfdir}/%{name}/management/commons-logging.properties
400396
%config(noreplace) %{_sysconfdir}/%{name}/management/ec2-service.properties
397+
%config(noreplace) %{_sysconfdir}/%{name}/management/crypto.properties
398+
%config(noreplace) %{_sysconfdir}/%{name}/management/xes.keystore
401399
%attr(0755,root,root) %{_initrddir}/%{name}-management
402400
%attr(0755,root,root) %{_bindir}/%{name}-setup-management
403401
%attr(0755,root,root) %{_bindir}/%{name}-update-xenserver-licenses

‎utils/src/com/cloud/utils/crypt/EncryptionSecretKeyChanger.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,7 @@ public class EncryptionSecretKeyChanger {
5454

5555
private StandardPBEStringEncryptor oldEncryptor = new StandardPBEStringEncryptor();
5656
private StandardPBEStringEncryptor newEncryptor = new StandardPBEStringEncryptor();
57-
private static final String keyFile = "/etc/cloud/management/key";
57+
private static final String keyFile = "/etc/cloudstack/management/key";
5858

5959
public static void main(String[] args){
6060
List<String> argsList = Arrays.asList(args);

‎utils/src/com/cloud/utils/crypt/EncryptionSecretKeyChecker.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ public class EncryptionSecretKeyChecker extends AdapterBase implements SystemInt
4646
private static final Logger s_logger = Logger.getLogger(EncryptionSecretKeyChecker.class);
4747

4848
// Two possible locations with the new packaging naming
49-
private static final String s_altKeyFile = "/etc/cloud/management/key";
49+
private static final String s_altKeyFile = "/etc/cloudstack/management/key";
5050
private static final String s_keyFile = "/etc/cloudstack/management/key";
5151
private static final String s_envKey = "CLOUD_SECRET_KEY";
5252
private static StandardPBEStringEncryptor s_encryptor = new StandardPBEStringEncryptor();

0 commit comments

Comments
 (0)