date:20170807

[GitHub] blueorangutan commented on issue #2227: Revert "CLOUDSTACK-9749: Disable password service on ilb systemvm (#1?

2017-08-07 Thread git

blueorangutan commented on issue #2227: Revert "CLOUDSTACK-9749: Disable 
password service on ilb systemvm (#1?
URL: https://github.com/apache/cloudstack/pull/2227#issuecomment-320848830
 
 
   Trillian test result (tid-1331)
   Environment: kvm-centos7 (x2), Advanced Networking with Mgmt server 7
   Total time taken: 44859 seconds
   Marvin logs: 
https://github.com/blueorangutan/acs-prs/releases/download/trillian/pr2227-t1331-kvm-centos7.zip
   Intermitten failure detected: /marvin/tests/smoke/test_internal_lb.py
   Intermitten failure detected: /marvin/tests/smoke/test_network.py
   Intermitten failure detected: /marvin/tests/smoke/test_nic.py
   Intermitten failure detected: /marvin/tests/smoke/test_password_server.py
   Intermitten failure detected: /marvin/tests/smoke/test_privategw_acl.py
   Intermitten failure detected: /marvin/tests/smoke/test_routers.py
   Intermitten failure detected: /marvin/tests/smoke/test_vpc_redundant.py
   Intermitten failure detected: /marvin/tests/smoke/test_vpc_router_nics.py
   Test completed. 50 look OK, 7 have error(s)
   
   
   Test | Result | Time (s) | Test File
   --- | --- | --- | ---
   test_01_VPC_nics_after_destroy | `Failure` | 451.05 | test_vpc_router_nics.py
   test_02_redundant_VPC_default_routes | `Failure` | 198.39 | 
test_vpc_redundant.py
   test_06_router_advanced | `Failure` | 0.02 | test_routers.py
   test_05_router_basic | `Failure` | 0.03 | test_routers.py
   test_04_rvpc_privategw_static_routes | `Failure` | 487.33 | 
test_privategw_acl.py
   test_03_create_redundant_VPC_1tier_2VMs_2IPs_2PF_ACL_reboot_routers | 
`Error` | 315.36 | test_vpc_redundant.py
   test_02_redundant_VPC_default_routes | `Error` | 233.90 | 
test_vpc_redundant.py
   test_09_reboot_router | `Error` | 5.11 | test_routers.py
   test_08_start_router | `Error` | 50.39 | test_routers.py
   test_04_restart_network_wo_cleanup | `Error` | 50.43 | test_routers.py
   test_03_restart_network_cleanup | `Error` | 85.62 | test_routers.py
   test_03_vpc_privategw_restart_vpc_cleanup | `Error` | 410.59 | 
test_privategw_acl.py
   test_01_nic | `Error` | 182.55 | test_nic.py
   test_reboot_router | `Error` | 333.12 | test_network.py
   test_01_internallb_roundrobin_1VPC_3VM_HTTP_port80 | `Error` | 111.81 | 
test_internal_lb.py
   test_01_internallb_roundrobin_1VPC_3VM_HTTP_port80 | `Error` | 127.07 | 
test_internal_lb.py
   test_change_service_offering_for_vm_with_snapshots | Skipped | 0.00 | 
test_vm_snapshots.py
   test_09_copy_delete_template | Skipped | 0.02 | test_templates.py
   test_06_copy_template | Skipped | 0.00 | test_templates.py
   test_static_role_account_acls | Skipped | 0.03 | test_staticroles.py
   test_11_ss_nfs_version_on_ssvm | Skipped | 0.03 | test_ssvm.py
   test_01_scale_vm | Skipped | 0.00 | test_scale_vm.py
   test_01_primary_storage_iscsi | Skipped | 0.04 | test_primary_storage.py
   test_vm_nic_adapter_vmxnet3 | Skipped | 0.00 | test_nic_adapter_type.py
   test_nested_virtualization_vmware | Skipped | 0.00 | 
test_nested_virtualization.py
   test_06_copy_iso | Skipped | 0.00 | test_iso.py
   test_deploy_vgpu_enabled_vm | Skipped | 0.03 | test_deploy_vgpu_enabled_vm.py
   test_3d_gpu_support | Skipped | 0.03 | test_deploy_vgpu_enabled_vm.py
   
 

This is an automated message from the Apache Git Service.
To respond to the message, please log on GitHub and use the
URL above to go to the specific comment.
 
For queries about this service, please contact Infrastructure at:
us...@infra.apache.org


With regards,
Apache Git Services

[GitHub] blueorangutan commented on issue #2226: CLOUDSTACK-10012: Towards CloudStack fat jar

2017-08-07 Thread git

blueorangutan commented on issue #2226: CLOUDSTACK-10012: Towards CloudStack 
fat jar
URL: https://github.com/apache/cloudstack/pull/2226#issuecomment-320836473
 
 
   Packaging result: ?centos6 ?centos7 ?debian. JID-935
 

This is an automated message from the Apache Git Service.
To respond to the message, please log on GitHub and use the
URL above to go to the specific comment.
 
For queries about this service, please contact Infrastructure at:
us...@infra.apache.org


With regards,
Apache Git Services

[cloudstack] branch CLOUDSTACK-10012 updated (c6b707f -> df16dfe)

2017-08-07 Thread bhaisaab

This is an automated email from the ASF dual-hosted git repository.

bhaisaab pushed a change to branch CLOUDSTACK-10012
in repository https://gitbox.apache.org/repos/asf/cloudstack.git.


 discard c6b707f  fix centos pkging
 new df16dfe  fix centos pkging

This update added new revisions after undoing existing revisions.
That is to say, some revisions that were in the old version of the
branch are not in the new version.  This situation occurs
when a user --force pushes a change and generates a repository
containing something like this:

 * -- * -- B -- O -- O -- O   (c6b707f)
\
 N -- N -- N   refs/heads/CLOUDSTACK-10012 (df16dfe)

You should already have received notification emails for all of the O
revisions, and so the following emails describe only the N revisions
from the common base, B.

Any revisions marked "omit" are not gone; other references still
refer to them.  Any revisions marked "discard" are gone forever.

The 1 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "add" were already present in the repository and have only
been added to this reference.


Summary of changes:
 packaging/centos63/cloud.spec | 2 +-
 packaging/centos7/cloud.spec  | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

-- 
To stop receiving notification emails like this one, please contact
['"commits@cloudstack.apache.org" '].

[cloudstack] 01/01: fix centos pkging

2017-08-07 Thread bhaisaab

This is an automated email from the ASF dual-hosted git repository.

bhaisaab pushed a commit to branch CLOUDSTACK-10012
in repository https://gitbox.apache.org/repos/asf/cloudstack.git

commit df16dfeea8fdaf65bb146c9f75532a002533f6af
Author: Rohit Yadav 
AuthorDate: Tue Aug 8 02:41:30 2017 +0200

fix centos pkging

Signed-off-by: Rohit Yadav 
---
 packaging/centos63/cloud.spec | 4 ++--
 packaging/centos7/cloud.spec  | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/packaging/centos63/cloud.spec b/packaging/centos63/cloud.spec
index 47858a8..b6a037a 100644
--- a/packaging/centos63/cloud.spec
+++ b/packaging/centos63/cloud.spec
@@ -292,7 +292,7 @@ cp client/target/bcprov-jdk15on-1.55.jar 
${RPM_BUILD_ROOT}%{_datadir}/%{name}-ma
 rm -rf 
${RPM_BUILD_ROOT}%{_datadir}/%{name}-management/webapps/client/WEB-INF/classes/scripts
 rm -rf 
${RPM_BUILD_ROOT}%{_datadir}/%{name}-management/webapps/client/WEB-INF/classes/vms
 
-cp client/target/classes/META-INF/webapp/WEB-INF/web.xml 
${RPM_BUILD_ROOT}%{_sysconfdir}/%{name}/
+cp client/target/classes/META-INF/webapp/WEB-INF/web.xml 
${RPM_BUILD_ROOT}%{_sysconfdir}/%{name}/management
 
 for name in db.properties log4j-cloud.xml commons-logging.properties 
environment.properties java.security.ciphers
 do
@@ -531,12 +531,12 @@ pip install --upgrade 
/usr/share/cloudstack-marvin/Marvin-*.tar.gz
 %config(noreplace) %{_sysconfdir}/sudoers.d/%{name}-management
 %config(noreplace) %attr(0640,root,cloud) 
%{_sysconfdir}/%{name}/management/db.properties
 %config(noreplace) %{_sysconfdir}/%{name}/management/log4j-cloud.xml
+%config(noreplace) %{_sysconfdir}/%{name}/management/log4j.xml
 %config(noreplace) %{_sysconfdir}/%{name}/management/web.xml
 %config(noreplace) %{_sysconfdir}/%{name}/management/environment.properties
 %config(noreplace) %{_sysconfdir}/%{name}/management/java.security.ciphers
 %config(noreplace) %{_sysconfdir}/%{name}/management/commons-logging.properties
 %attr(0755,root,root) %{_initrddir}/%{name}-management
-
 %attr(0755,root,root) %{_bindir}/%{name}-setup-management
 %attr(0755,root,root) %{_bindir}/%{name}-update-xenserver-licenses
 %{_datadir}/%{name}-management/conf
diff --git a/packaging/centos7/cloud.spec b/packaging/centos7/cloud.spec
index 9782711..6ce1d0a 100644
--- a/packaging/centos7/cloud.spec
+++ b/packaging/centos7/cloud.spec
@@ -262,7 +262,7 @@ cp client/target/bcprov-jdk15on-1.55.jar 
${RPM_BUILD_ROOT}%{_datadir}/%{name}-ma
 rm -rf 
${RPM_BUILD_ROOT}%{_datadir}/%{name}-management/webapps/client/WEB-INF/classes/scripts
 rm -rf 
${RPM_BUILD_ROOT}%{_datadir}/%{name}-management/webapps/client/WEB-INF/classes/vms
 
-cp client/target/classes/META-INF/webapp/WEB-INF/web.xml 
${RPM_BUILD_ROOT}%{_sysconfdir}/%{name}/
+cp client/target/classes/META-INF/webapp/WEB-INF/web.xml 
${RPM_BUILD_ROOT}%{_sysconfdir}/%{name}/management
 
 for name in db.properties log4j-cloud.xml commons-logging.properties 
environment.properties java.security.ciphers
 do
@@ -473,13 +473,13 @@ pip install --upgrade 
/usr/share/cloudstack-marvin/Marvin-*.tar.gz
 %config(noreplace) %{_sysconfdir}/security/limits.d/cloud
 %config(noreplace) %attr(0640,root,cloud) 
%{_sysconfdir}/%{name}/management/db.properties
 %config(noreplace) %{_sysconfdir}/%{name}/management/log4j-cloud.xml
+%config(noreplace) %{_sysconfdir}/%{name}/management/log4j.xml
 %config(noreplace) %{_sysconfdir}/%{name}/management/web.xml
 %config(noreplace) %{_sysconfdir}/%{name}/management/environment.properties
 %config(noreplace) %{_sysconfdir}/%{name}/management/java.security.ciphers
 %config(noreplace) %{_sysconfdir}/%{name}/management/commons-logging.properties
 %attr(0755,root,root) %{_unitdir}/%{name}-management.service
 %attr(0755,cloud,cloud) %{_localstatedir}/run/%{name}-management.pid
-
 %attr(0755,root,root) %{_bindir}/%{name}-setup-management
 %attr(0755,root,root) %{_bindir}/%{name}-update-xenserver-licenses
 %{_datadir}/%{name}-management/conf

-- 
To stop receiving notification emails like this one, please contact
"commits@cloudstack.apache.org" .

[GitHub] blueorangutan commented on issue #2226: CLOUDSTACK-10012: Towards CloudStack fat jar

2017-08-07 Thread git

blueorangutan commented on issue #2226: CLOUDSTACK-10012: Towards CloudStack 
fat jar
URL: https://github.com/apache/cloudstack/pull/2226#issuecomment-320824056
 
 
   Packaging result: ?centos6 ?centos7 ?debian. JID-934
 

This is an automated message from the Apache Git Service.
To respond to the message, please log on GitHub and use the
URL above to go to the specific comment.
 
For queries about this service, please contact Infrastructure at:
us...@infra.apache.org


With regards,
Apache Git Services

[cloudstack] branch CLOUDSTACK-10012 updated: fix centos pkging

2017-08-07 Thread bhaisaab

This is an automated email from the ASF dual-hosted git repository.

bhaisaab pushed a commit to branch CLOUDSTACK-10012
in repository https://gitbox.apache.org/repos/asf/cloudstack.git


The following commit(s) were added to refs/heads/CLOUDSTACK-10012 by this push:
 new c6b707f  fix centos pkging
c6b707f is described below

commit c6b707f5ddcd38e0438fbef92909b072dbbf7045
Author: Rohit Yadav 
AuthorDate: Tue Aug 8 02:41:30 2017 +0200

fix centos pkging

Signed-off-by: Rohit Yadav 
---
 packaging/centos63/cloud.spec | 2 +-
 packaging/centos7/cloud.spec  | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/packaging/centos63/cloud.spec b/packaging/centos63/cloud.spec
index 47858a8..c6c173e 100644
--- a/packaging/centos63/cloud.spec
+++ b/packaging/centos63/cloud.spec
@@ -292,7 +292,7 @@ cp client/target/bcprov-jdk15on-1.55.jar 
${RPM_BUILD_ROOT}%{_datadir}/%{name}-ma
 rm -rf 
${RPM_BUILD_ROOT}%{_datadir}/%{name}-management/webapps/client/WEB-INF/classes/scripts
 rm -rf 
${RPM_BUILD_ROOT}%{_datadir}/%{name}-management/webapps/client/WEB-INF/classes/vms
 
-cp client/target/classes/META-INF/webapp/WEB-INF/web.xml 
${RPM_BUILD_ROOT}%{_sysconfdir}/%{name}/
+cp client/target/classes/META-INF/webapp/WEB-INF/web.xml 
${RPM_BUILD_ROOT}%{_sysconfdir}/%{name}/management
 
 for name in db.properties log4j-cloud.xml commons-logging.properties 
environment.properties java.security.ciphers
 do
diff --git a/packaging/centos7/cloud.spec b/packaging/centos7/cloud.spec
index 9782711..03ec4d6 100644
--- a/packaging/centos7/cloud.spec
+++ b/packaging/centos7/cloud.spec
@@ -262,7 +262,7 @@ cp client/target/bcprov-jdk15on-1.55.jar 
${RPM_BUILD_ROOT}%{_datadir}/%{name}-ma
 rm -rf 
${RPM_BUILD_ROOT}%{_datadir}/%{name}-management/webapps/client/WEB-INF/classes/scripts
 rm -rf 
${RPM_BUILD_ROOT}%{_datadir}/%{name}-management/webapps/client/WEB-INF/classes/vms
 
-cp client/target/classes/META-INF/webapp/WEB-INF/web.xml 
${RPM_BUILD_ROOT}%{_sysconfdir}/%{name}/
+cp client/target/classes/META-INF/webapp/WEB-INF/web.xml 
${RPM_BUILD_ROOT}%{_sysconfdir}/%{name}/management
 
 for name in db.properties log4j-cloud.xml commons-logging.properties 
environment.properties java.security.ciphers
 do

-- 
To stop receiving notification emails like this one, please contact
['"commits@cloudstack.apache.org" '].

[cloudstack] branch CLOUDSTACK-10012 updated: centos: fix linkings

2017-08-07 Thread bhaisaab

This is an automated email from the ASF dual-hosted git repository.

bhaisaab pushed a commit to branch CLOUDSTACK-10012
in repository https://gitbox.apache.org/repos/asf/cloudstack.git


The following commit(s) were added to refs/heads/CLOUDSTACK-10012 by this push:
 new 34d0ac5  centos: fix linkings
34d0ac5 is described below

commit 34d0ac53fd89d42a06276af7116564af3ca82ef5
Author: Rohit Yadav 
AuthorDate: Tue Aug 8 01:56:39 2017 +0200

centos: fix linkings

Signed-off-by: Rohit Yadav 
---
 packaging/centos63/cloud.spec | 2 +-
 packaging/centos7/cloud.spec  | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/packaging/centos63/cloud.spec b/packaging/centos63/cloud.spec
index d1deca2..47858a8 100644
--- a/packaging/centos63/cloud.spec
+++ b/packaging/centos63/cloud.spec
@@ -299,7 +299,7 @@ do
   cp client/target/conf/$name 
${RPM_BUILD_ROOT}%{_sysconfdir}/%{name}/management/$name
 done
 
-ln -s log4j-cloud.xml  
${RPM_BUILD_ROOT}%{_sysconfdir}/%{name}/management/log4j-cloud.xml
+ln -s log4j-cloud.xml  
${RPM_BUILD_ROOT}%{_sysconfdir}/%{name}/management/log4j.xml
 
 install python/bindir/cloud-external-ipallocator.py 
${RPM_BUILD_ROOT}%{_bindir}/%{name}-external-ipallocator.py
 install -D client/target/pythonlibs/jasypt-1.9.2.jar 
${RPM_BUILD_ROOT}%{_datadir}/%{name}-common/lib/jasypt-1.9.2.jar
diff --git a/packaging/centos7/cloud.spec b/packaging/centos7/cloud.spec
index 41d452b..9782711 100644
--- a/packaging/centos7/cloud.spec
+++ b/packaging/centos7/cloud.spec
@@ -269,7 +269,7 @@ do
   cp client/target/conf/$name 
${RPM_BUILD_ROOT}%{_sysconfdir}/%{name}/management/$name
 done
 
-ln -s log4j-cloud.xml  
${RPM_BUILD_ROOT}%{_sysconfdir}/%{name}/management/log4j-cloud.xml
+ln -s log4j-cloud.xml  
${RPM_BUILD_ROOT}%{_sysconfdir}/%{name}/management/log4j.xml
 
 install python/bindir/cloud-external-ipallocator.py 
${RPM_BUILD_ROOT}%{_bindir}/%{name}-external-ipallocator.py
 install -D client/target/pythonlibs/jasypt-1.9.2.jar 
${RPM_BUILD_ROOT}%{_datadir}/%{name}-common/lib/jasypt-1.9.2.jar

-- 
To stop receiving notification emails like this one, please contact
['"commits@cloudstack.apache.org" '].

[cloudstack] branch CLOUDSTACK-10012 updated: packaging: fix centos pkging

2017-08-07 Thread bhaisaab

This is an automated email from the ASF dual-hosted git repository.

bhaisaab pushed a commit to branch CLOUDSTACK-10012
in repository https://gitbox.apache.org/repos/asf/cloudstack.git


The following commit(s) were added to refs/heads/CLOUDSTACK-10012 by this push:
 new 846d959  packaging: fix centos pkging
846d959 is described below

commit 846d959b7b8ac6ee3f74184319bfa8204ca6238c
Author: Rohit Yadav 
AuthorDate: Tue Aug 8 01:10:14 2017 +0200

packaging: fix centos pkging

Signed-off-by: Rohit Yadav 
---
 packaging/centos63/cloud.spec | 9 -
 packaging/centos7/cloud.spec  | 9 +++--
 2 files changed, 7 insertions(+), 11 deletions(-)

diff --git a/packaging/centos63/cloud.spec b/packaging/centos63/cloud.spec
index 6202c25..d1deca2 100644
--- a/packaging/centos63/cloud.spec
+++ b/packaging/centos63/cloud.spec
@@ -292,8 +292,10 @@ cp client/target/bcprov-jdk15on-1.55.jar 
${RPM_BUILD_ROOT}%{_datadir}/%{name}-ma
 rm -rf 
${RPM_BUILD_ROOT}%{_datadir}/%{name}-management/webapps/client/WEB-INF/classes/scripts
 rm -rf 
${RPM_BUILD_ROOT}%{_datadir}/%{name}-management/webapps/client/WEB-INF/classes/vms
 
-for name in db.properties log4j-cloud.xml server-ssl.xml server-nonssl.xml 
commons-logging.properties \
-classpath.conf web.xml environment.properties 
java.security.ciphers; do
+cp client/target/classes/META-INF/webapp/WEB-INF/web.xml 
${RPM_BUILD_ROOT}%{_sysconfdir}/%{name}/
+
+for name in db.properties log4j-cloud.xml commons-logging.properties 
environment.properties java.security.ciphers
+do
   cp client/target/conf/$name 
${RPM_BUILD_ROOT}%{_sysconfdir}/%{name}/management/$name
 done
 
@@ -529,9 +531,6 @@ pip install --upgrade 
/usr/share/cloudstack-marvin/Marvin-*.tar.gz
 %config(noreplace) %{_sysconfdir}/sudoers.d/%{name}-management
 %config(noreplace) %attr(0640,root,cloud) 
%{_sysconfdir}/%{name}/management/db.properties
 %config(noreplace) %{_sysconfdir}/%{name}/management/log4j-cloud.xml
-%config(noreplace) %{_sysconfdir}/%{name}/management/classpath.conf
-%config(noreplace) %{_sysconfdir}/%{name}/management/server-nonssl.xml
-%config(noreplace) %{_sysconfdir}/%{name}/management/server-ssl.xml
 %config(noreplace) %{_sysconfdir}/%{name}/management/web.xml
 %config(noreplace) %{_sysconfdir}/%{name}/management/environment.properties
 %config(noreplace) %{_sysconfdir}/%{name}/management/java.security.ciphers
diff --git a/packaging/centos7/cloud.spec b/packaging/centos7/cloud.spec
index 9a11aef..41d452b 100644
--- a/packaging/centos7/cloud.spec
+++ b/packaging/centos7/cloud.spec
@@ -262,9 +262,9 @@ cp client/target/bcprov-jdk15on-1.55.jar 
${RPM_BUILD_ROOT}%{_datadir}/%{name}-ma
 rm -rf 
${RPM_BUILD_ROOT}%{_datadir}/%{name}-management/webapps/client/WEB-INF/classes/scripts
 rm -rf 
${RPM_BUILD_ROOT}%{_datadir}/%{name}-management/webapps/client/WEB-INF/classes/vms
 
-for name in db.properties log4j-cloud.xml server7-nonssl.xml server7-ssl.xml \
-commons-logging.properties classpath.conf \
-web.xml environment.properties java.security.ciphers
+cp client/target/classes/META-INF/webapp/WEB-INF/web.xml 
${RPM_BUILD_ROOT}%{_sysconfdir}/%{name}/
+
+for name in db.properties log4j-cloud.xml commons-logging.properties 
environment.properties java.security.ciphers
 do
   cp client/target/conf/$name 
${RPM_BUILD_ROOT}%{_sysconfdir}/%{name}/management/$name
 done
@@ -473,9 +473,6 @@ pip install --upgrade 
/usr/share/cloudstack-marvin/Marvin-*.tar.gz
 %config(noreplace) %{_sysconfdir}/security/limits.d/cloud
 %config(noreplace) %attr(0640,root,cloud) 
%{_sysconfdir}/%{name}/management/db.properties
 %config(noreplace) %{_sysconfdir}/%{name}/management/log4j-cloud.xml
-%config(noreplace) %{_sysconfdir}/%{name}/management/classpath.conf
-%config(noreplace) %{_sysconfdir}/%{name}/management/server7-nonssl.xml
-%config(noreplace) %{_sysconfdir}/%{name}/management/server7-ssl.xml
 %config(noreplace) %{_sysconfdir}/%{name}/management/web.xml
 %config(noreplace) %{_sysconfdir}/%{name}/management/environment.properties
 %config(noreplace) %{_sysconfdir}/%{name}/management/java.security.ciphers

-- 
To stop receiving notification emails like this one, please contact
['"commits@cloudstack.apache.org" '].

[cloudstack] branch CLOUDSTACK-10012 updated: debian: fix pkg

2017-08-07 Thread bhaisaab

This is an automated email from the ASF dual-hosted git repository.

bhaisaab pushed a commit to branch CLOUDSTACK-10012
in repository https://gitbox.apache.org/repos/asf/cloudstack.git


The following commit(s) were added to refs/heads/CLOUDSTACK-10012 by this push:
 new fe4ae85  debian: fix pkg
fe4ae85 is described below

commit fe4ae853d506640f4e39e5b5a5b704d5e08d0741
Author: Rohit Yadav 
AuthorDate: Tue Aug 8 01:02:40 2017 +0200

debian: fix pkg

Signed-off-by: Rohit Yadav 
---
 debian/cloudstack-management.install  | 3 ---
 debian/cloudstack-management.postinst | 2 --
 debian/rules  | 4 
 3 files changed, 9 deletions(-)

diff --git a/debian/cloudstack-management.install 
b/debian/cloudstack-management.install
index 353813d..a4926e1 100644
--- a/debian/cloudstack-management.install
+++ b/debian/cloudstack-management.install
@@ -17,7 +17,6 @@
 
 /etc/cloudstack/management/ehcache.xml
 /etc/cloudstack/management/db.properties
-/etc/cloudstack/management/web.xml
 /etc/cloudstack/management/environment.properties
 /etc/cloudstack/management/java.security.ciphers
 /etc/cloudstack/management/log4j-cloud.xml
@@ -26,8 +25,6 @@
 /etc/security/limits.d/cloudstack-limits.conf
 /etc/sudoers.d/cloudstack
 /var/cache/cloudstack/management
-/var/cache/cloudstack/management/work
-/var/cache/cloudstack/management/temp
 /var/log/cloudstack/management
 /var/lib/cloudstack/mnt
 /var/lib/cloudstack/management
diff --git a/debian/cloudstack-management.postinst 
b/debian/cloudstack-management.postinst
index 0891f70..f50455b 100644
--- a/debian/cloudstack-management.postinst
+++ b/debian/cloudstack-management.postinst
@@ -29,8 +29,6 @@ if [ "$1" = configure ]; then
 rm -fr /var/cache/cloudstack/management/work/*
 
 for i in /var/cache/cloudstack/management \
-/var/cache/cloudstack/management/work \
-/var/cache/cloudstack/management/temp \
 /var/log/cloudstack/management \
 /var/lib/cloudstack/management
 do
diff --git a/debian/rules b/debian/rules
index bb0ada6..5958c2b 100755
--- a/debian/rules
+++ b/debian/rules
@@ -70,8 +70,6 @@ override_dh_auto_install:
mkdir -p $(DESTDIR)/usr/share/$(PACKAGE)-management/setup
mkdir $(DESTDIR)/var/log/$(PACKAGE)/management
mkdir $(DESTDIR)/var/cache/$(PACKAGE)/management
-   mkdir $(DESTDIR)/var/cache/$(PACKAGE)/management/work
-   mkdir $(DESTDIR)/var/cache/$(PACKAGE)/management/temp
mkdir $(DESTDIR)/var/log/$(PACKAGE)/ipallocator
mkdir $(DESTDIR)/var/lib/$(PACKAGE)/management
mkdir $(DESTDIR)/var/lib/$(PACKAGE)/mnt
@@ -94,8 +92,6 @@ override_dh_auto_install:
# This should all be in /etc/cloudstack/management
ln -s ../../..$(SYSCONFDIR)/$(PACKAGE)/management 
$(DESTDIR)/usr/share/$(PACKAGE)-management/conf
ln -s ../../../var/log/$(PACKAGE)/management 
$(DESTDIR)/usr/share/$(PACKAGE)-management/logs
-   ln -s ../../../var/cache/$(PACKAGE)/management/temp 
$(DESTDIR)/usr/share/$(PACKAGE)-management/temp
-   ln -s ../../../var/cache/$(PACKAGE)/management/work 
$(DESTDIR)/usr/share/$(PACKAGE)-management/work
 
install -d -m0755 debian/$(PACKAGE)-management/lib/systemd/system
install -m0644 packaging/systemd/$(PACKAGE)-management.service 
debian/$(PACKAGE)-management/lib/systemd/system/$(PACKAGE)-management.service

-- 
To stop receiving notification emails like this one, please contact
['"commits@cloudstack.apache.org" '].

[GitHub] blueorangutan commented on issue #1960: [4.11/Future] CLOUDSTACK-9782: Host HA and KVM HA provider

2017-08-07 Thread git

blueorangutan commented on issue #1960: [4.11/Future] CLOUDSTACK-9782: Host HA 
and KVM HA provider
URL: https://github.com/apache/cloudstack/pull/1960#issuecomment-320802297
 
 
   Trillian test result (tid-1329)
   Environment: vmware-55u3 (x2), Advanced Networking with Mgmt server 7
   Total time taken: 42905 seconds
   Marvin logs: 
https://github.com/blueorangutan/acs-prs/releases/download/trillian/pr1960-t1329-vmware-55u3.zip
   Intermitten failure detected: /marvin/tests/smoke/test_network.py
   Intermitten failure detected: /marvin/tests/smoke/test_privategw_acl.py
   Intermitten failure detected: /marvin/tests/smoke/test_routers_network_ops.py
   Intermitten failure detected: /marvin/tests/smoke/test_templates.py
   Intermitten failure detected: /marvin/tests/smoke/test_volumes.py
   Intermitten failure detected: /marvin/tests/smoke/test_vpc_router_nics.py
   Test completed. 56 look OK, 5 have error(s)
   
   
   Test | Result | Time (s) | Test File
   --- | --- | --- | ---
   test_01_VPC_nics_after_destroy | `Failure` | 577.72 | test_vpc_router_nics.py
   test_01_create_volume | `Failure` | 159.19 | test_volumes.py
   test_02_RVR_Network_FW_PF_SSH_default_routes_egress_false | `Failure` | 
408.07 | test_routers_network_ops.py
   test_01_RVR_Network_FW_PF_SSH_default_routes_egress_true | `Failure` | 
381.74 | test_routers_network_ops.py
   test_04_rvpc_privategw_static_routes | `Failure` | 695.92 | 
test_privategw_acl.py
   test_03_vpc_privategw_restart_vpc_cleanup | `Error` | 639.79 | 
test_privategw_acl.py
   test_03_vpc_privategw_restart_vpc_cleanup | `Error` | 670.15 | 
test_privategw_acl.py
   test_reboot_router | `Error` | 463.13 | test_network.py
   test_08_resize_volume | Skipped | 5.16 | test_volumes.py
   test_07_resize_fail | Skipped | 10.18 | test_volumes.py
   test_09_copy_delete_template | Skipped | 0.01 | test_templates.py
   test_06_copy_template | Skipped | 0.00 | test_templates.py
   test_static_role_account_acls | Skipped | 0.02 | test_staticroles.py
   test_11_ss_nfs_version_on_ssvm | Skipped | 0.02 | test_ssvm.py
   test_01_scale_vm | Skipped | 33.60 | test_scale_vm.py
   test_01_primary_storage_iscsi | Skipped | 0.03 | test_primary_storage.py
   test_vm_nic_adapter_vmxnet3 | Skipped | 0.00 | test_nic_adapter_type.py
   test_06_copy_iso | Skipped | 0.00 | test_iso.py
   test_hostha_enable_feature_without_setting_provider | Skipped | 0.02 | 
test_hostha_simulator.py
   test_hostha_enable_feature_valid | Skipped | 0.02 | test_hostha_simulator.py
   test_hostha_disable_feature_valid | Skipped | 0.02 | test_hostha_simulator.py
   test_hostha_configure_invalid_provider | Skipped | 0.02 | 
test_hostha_simulator.py
   test_hostha_configure_default_driver | Skipped | 0.02 | 
test_hostha_simulator.py
   test_ha_verify_fsm_recovering | Skipped | 0.02 | test_hostha_simulator.py
   test_ha_verify_fsm_fenced | Skipped | 0.02 | test_hostha_simulator.py
   test_ha_verify_fsm_degraded | Skipped | 0.02 | test_hostha_simulator.py
   test_ha_verify_fsm_available | Skipped | 0.02 | test_hostha_simulator.py
   test_ha_multiple_mgmt_server_ownership | Skipped | 0.02 | 
test_hostha_simulator.py
   test_ha_list_providers | Skipped | 0.02 | test_hostha_simulator.py
   test_ha_enabledisable_across_clusterzones | Skipped | 0.02 | 
test_hostha_simulator.py
   test_ha_enable_feature_invalid | Skipped | 0.02 | test_hostha_simulator.py
   test_ha_disable_feature_invalid | Skipped | 0.02 | test_hostha_simulator.py
   test_configure_ha_provider_valid | Skipped | 0.02 | test_hostha_simulator.py
   test_configure_ha_provider_invalid | Skipped | 0.02 | 
test_hostha_simulator.py
   test_ha_stop_agent_host_is_degraded | Skipped | 0.03 | test_ha_kvm_agent.py
   test_ha_kill_agent_host_is_degraded | Skipped | 0.03 | test_ha_kvm_agent.py
   test_remove_ha_provider_not_possible | Skipped | 0.02 | test_ha_kvm.py
   test_hostha_enable_ha_when_host_inMaintenance | Skipped | 0.02 | 
test_ha_kvm.py
   test_hostha_enable_ha_when_host_disconected | Skipped | 0.02 | test_ha_kvm.py
   test_hostha_enable_ha_when_host_disabled | Skipped | 0.02 | test_ha_kvm.py
   test_hostha_enable_feature_without_setting_provider | Skipped | 0.02 | 
test_ha_kvm.py
   test_hostha_enable_feature_valid | Skipped | 0.02 | test_ha_kvm.py
   test_hostha_disable_feature_valid | Skipped | 0.02 | test_ha_kvm.py
   test_hostha_configure_invalid_provider | Skipped | 0.03 | test_ha_kvm.py
   test_hostha_configure_default_driver | Skipped | 0.02 | test_ha_kvm.py
   test_ha_enable_feature_invalid | Skipped | 0.02 | test_ha_kvm.py
   test_ha_disable_feature_invalid | Skipped | 0.02 | test_ha_kvm.py
   test_enable_ha_when_host_powerstate_on | Skipped | 0.02 | test_ha_kvm.py
   test_disable_oobm_ha_state_ineligible | Skipped | 0.02 | test_ha_kvm.py
   test_configure_ha_provider_valid | Skipped | 0.02 | test_ha_kvm.py
   test_configure_ha_provider_invalid | Skipped | 0.02 | test_ha_kvm.py
   test_list_ha_for_host_valid | Skipped | 0.03 | test_ha_for_host.py

[GitHub] blueorangutan commented on issue #2226: CLOUDSTACK-10012: Towards CloudStack fat jar

2017-08-07 Thread git

blueorangutan commented on issue #2226: CLOUDSTACK-10012: Towards CloudStack 
fat jar
URL: https://github.com/apache/cloudstack/pull/2226#issuecomment-320797255
 
 
   @rhtyd a Jenkins job has been kicked to build packages. I'll keep you posted 
as I make progress.
 

This is an automated message from the Apache Git Service.
To respond to the message, please log on GitHub and use the
URL above to go to the specific comment.
 
For queries about this service, please contact Infrastructure at:
us...@infra.apache.org


With regards,
Apache Git Services

[GitHub] rhtyd commented on issue #2226: CLOUDSTACK-10012: Towards CloudStack fat jar

2017-08-07 Thread git

rhtyd commented on issue #2226: CLOUDSTACK-10012: Towards CloudStack fat jar
URL: https://github.com/apache/cloudstack/pull/2226#issuecomment-320797143
 
 
   @blueorangutan package
 

This is an automated message from the Apache Git Service.
To respond to the message, please log on GitHub and use the
URL above to go to the specific comment.
 
For queries about this service, please contact Infrastructure at:
us...@infra.apache.org


With regards,
Apache Git Services

[cloudstack] branch CLOUDSTACK-10012 updated: packging: fix centos6/7 pkging

2017-08-07 Thread bhaisaab

This is an automated email from the ASF dual-hosted git repository.

bhaisaab pushed a commit to branch CLOUDSTACK-10012
in repository https://gitbox.apache.org/repos/asf/cloudstack.git


The following commit(s) were added to refs/heads/CLOUDSTACK-10012 by this push:
 new 41821b8  packging: fix centos6/7 pkging
41821b8 is described below

commit 41821b8ff78875be4a53c52e70ea6443ba512ec9
Author: Rohit Yadav 
AuthorDate: Tue Aug 8 00:21:09 2017 +0200

packging: fix centos6/7 pkging

Signed-off-by: Rohit Yadav 
---
 packaging/centos63/cloud.spec   |  2 ++
 packaging/centos7/cloud.spec|  2 ++
 packaging/systemd/cloudstack-management.default |  8 
 packaging/systemd/cloudstack-management.service | 11 ---
 4 files changed, 12 insertions(+), 11 deletions(-)

diff --git a/packaging/centos63/cloud.spec b/packaging/centos63/cloud.spec
index 884e31e..6202c25 100644
--- a/packaging/centos63/cloud.spec
+++ b/packaging/centos63/cloud.spec
@@ -297,6 +297,8 @@ for name in db.properties log4j-cloud.xml server-ssl.xml 
server-nonssl.xml commo
   cp client/target/conf/$name 
${RPM_BUILD_ROOT}%{_sysconfdir}/%{name}/management/$name
 done
 
+ln -s log4j-cloud.xml  
${RPM_BUILD_ROOT}%{_sysconfdir}/%{name}/management/log4j-cloud.xml
+
 install python/bindir/cloud-external-ipallocator.py 
${RPM_BUILD_ROOT}%{_bindir}/%{name}-external-ipallocator.py
 install -D client/target/pythonlibs/jasypt-1.9.2.jar 
${RPM_BUILD_ROOT}%{_datadir}/%{name}-common/lib/jasypt-1.9.2.jar
 
diff --git a/packaging/centos7/cloud.spec b/packaging/centos7/cloud.spec
index 530bafb..9a11aef 100644
--- a/packaging/centos7/cloud.spec
+++ b/packaging/centos7/cloud.spec
@@ -269,6 +269,8 @@ do
   cp client/target/conf/$name 
${RPM_BUILD_ROOT}%{_sysconfdir}/%{name}/management/$name
 done
 
+ln -s log4j-cloud.xml  
${RPM_BUILD_ROOT}%{_sysconfdir}/%{name}/management/log4j-cloud.xml
+
 install python/bindir/cloud-external-ipallocator.py 
${RPM_BUILD_ROOT}%{_bindir}/%{name}-external-ipallocator.py
 install -D client/target/pythonlibs/jasypt-1.9.2.jar 
${RPM_BUILD_ROOT}%{_datadir}/%{name}-common/lib/jasypt-1.9.2.jar
 
diff --git a/packaging/systemd/cloudstack-management.default 
b/packaging/systemd/cloudstack-management.default
index a23997e..70fc7c9 100644
--- a/packaging/systemd/cloudstack-management.default
+++ b/packaging/systemd/cloudstack-management.default
@@ -29,9 +29,9 @@ CATALINA_TMPDIR="/usr/share/cloudstack-management/temp"
 
 # Setup Java OPTS
 if [ -r "/etc/cloudstack/management/cloudmanagementserver.keystore" ] ; then
-  JAVA_OPTS="-Djava.awt.headless=true -Dcom.sun.management.jmxremote=false 
-Xmx2g -XX:+HeapDumpOnOutOfMemoryError 
-XX:HeapDumpPath=/var/log/cloudstack/management/ -XX:PermSize=512M 
-XX:MaxPermSize=800m 
-Djavax.net.ssl.trustStore=/etc/cloudstack/management/cloudmanagementserver.keystore
 -Djavax.net.ssl.trustStorePassword=vmops.com "
+  JAVA_OPTS="-Djava.awt.headless=true -Dcom.sun.management.jmxremote=false 
-Xmx2g -XX:+HeapDumpOnOutOfMemoryError 
-XX:HeapDumpPath=/var/log/cloudstack/management/ -XX:PermSize=512M 
-XX:MaxPermSize=800m 
-Djavax.net.ssl.trustStore=/etc/cloudstack/management/cloudmanagementserver.keystore
 -Djavax.net.ssl.trustStorePassword=vmops.com 
-Djetty.requestlog=/var/log/cloudstack/management/request.log"
 else
-  JAVA_OPTS="-Djava.awt.headless=true -Dcom.sun.management.jmxremote=false 
-Xmx2g -XX:+HeapDumpOnOutOfMemoryError 
-XX:HeapDumpPath=/var/log/cloudstack/management/ -XX:PermSize=512M 
-XX:MaxPermSize=800m"
+  JAVA_OPTS="-Djava.awt.headless=true -Dcom.sun.management.jmxremote=false 
-Xmx2g -XX:+HeapDumpOnOutOfMemoryError 
-XX:HeapDumpPath=/var/log/cloudstack/management/ -XX:PermSize=512M 
-XX:MaxPermSize=800m 
-Djetty.requestlog=/var/log/cloudstack/management/request.log"
 fi
 
 CLOUDSTACK_USER="cloud"
@@ -44,8 +44,8 @@ SHUTDOWN_VERBOSE="false"
 
 CLOUDSTACK_PID="/var/run/cloudstack-management.pid"
 
-JARS=$(ls /usr/share/cloudstack-management/lib/*.jar | tr '\n' ':' | sed 
s'/.$//')
+LOGDIR="/var/log/cloudstack/management"
 
-CLASSPATH="/etc/cloudstack/management:/usr/share/cloudstack-common:/usr/share/cloudstack-management/setup:/usr/share/cloudstack-management:/usr/share/cloudstack-management/cloud-management-server.jar:$JARS"
+CLASSPATH="/etc/cloudstack/management:/usr/share/cloudstack-common:/usr/share/cloudstack-management/setup:/usr/share/cloudstack-management:/usr/share/cloudstack-management/cloud-management-server.jar"
 
 BOOTSTRAP_CLASS=org.apache.cloudstack.ServerDaemon
diff --git a/packaging/systemd/cloudstack-management.service 
b/packaging/systemd/cloudstack-management.service
index 091cff3..722d846 100644
--- a/packaging/systemd/cloudstack-management.service
+++ b/packaging/systemd/cloudstack-management.service
@@ -25,15 +25,12 @@ After=syslog.target network.target
 UMask=0022
 Type=forking
 Environment="NAME=cloudstack-management"

[cloudstack] branch CLOUDSTACK-10012 updated: centos63: make it work

2017-08-07 Thread bhaisaab

This is an automated email from the ASF dual-hosted git repository.

bhaisaab pushed a commit to branch CLOUDSTACK-10012
in repository https://gitbox.apache.org/repos/asf/cloudstack.git


The following commit(s) were added to refs/heads/CLOUDSTACK-10012 by this push:
 new 7d5f15e  centos63: make it work
7d5f15e is described below

commit 7d5f15e2563b10d8ad2e5e108eed5879a02188fb
Author: Rohit Yadav 
AuthorDate: Mon Aug 7 23:17:55 2017 +0200

centos63: make it work

Signed-off-by: Rohit Yadav 
---
 packaging/centos63/cloud-management.rc | 6 --
 packaging/centos63/cloud.spec  | 3 +++
 packaging/centos7/cloud.spec   | 1 +
 setup/bindir/cloud-setup-databases.in  | 2 +-
 4 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/packaging/centos63/cloud-management.rc 
b/packaging/centos63/cloud-management.rc
index b8babea..8d640e9 100755
--- a/packaging/centos63/cloud-management.rc
+++ b/packaging/centos63/cloud-management.rc
@@ -39,6 +39,8 @@ PROG="jsvc"
 DAEMON="/usr/bin/jsvc"
 USER=cloud
 
+export HOME="/var/cloudstack/management"
+
 unset OPTIONS
 [ -r /etc/sysconfig/default/"$SHORTNAME" ] && source 
/etc/sysconfig/default/"$SHORTNAME"
 
@@ -68,7 +70,7 @@ setJavaHome() {
 
 setJavaHome
 
-JARS=$(ls /usr/share/cloudstack-management/lib/\*.jar | tr '\n' ':' | sed 
s'/.$//')
+JARS=$(ls /usr/share/cloudstack-management/lib/*.jar | tr '\n' ':' | sed 
s'/.$//')
 
CLASSPATH="/etc/cloudstack/management:/usr/share/cloudstack-common:/usr/share/cloudstack-management/setup:/usr/share/cloudstack-management:/usr/share/cloudstack-management/cloud-management-server.jar:$JARS"
 
 if [ -r "/etc/cloudstack/management/cloudmanagementserver.keystore" ] ; then
@@ -93,7 +95,7 @@ start() {
 echo -n "Starting $PROGNAME" "$SHORTNAME"
 
 if daemon --pidfile $PIDFILE $DAEMON -home "$JAVA_HOME" -cp "$CLASSPATH" 
-pidfile "$PIDFILE" -user "$USER" \
-  -errfile $LOGDIR/cloudstack-management.err -outfile 
$LOGDIR/cloudstack-management.out $JAVA_OPTS $CLASS
+  -errfile $LOGDIR/cloudstack-management.err $JAVA_OPTS $CLASS
 RETVAL=$?
 then
 rc=0
diff --git a/packaging/centos63/cloud.spec b/packaging/centos63/cloud.spec
index 760b240..884e31e 100644
--- a/packaging/centos63/cloud.spec
+++ b/packaging/centos63/cloud.spec
@@ -59,6 +59,9 @@ intelligent IaaS cloud implementation.
 %package management
 Summary:   CloudStack management server UI
 Requires: java-1.8.0-openjdk
+Requires: jsvc
+Requires: jakarta-commons-daemon
+Requires: jakarta-commons-daemon-jsvc
 Requires: python
 Requires: bash
 Requires: bzip2
diff --git a/packaging/centos7/cloud.spec b/packaging/centos7/cloud.spec
index ff96414..530bafb 100644
--- a/packaging/centos7/cloud.spec
+++ b/packaging/centos7/cloud.spec
@@ -59,6 +59,7 @@ intelligent IaaS cloud implementation.
 %package management
 Summary:   CloudStack management server UI
 Requires: java => 1.8.0
+Requires: apache-commons-daemon-jsvc
 Requires: python
 Requires: bash
 Requires: bzip2
diff --git a/setup/bindir/cloud-setup-databases.in 
b/setup/bindir/cloud-setup-databases.in
index 08a3cc9..0e66cfa 100755
--- a/setup/bindir/cloud-setup-databases.in
+++ b/setup/bindir/cloud-setup-databases.in
@@ -388,7 +388,7 @@ for example:
 
 def processEncryptionStuff(self):
 def encrypt(input):
-cmd = ['java','-classpath','"' + self.encryptionJarPath + 
'"','org.jasypt.intf.cli.JasyptPBEStringEncryptionCLI', 'encrypt.sh', 
'input=%s'%input, 'password=%s'%self.mgmtsecretkey,'verbose=false']
+cmd = 
['java','-Djava.security.egd=file:/dev/urandom','-classpath','"' + 
self.encryptionJarPath + 
'"','org.jasypt.intf.cli.JasyptPBEStringEncryptionCLI', 'encrypt.sh', 
'input=%s'%input, 'password=%s'%self.mgmtsecretkey,'verbose=false']
 return runCmd(cmd).strip('\r\n')
 
 def saveMgmtServerSecretKey():

-- 
To stop receiving notification emails like this one, please contact
['"commits@cloudstack.apache.org" '].

[cloudstack] branch CLOUDSTACK-10012 updated (83378fa -> d21b703)

2017-08-07 Thread bhaisaab

This is an automated email from the ASF dual-hosted git repository.

bhaisaab pushed a change to branch CLOUDSTACK-10012
in repository https://gitbox.apache.org/repos/asf/cloudstack.git.


from 83378fa  centos63: remove stuff
 new 132ba26  client: remove a lot of ancient crap
 new d21b703  client: rename tomcatconf to conf directory

The 2 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "add" were already present in the repository and have only
been added to this reference.


Summary of changes:
 .../cloudmanagementserver.keystore |  Bin
 .../commons-logging.properties.in  |0
 client/{tomcatconf => conf}/db.properties.in   |0
 client/{tomcatconf => conf}/ehcache.xml.in |0
 .../{tomcatconf => conf}/environment.properties.in |0
 .../{tomcatconf => conf}/java.security.ciphers.in  |0
 client/{tomcatconf => conf}/log4j-cloud.xml.in |0
 .../SYSCONFDIR/rc.d/init.d/cloud-management.in |  107 --
 .../SYSCONFDIR/sysconfig/cloud-management.in   |   23 -
 .../SYSCONFDIR/rc.d/init.d/cloud-management.in |  106 --
 .../SYSCONFDIR/sysconfig/cloud-management.in   |   23 -
 .../opensuse/SYSCONFDIR/init.d/cloud-management.in |  239 
 .../SYSCONFDIR/sysconfig/cloud-management.in   |   23 -
 .../SYSCONFDIR/rc.d/init.d/cloud-management.in |  108 --
 .../rhel/SYSCONFDIR/sysconfig/cloud-management.in  |   23 -
 .../sles/SYSCONFDIR/init.d/cloud-management.in |  239 
 .../sles/SYSCONFDIR/sysconfig/cloud-management.in  |   23 -
 .../ubuntu/SYSCONFDIR/init.d/cloud-management.in   |  244 
 client/pom.xml |4 +-
 client/tomcatconf/catalina.policy.in   |  180 ---
 client/tomcatconf/catalina.properties.in   |   81 --
 client/tomcatconf/classpath.conf.in|   41 -
 client/tomcatconf/context.xml.in   |   35 -
 client/tomcatconf/logging.properties.in|   64 --
 client/tomcatconf/server-nonssl.xml.in |  149 ---
 client/tomcatconf/server-ssl.xml.in|  157 ---
 client/tomcatconf/server7-nonssl.xml.in|  149 ---
 client/tomcatconf/server7-ssl.xml.in   |  157 ---
 client/tomcatconf/tomcat-users.xml.in  |   31 -
 client/tomcatconf/tomcat6-nonssl.conf.in   |   73 --
 client/tomcatconf/tomcat6-ssl.conf.in  |   72 --
 client/tomcatconf/web.xml.in   | 1187 
 setup/bindir/cloud-migrate-databases.in|2 +-
 test/integration/smoke/test_staticroles.py |2 +-
 usage/pom.xml  |2 +-
 35 files changed, 5 insertions(+), 3539 deletions(-)
 rename client/{tomcatconf => conf}/cloudmanagementserver.keystore (100%)
 rename client/{tomcatconf => conf}/commons-logging.properties.in (100%)
 rename client/{tomcatconf => conf}/db.properties.in (100%)
 rename client/{tomcatconf => conf}/ehcache.xml.in (100%)
 rename client/{tomcatconf => conf}/environment.properties.in (100%)
 rename client/{tomcatconf => conf}/java.security.ciphers.in (100%)
 rename client/{tomcatconf => conf}/log4j-cloud.xml.in (100%)
 delete mode 100755 
client/distro/centos/SYSCONFDIR/rc.d/init.d/cloud-management.in
 delete mode 100644 
client/distro/centos/SYSCONFDIR/sysconfig/cloud-management.in
 delete mode 100755 
client/distro/fedora/SYSCONFDIR/rc.d/init.d/cloud-management.in
 delete mode 100644 
client/distro/fedora/SYSCONFDIR/sysconfig/cloud-management.in
 delete mode 100755 client/distro/opensuse/SYSCONFDIR/init.d/cloud-management.in
 delete mode 100644 
client/distro/opensuse/SYSCONFDIR/sysconfig/cloud-management.in
 delete mode 100644 
client/distro/rhel/SYSCONFDIR/rc.d/init.d/cloud-management.in
 delete mode 100644 client/distro/rhel/SYSCONFDIR/sysconfig/cloud-management.in
 delete mode 100755 client/distro/sles/SYSCONFDIR/init.d/cloud-management.in
 delete mode 100644 client/distro/sles/SYSCONFDIR/sysconfig/cloud-management.in
 delete mode 100755 client/distro/ubuntu/SYSCONFDIR/init.d/cloud-management.in
 delete mode 100644 client/tomcatconf/catalina.policy.in
 delete mode 100644 client/tomcatconf/catalina.properties.in
 delete mode 100644 client/tomcatconf/classpath.conf.in
 delete mode 100644 client/tomcatconf/context.xml.in
 delete mode 100644 client/tomcatconf/logging.properties.in
 delete mode 100755 client/tomcatconf/server-nonssl.xml.in
 delete mode 100755 client/tomcatconf/server-ssl.xml.in
 delete mode 100755 client/tomcatconf/server7-nonssl.xml.in
 delete mode 100755 client/tomcatconf/server7-ssl.xml.in
 delete mode 100644 client/tomcatconf/tomcat-users.xml.in
 delete mode 100644 client/tomcatconf/tomcat6-nonssl.conf.in
 delete mode 100644 client/tomcatconf/tomcat6-ssl.conf.in
 delete mode 100644 client/tomcatconf/web.xml.in

-- 
To stop receiving notification emails like this one, please

[cloudstack] 02/02: client: rename tomcatconf to conf directory

2017-08-07 Thread bhaisaab

This is an automated email from the ASF dual-hosted git repository.

bhaisaab pushed a commit to branch CLOUDSTACK-10012
in repository https://gitbox.apache.org/repos/asf/cloudstack.git

commit d21b703b617457a8669ccb90f8fb1d9ff9010ffc
Author: Rohit Yadav 
AuthorDate: Mon Aug 7 21:09:07 2017 +0200

client: rename tomcatconf to conf directory

Signed-off-by: Rohit Yadav 
---
 client/{tomcatconf => conf}/cloudmanagementserver.keystore | Bin
 client/{tomcatconf => conf}/commons-logging.properties.in  |   0
 client/{tomcatconf => conf}/db.properties.in   |   0
 client/{tomcatconf => conf}/ehcache.xml.in |   0
 client/{tomcatconf => conf}/environment.properties.in  |   0
 client/{tomcatconf => conf}/java.security.ciphers.in   |   0
 client/{tomcatconf => conf}/log4j-cloud.xml.in |   0
 7 files changed, 0 insertions(+), 0 deletions(-)

diff --git a/client/tomcatconf/cloudmanagementserver.keystore 
b/client/conf/cloudmanagementserver.keystore
similarity index 100%
rename from client/tomcatconf/cloudmanagementserver.keystore
rename to client/conf/cloudmanagementserver.keystore
diff --git a/client/tomcatconf/commons-logging.properties.in 
b/client/conf/commons-logging.properties.in
similarity index 100%
rename from client/tomcatconf/commons-logging.properties.in
rename to client/conf/commons-logging.properties.in
diff --git a/client/tomcatconf/db.properties.in b/client/conf/db.properties.in
similarity index 100%
rename from client/tomcatconf/db.properties.in
rename to client/conf/db.properties.in
diff --git a/client/tomcatconf/ehcache.xml.in b/client/conf/ehcache.xml.in
similarity index 100%
rename from client/tomcatconf/ehcache.xml.in
rename to client/conf/ehcache.xml.in
diff --git a/client/tomcatconf/environment.properties.in 
b/client/conf/environment.properties.in
similarity index 100%
rename from client/tomcatconf/environment.properties.in
rename to client/conf/environment.properties.in
diff --git a/client/tomcatconf/java.security.ciphers.in 
b/client/conf/java.security.ciphers.in
similarity index 100%
rename from client/tomcatconf/java.security.ciphers.in
rename to client/conf/java.security.ciphers.in
diff --git a/client/tomcatconf/log4j-cloud.xml.in 
b/client/conf/log4j-cloud.xml.in
similarity index 100%
rename from client/tomcatconf/log4j-cloud.xml.in
rename to client/conf/log4j-cloud.xml.in

-- 
To stop receiving notification emails like this one, please contact
"commits@cloudstack.apache.org" .

[GitHub] blueorangutan commented on issue #2226: CLOUDSTACK-10012: Towards CloudStack fat jar

2017-08-07 Thread git

blueorangutan commented on issue #2226: CLOUDSTACK-10012: Towards CloudStack 
fat jar
URL: https://github.com/apache/cloudstack/pull/2226#issuecomment-320747872
 
 
   Packaging result: ?centos6 ?centos7 ?debian. JID-930
 

This is an automated message from the Apache Git Service.
To respond to the message, please log on GitHub and use the
URL above to go to the specific comment.
 
For queries about this service, please contact Infrastructure at:
us...@infra.apache.org


With regards,
Apache Git Services

[GitHub] blueorangutan commented on issue #2226: CLOUDSTACK-10012: Towards CloudStack fat jar

2017-08-07 Thread git

blueorangutan commented on issue #2226: CLOUDSTACK-10012: Towards CloudStack 
fat jar
URL: https://github.com/apache/cloudstack/pull/2226#issuecomment-320733996
 
 
   @rhtyd a Jenkins job has been kicked to build packages. I'll keep you posted 
as I make progress.
 

This is an automated message from the Apache Git Service.
To respond to the message, please log on GitHub and use the
URL above to go to the specific comment.
 
For queries about this service, please contact Infrastructure at:
us...@infra.apache.org


With regards,
Apache Git Services

[GitHub] rhtyd commented on issue #2226: CLOUDSTACK-10012: Towards CloudStack fat jar

2017-08-07 Thread git

rhtyd commented on issue #2226: CLOUDSTACK-10012: Towards CloudStack fat jar
URL: https://github.com/apache/cloudstack/pull/2226#issuecomment-320733886
 
 
   @blueorangutan package
 

This is an automated message from the Apache Git Service.
To respond to the message, please log on GitHub and use the
URL above to go to the specific comment.
 
For queries about this service, please contact Infrastructure at:
us...@infra.apache.org


With regards,
Apache Git Services

[cloudstack] 01/02: centos63: wip

2017-08-07 Thread bhaisaab

This is an automated email from the ASF dual-hosted git repository.

bhaisaab pushed a commit to branch CLOUDSTACK-10012
in repository https://gitbox.apache.org/repos/asf/cloudstack.git

commit f0c0d5ca9bee794f9731eb08fbe2c3d293a8a1d5
Author: Rohit Yadav 
AuthorDate: Mon Aug 7 19:28:20 2017 +0200

centos63: wip

Signed-off-by: Rohit Yadav 
---
 packaging/centos63/cloud.spec  | 93 --
 packaging/centos63/tomcat.sh   | 18 ---
 packaging/debian/init/cloud-management |  7 +--
 3 files changed, 12 insertions(+), 106 deletions(-)

diff --git a/packaging/centos63/cloud.spec b/packaging/centos63/cloud.spec
index abe50bc..1427733 100644
--- a/packaging/centos63/cloud.spec
+++ b/packaging/centos63/cloud.spec
@@ -44,7 +44,6 @@ Source0:   %{name}-%{_maventag}.tgz
 BuildRoot: %{_tmppath}/%{name}-%{_maventag}-%{release}-build
 
 BuildRequires: java-1.8.0-openjdk-devel
-BuildRequires: tomcat6
 BuildRequires: ws-commons-util
 BuildRequires: jpackage-utils
 BuildRequires: gcc
@@ -59,7 +58,6 @@ intelligent IaaS cloud implementation.
 
 %package management
 Summary:   CloudStack management server UI
-Requires: tomcat6
 Requires: java-1.8.0-openjdk
 Requires: python
 Requires: bash
@@ -193,7 +191,6 @@ Apache CloudStack Marvin integration tests
 %package mysql-ha
 Summary: Apache CloudStack Balancing Strategy for MySQL
 Requires: mysql-connector-java
-Requires: tomcat6
 Group: System Environmnet/Libraries
 %description mysql-ha
 Apache CloudStack Balancing Strategy for MySQL
@@ -266,21 +263,12 @@ cp -r 
plugins/network-elements/cisco-vnmc/scripts/network/cisco/* ${RPM_BUILD_RO
 
 # Management
 mkdir -p ${RPM_BUILD_ROOT}%{_datadir}/%{name}-management/
-mkdir -p ${RPM_BUILD_ROOT}%{_datadir}/%{name}-management/webapps/client
 mkdir -p ${RPM_BUILD_ROOT}%{_datadir}/%{name}-management/setup
 mkdir -p ${RPM_BUILD_ROOT}%{_localstatedir}/log/%{name}/management
 mkdir -p ${RPM_BUILD_ROOT}%{_sysconfdir}/%{name}/management
 
-# Specific for tomcat
-mkdir -p 
${RPM_BUILD_ROOT}%{_sysconfdir}/%{name}/management/Catalina/localhost/client
-ln -sf /usr/share/tomcat6/bin 
${RPM_BUILD_ROOT}%{_datadir}/%{name}-management/bin
 ln -sf /etc/%{name}/management 
${RPM_BUILD_ROOT}%{_datadir}/%{name}-management/conf
-ln -sf /usr/share/tomcat6/lib 
${RPM_BUILD_ROOT}%{_datadir}/%{name}-management/lib
 ln -sf /var/log/%{name}/management 
${RPM_BUILD_ROOT}%{_datadir}/%{name}-management/logs
-ln -sf /var/cache/%{name}/management/temp 
${RPM_BUILD_ROOT}%{_datadir}/%{name}-management/temp
-ln -sf /var/cache/%{name}/management/work 
${RPM_BUILD_ROOT}%{_datadir}/%{name}-management/work
-
-/bin/touch 
${RPM_BUILD_ROOT}%{_localstatedir}/log/%{name}/management/catalina.out
 
 install -D client/target/utilities/bin/cloud-migrate-databases 
${RPM_BUILD_ROOT}%{_bindir}/%{name}-migrate-databases
 install -D client/target/utilities/bin/cloud-set-guest-password 
${RPM_BUILD_ROOT}%{_bindir}/%{name}-set-guest-password
@@ -293,24 +281,20 @@ install -D client/target/utilities/bin/cloud-sysvmadm 
${RPM_BUILD_ROOT}%{_bindir
 install -D client/target/utilities/bin/cloud-update-xenserver-licenses 
${RPM_BUILD_ROOT}%{_bindir}/%{name}-update-xenserver-licenses
 
 cp -r client/target/utilities/scripts/db/* 
${RPM_BUILD_ROOT}%{_datadir}/%{name}-management/setup
-cp -r client/target/cloud-client-ui-%{_maventag}/* 
${RPM_BUILD_ROOT}%{_datadir}/%{name}-management/webapps/client
+cp client/target/cloud-client-ui-%{_maventag}.jar 
${RPM_BUILD_ROOT}%{_datadir}/%{name}-management/cloud-management-server.jar
+
+mkdir -p ${RPM_BUILD_ROOT}%{_datadir}/%{name}-management/lib
+cp client/target/bcprov-jdk15on-1.55.jar 
${RPM_BUILD_ROOT}%{_datadir}/%{name}-management/lib/
 
 # Don't package the scripts in the management webapp
 rm -rf 
${RPM_BUILD_ROOT}%{_datadir}/%{name}-management/webapps/client/WEB-INF/classes/scripts
 rm -rf 
${RPM_BUILD_ROOT}%{_datadir}/%{name}-management/webapps/client/WEB-INF/classes/vms
 
-for name in db.properties log4j-cloud.xml tomcat6-nonssl.conf tomcat6-ssl.conf 
server-ssl.xml server-nonssl.xml commons-logging.properties \
-catalina.policy catalina.properties classpath.conf 
tomcat-users.xml web.xml environment.properties java.security.ciphers; do
-  mv 
${RPM_BUILD_ROOT}%{_datadir}/%{name}-management/webapps/client/WEB-INF/classes/$name
 \
-${RPM_BUILD_ROOT}%{_sysconfdir}/%{name}/management/$name
+for name in db.properties log4j-cloud.xml server-ssl.xml server-nonssl.xml 
commons-logging.properties \
+classpath.conf web.xml environment.properties 
java.security.ciphers; do
+  cp client/target/conf/$name 
${RPM_BUILD_ROOT}%{_sysconfdir}/%{name}/management/$name
 done
 
-ln -s %{_sysconfdir}/%{name}/management/log4j-cloud.xml \
-
${RPM_BUILD_ROOT}%{_datadir}/%{name}-management/webapps/client/WEB-INF/classes/log4j-cloud.xml
-
-mv 
${RPM_BUILD_ROOT}%{_datadir}/%{name}-management/webapps/client/WEB-INF/classes/context.xml
 \

[cloudstack] 02/02: centos63: remove stuff

2017-08-07 Thread bhaisaab

This is an automated email from the ASF dual-hosted git repository.

bhaisaab pushed a commit to branch CLOUDSTACK-10012
in repository https://gitbox.apache.org/repos/asf/cloudstack.git

commit 83378fa1eabf5a7268c6397ffeee17e4e303bc0d
Author: Rohit Yadav 
AuthorDate: Mon Aug 7 19:41:35 2017 +0200

centos63: remove stuff

Signed-off-by: Rohit Yadav 
---
 packaging/centos63/cloud-management.rc| 201 +++---
 packaging/centos63/cloud-management.sysconfig |  23 ---
 packaging/centos63/cloud.spec |   3 -
 3 files changed, 118 insertions(+), 109 deletions(-)

diff --git a/packaging/centos63/cloud-management.rc 
b/packaging/centos63/cloud-management.rc
index 5b6ba4f..b8babea 100755
--- a/packaging/centos63/cloud-management.rc
+++ b/packaging/centos63/cloud-management.rc
@@ -1,4 +1,15 @@
 #!/bin/bash
+
+### BEGIN INIT INFO
+# Provides:  cloudstack-management
+# Required-Start:$network $local_fs
+# Required-Stop: $network $local_fs
+# Default-Start: 3 4 5
+# Default-Stop:  0 1 2 6
+# Short-Description: Start/stop Apache CloudStack Usage Monitor
+# Description: This scripts Starts/Stops the Apache CloudStack Management 
Server
+### END INIT INFO
+
 # Licensed to the Apache Software Foundation (ASF) under one
 # or more contributor license agreements.  See the NOTICE file
 # distributed with this work for additional information
@@ -6,111 +17,135 @@
 # to you under the Apache License, Version 2.0 (the
 # "License"); you may not use this file except in compliance
 # with the License.  You may obtain a copy of the License at
-# 
+#
 #   http://www.apache.org/licenses/LICENSE-2.0
-# 
+#
 # Unless required by applicable law or agreed to in writing,
 # software distributed under the License is distributed on an
 # "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
 # KIND, either express or implied.  See the License for the
 # specific language governing permissions and limitations
 # under the License.
-#
-# cloudstack-management  This shell script takes care of starting and 
stopping Tomcat
-#
-# chkconfig: - 80 20
-#
-### BEGIN INIT INFO
-# Provides: tomcat6
-# Required-Start: $network $syslog
-# Required-Stop: $network $syslog
-# Default-Start:
-# Default-Stop:
-# Description: Release implementation for Servlet 2.5 and JSP 2.1
-# Short-Description: start and stop tomcat
-### END INIT INFO
-#
-# - originally written by Henri Gomez, Keith Irwin, and Nicolas Mailhot
-# - heavily rewritten by Deepak Bhole and Jason Corley
-#
 
-if [ -r /etc/rc.d/init.d/functions ]; then
-. /etc/rc.d/init.d/functions
-fi
-if [ -r /lib/lsb/init-functions ]; then
-. /lib/lsb/init-functions
-fi
+. /etc/rc.d/init.d/functions
 
+SHORTNAME="cloudstack-management"
+PIDFILE=/var/run/"$SHORTNAME".pid
+LOCKFILE=/var/lock/subsys/"$SHORTNAME"
+LOGDIR=/var/log/cloudstack/management
+PROGNAME="CloudStack Management Server"
+CLASS="org.apache.cloudstack.ServerDaemon"
+PROG="jsvc"
+DAEMON="/usr/bin/jsvc"
+USER=cloud
 
-NAME="$(basename $(readlink -f $0))"
-export SERVICE_NAME="$NAME"
-stop() {
-   SHUTDOWN_WAIT="30"
-   count="0"
-   if [ -f /var/run/${NAME}.pid ]; then
-   pid=`cat /var/run/${NAME}.pid`
-   kill $pid &>/dev/null
-   until [ "$(ps --pid $pid | grep -c $pid)" -eq "0" ] || \
-   [ "$count" -gt "$SHUTDOWN_WAIT" ]
-   do
-   sleep 1
-   let count="${count}+1"
-   done
-   if [ "$(ps --pid $pid | grep -c $pid)" -eq "0" ]; then
-   log_success_msg "Stopping ${NAME}:"
-   rm -f /var/run/${NAME}.pid
-   rm -f /var/lock/subsys/${NAME}
-   else
-   log_failure_msg "Stopping ${NAME}:"
-   fi
-   else
-   echo "Cannot find PID file of ${NAME}"
-   log_failure_msg "Stopping ${NAME}:"
-   fi
+unset OPTIONS
+[ -r /etc/sysconfig/default/"$SHORTNAME" ] && source 
/etc/sysconfig/default/"$SHORTNAME"
+
+setJavaHome() {
+  # use $JAVA_HOME if defined
+  if [ -n "$JAVA_HOME" ] ; then
+return
+  fi
+
+  # try java first
+  java=$(which java 2>/dev/null || :)
+
+  # try javac if java is not found
+  if [ -z "$java" ] ; then
+java=$(which javac 2>/dev/null || :)
+  fi
+
+  if [ -n "$java" ] ; then
+JAVA_HOME=$(dirname $(dirname $(readlink -e $java)))
+export JAVA_HOME
+return
+  fi
+
+  # didnt find java home. exiting with error
+  exit 1
 }
 
-set_ulimit() {
-fd_limit=`ulimit -n`
-if [ "$fd_limit" != "4096" ]; then
-user=`whoami`
-if [ $user == "root" ]; then
-ulimit -n 4096
+setJavaHome
+
+JARS=$(ls /usr/share/cloudstack-management/lib/\*.jar | tr '\n' ':' | sed 
s'/.$//')

[cloudstack] branch CLOUDSTACK-10012 updated (79c302d -> 83378fa)

2017-08-07 Thread bhaisaab

This is an automated email from the ASF dual-hosted git repository.

bhaisaab pushed a change to branch CLOUDSTACK-10012
in repository https://gitbox.apache.org/repos/asf/cloudstack.git.


from 79c302d  packaging: read/load jars from /lib directory
 new f0c0d5c  centos63: wip
 new 83378fa  centos63: remove stuff

The 2 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "add" were already present in the repository and have only
been added to this reference.


Summary of changes:
 packaging/centos63/cloud-management.rc| 201 +++---
 packaging/centos63/cloud-management.sysconfig |  23 ---
 packaging/centos63/cloud.spec |  96 ++--
 packaging/centos63/tomcat.sh  |  18 ---
 packaging/debian/init/cloud-management|   7 +-
 5 files changed, 130 insertions(+), 215 deletions(-)
 delete mode 100644 packaging/centos63/cloud-management.sysconfig
 delete mode 100644 packaging/centos63/tomcat.sh

-- 
To stop receiving notification emails like this one, please contact
['"commits@cloudstack.apache.org" '].

[GitHub] sachinnitw1317 commented on a change in pull request #2204: [CLOUDSTACK-10025] Adding Support for NoVNC Console for KVM

2017-08-07 Thread git

sachinnitw1317 commented on a change in pull request #2204: [CLOUDSTACK-10025] 
Adding Support for NoVNC Console for KVM
URL: https://github.com/apache/cloudstack/pull/2204#discussion_r131719473
 
 

 ##
 File path: 
services/console-proxy/server/src/com/cloud/consoleproxy/ConsoleProxySecureServerFactoryImpl.java
 ##
 @@ -76,34 +86,83 @@ public void init(byte[] ksBits, String ksPassword) {
 }
 
 @Override
-public HttpServer createHttpServerInstance(int port) throws IOException {
-try {
-HttpsServer server = HttpsServer.create(new 
InetSocketAddress(port), 5);
-server.setHttpsConfigurator(new HttpsConfigurator(sslContext) {
-@Override
-public void configure(HttpsParameters params) {
-
-// get the remote address if needed
-InetSocketAddress remote = params.getClientAddress();
-SSLContext c = getSSLContext();
-
-// get the default parameters
-SSLParameters sslparams = c.getDefaultSSLParameters();
-
-params.setSSLParameters(sslparams);
-params.setProtocols(SSLUtils.getRecommendedProtocols());
-params.setCipherSuites(SSLUtils.getRecommendedCiphers());
-// statement above could throw IAE if any params invalid.
-// eg. if app has a UI and parameters supplied by a user.
-}
-});
-
-s_logger.info("create HTTPS server instance on port: " + port);
-return server;
-} catch (Exception ioe) {
-s_logger.error(ioe.toString(), ioe);
-}
-return null;
+public Server createHttpServerInstance(int port) throws IOException {
+Server server = getServerWithContext(port);
+
+/**
+ * add all context here
+ **/
+
+// HTTP Configuration
+HttpConfiguration http = new HttpConfiguration();
+http.addCustomizer(new SecureRequestCustomizer());
+
+// Configuration for HTTPS redirect
+http.setSecurePort(port);
+http.setSecureScheme("https");
+ServerConnector connector = new ServerConnector(server);
+connector.addConnectionFactory(new HttpConnectionFactory(http));
+// Setting HTTP port
+connector.setPort(80);
+
+// HTTPS configuration
+HttpConfiguration https = new HttpConfiguration();
+https.addCustomizer(new SecureRequestCustomizer());
+
+// Configuring the connector
+ServerConnector sslConnector = new ServerConnector(server,
+new SslConnectionFactory(sslContextFactory, "http/1.1"), new 
HttpConnectionFactory(https));
+sslConnector.setPort(port);
+
+// Setting HTTP and HTTPS connectors
+server.setConnectors(new Connector[]{connector, sslConnector});
+return server;
+}
+
+private Server getServerWithContext(int port) {
 
 Review comment:
   I moved it to static constant in this file. Do you want me to add it to some 
config files?
 

This is an automated message from the Apache Git Service.
To respond to the message, please log on GitHub and use the
URL above to go to the specific comment.
 
For queries about this service, please contact Infrastructure at:
us...@infra.apache.org


With regards,
Apache Git Services

[cloudstack-docs-admin] branch master updated (f144391 -> 52870a0)

2017-08-07 Thread pdion891

This is an automated email from the ASF dual-hosted git repository.

pdion891 pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/cloudstack-docs-admin.git.


from f144391  add binary files for french translation
 add 2cdc7db  French translation of Virtual Machine and Isolation with vlan 
We are now about 60% of string translated
 add ffc7cb9  Traduction FR de usage
 new 52870a0  Merge pull request #42 from lmrv/master

The 1 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "add" were already present in the repository and have only
been added to this reference.


Summary of changes:
 .../networking/ip_forwarding_and_firewalling.mo|  Bin 19127 -> 2440 bytes
 .../networking/ip_forwarding_and_firewalling.po|2 +-
 .../isolation_in_advanced_zone_with_vlan.mo|  Bin 15394 -> 16474 bytes
 .../isolation_in_advanced_zone_with_vlan.po|  172 +-
 .../public_ips_and_vlans_for_accounts.mo   |  Bin 7048 -> 3135 bytes
 .../public_ips_and_vlans_for_accounts.po   |   70 +-
 source/locale/fr/LC_MESSAGES/networking2.mo|  Bin 320165 -> 138454 
bytes
 source/locale/fr/LC_MESSAGES/networking2.po|   98 +-
 .../fr/LC_MESSAGES/networking_and_traffic.mo   |  Bin 340481 -> 138239 
bytes
 .../fr/LC_MESSAGES/networking_and_traffic.po   |   92 +-
 source/locale/fr/LC_MESSAGES/usage.po  |  573 --
 source/locale/fr/LC_MESSAGES/virtual_machines.mo   |  Bin 98378 -> 109167 bytes
 source/locale/fr/LC_MESSAGES/virtual_machines.po   | 1949 +---
 13 files changed, 2068 insertions(+), 888 deletions(-)

-- 
To stop receiving notification emails like this one, please contact
['"commits@cloudstack.apache.org" '].

[cloudstack-docs-admin] 01/01: Merge pull request #42 from lmrv/master

2017-08-07 Thread pdion891

This is an automated email from the ASF dual-hosted git repository.

pdion891 pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/cloudstack-docs-admin.git

commit 52870a053f224517ced76c3f97082c472ff80a23
Merge: f144391 ffc7cb9
Author: Pierre-Luc Dion 
AuthorDate: Mon Aug 7 12:53:45 2017 -0400

Merge pull request #42 from lmrv/master

French translation of Virtual Machine and Isolation with vlan

 .../networking/ip_forwarding_and_firewalling.mo|  Bin 19127 -> 2440 bytes
 .../networking/ip_forwarding_and_firewalling.po|2 +-
 .../isolation_in_advanced_zone_with_vlan.mo|  Bin 15394 -> 16474 bytes
 .../isolation_in_advanced_zone_with_vlan.po|  172 +-
 .../public_ips_and_vlans_for_accounts.mo   |  Bin 7048 -> 3135 bytes
 .../public_ips_and_vlans_for_accounts.po   |   70 +-
 source/locale/fr/LC_MESSAGES/networking2.mo|  Bin 320165 -> 138454 
bytes
 source/locale/fr/LC_MESSAGES/networking2.po|   98 +-
 .../fr/LC_MESSAGES/networking_and_traffic.mo   |  Bin 340481 -> 138239 
bytes
 .../fr/LC_MESSAGES/networking_and_traffic.po   |   92 +-
 source/locale/fr/LC_MESSAGES/usage.po  |  573 --
 source/locale/fr/LC_MESSAGES/virtual_machines.mo   |  Bin 98378 -> 109167 bytes
 source/locale/fr/LC_MESSAGES/virtual_machines.po   | 1949 +---
 13 files changed, 2068 insertions(+), 888 deletions(-)

-- 
To stop receiving notification emails like this one, please contact
"commits@cloudstack.apache.org" .

[cloudstack] 01/02: centos7: remove dirs not created

2017-08-07 Thread bhaisaab

This is an automated email from the ASF dual-hosted git repository.

bhaisaab pushed a commit to branch CLOUDSTACK-10012
in repository https://gitbox.apache.org/repos/asf/cloudstack.git

commit 7ff8bb105b62513c3973606d9e4e04abf99de706
Author: Rohit Yadav 
AuthorDate: Mon Aug 7 18:03:46 2017 +0200

centos7: remove dirs not created

Signed-off-by: Rohit Yadav 
---
 packaging/centos7/cloud.spec | 5 -
 1 file changed, 5 deletions(-)

diff --git a/packaging/centos7/cloud.spec b/packaging/centos7/cloud.spec
index b757bdd..8251b74 100644
--- a/packaging/centos7/cloud.spec
+++ b/packaging/centos7/cloud.spec
@@ -481,13 +481,8 @@ pip install --upgrade 
/usr/share/cloudstack-marvin/Marvin-*.tar.gz
 
 %attr(0755,root,root) %{_bindir}/%{name}-setup-management
 %attr(0755,root,root) %{_bindir}/%{name}-update-xenserver-licenses
-%{_datadir}/%{name}-management/webapps
-%{_datadir}/%{name}-management/bin
 %{_datadir}/%{name}-management/conf
-%{_datadir}/%{name}-management/lib
 %{_datadir}/%{name}-management/logs
-%{_datadir}/%{name}-management/temp
-%{_datadir}/%{name}-management/work
 %attr(0755,root,root) %{_bindir}/%{name}-setup-databases
 %attr(0755,root,root) %{_bindir}/%{name}-migrate-databases
 %attr(0755,root,root) %{_bindir}/%{name}-set-guest-password

-- 
To stop receiving notification emails like this one, please contact
"commits@cloudstack.apache.org" .

[cloudstack] 02/02: packaging: read/load jars from /lib directory

2017-08-07 Thread bhaisaab

This is an automated email from the ASF dual-hosted git repository.

bhaisaab pushed a commit to branch CLOUDSTACK-10012
in repository https://gitbox.apache.org/repos/asf/cloudstack.git

commit 79c302dadbb4e6bd9a7a066e2d5dc6e4a29aeab5
Author: Rohit Yadav 
AuthorDate: Mon Aug 7 18:43:24 2017 +0200

packaging: read/load jars from /lib directory

Signed-off-by: Rohit Yadav 
---
 debian/rules| 9 -
 packaging/centos7/cloud.spec| 9 ++---
 packaging/debian/init/cloud-management  | 3 ++-
 packaging/systemd/cloudstack-management.default | 4 +++-
 4 files changed, 15 insertions(+), 10 deletions(-)

diff --git a/debian/rules b/debian/rules
index b250650..bb0ada6 100755
--- a/debian/rules
+++ b/debian/rules
@@ -66,7 +66,8 @@ override_dh_auto_install:
mkdir -p $(DESTDIR)/$(SYSCONFDIR)/security/limits.d/
mkdir -p $(DESTDIR)/$(SYSCONFDIR)/sudoers.d/
mkdir -p $(DESTDIR)/usr/share/$(PACKAGE)-management
-   mkdir $(DESTDIR)/usr/share/$(PACKAGE)-management/setup
+   mkdir -p $(DESTDIR)/usr/share/$(PACKAGE)-management/lib
+   mkdir -p $(DESTDIR)/usr/share/$(PACKAGE)-management/setup
mkdir $(DESTDIR)/var/log/$(PACKAGE)/management
mkdir $(DESTDIR)/var/cache/$(PACKAGE)/management
mkdir $(DESTDIR)/var/cache/$(PACKAGE)/management/work
@@ -77,10 +78,8 @@ override_dh_auto_install:
cp -r client/target/utilities/scripts/db/* 
$(DESTDIR)/usr/share/$(PACKAGE)-management/setup/
cp server/target/conf/* $(DESTDIR)/$(SYSCONFDIR)/$(PACKAGE)/server/
cp client/target/conf/* $(DESTDIR)/$(SYSCONFDIR)/$(PACKAGE)/management/
-   cp client/target/cloud-client-ui-$(VERSION).jar 
$(DESTDIR)/usr/share/$(PACKAGE)-management/
-   # To have a uniq name across versions for the startup script
-   ln -s cloud-client-ui-$(VERSION).jar 
$(DESTDIR)/usr/share/$(PACKAGE)-management/cloud-management-server.jar
-   cp client/target/bcprov-jdk15on-1.55.jar 
$(DESTDIR)/usr/share/$(PACKAGE)-management/
+   cp client/target/cloud-client-ui-$(VERSION).jar 
$(DESTDIR)/usr/share/$(PACKAGE)-management/cloud-management-server.jar
+   cp client/target/bcprov-jdk15on-1.55.jar 
$(DESTDIR)/usr/share/$(PACKAGE)-management/lib/
# To make jetty happy from the 1st line of log
ln -s log4j-cloud.xml 
$(DESTDIR)/$(SYSCONFDIR)/$(PACKAGE)/management/log4j.xml
 
diff --git a/packaging/centos7/cloud.spec b/packaging/centos7/cloud.spec
index 8251b74..ff96414 100644
--- a/packaging/centos7/cloud.spec
+++ b/packaging/centos7/cloud.spec
@@ -251,10 +251,11 @@ install -D client/target/utilities/bin/cloud-sysvmadm 
${RPM_BUILD_ROOT}%{_bindir
 install -D client/target/utilities/bin/cloud-update-xenserver-licenses 
${RPM_BUILD_ROOT}%{_bindir}/%{name}-update-xenserver-licenses
 
 cp -r client/target/utilities/scripts/db/* 
${RPM_BUILD_ROOT}%{_datadir}/%{name}-management/setup
+
 cp -r client/target/cloud-client-ui-%{_maventag}.jar 
${RPM_BUILD_ROOT}%{_datadir}/%{name}-management/
-ln -s cloud-client-ui-%{_maventag}.jar 
${RPM_BUILD_ROOT}%{_datadir}/%{name}-management/cloud-management-server.jar
-cp client/target/bcprov-jdk15on-1.55.jar 
${RPM_BUILD_ROOT}%{_datadir}/%{name}-management/
-ln -s log4j-cloud.xml ${RPM_BUILD_ROOT}%{_datadir}/%{name}-management/log4j.xml
+mv 
${RPM_BUILD_ROOT}%{_datadir}/%{name}-management/cloud-client-ui-%{_maventag}.jar
 ${RPM_BUILD_ROOT}%{_datadir}/%{name}-management/cloud-management-server.jar
+mkdir -p ${RPM_BUILD_ROOT}%{_datadir}/%{name}-management/lib
+cp client/target/bcprov-jdk15on-1.55.jar 
${RPM_BUILD_ROOT}%{_datadir}/%{name}-management/lib/
 
 # Don't package the scripts in the management webapp
 rm -rf 
${RPM_BUILD_ROOT}%{_datadir}/%{name}-management/webapps/client/WEB-INF/classes/scripts
@@ -482,6 +483,7 @@ pip install --upgrade 
/usr/share/cloudstack-marvin/Marvin-*.tar.gz
 %attr(0755,root,root) %{_bindir}/%{name}-setup-management
 %attr(0755,root,root) %{_bindir}/%{name}-update-xenserver-licenses
 %{_datadir}/%{name}-management/conf
+%{_datadir}/%{name}-management/lib
 %{_datadir}/%{name}-management/logs
 %attr(0755,root,root) %{_bindir}/%{name}-setup-databases
 %attr(0755,root,root) %{_bindir}/%{name}-migrate-databases
@@ -489,6 +491,7 @@ pip install --upgrade 
/usr/share/cloudstack-marvin/Marvin-*.tar.gz
 %attr(0755,root,root) %{_bindir}/%{name}-set-guest-sshkey
 %attr(0755,root,root) %{_bindir}/%{name}-sysvmadm
 %attr(0755,root,root) %{_bindir}/%{name}-setup-encryption
+%{_datadir}/%{name}-management/cloud-management-server.jar
 %{_datadir}/%{name}-management/setup/*.sql
 %{_datadir}/%{name}-management/setup/db/*.sql
 %{_datadir}/%{name}-management/setup/*.sh
diff --git a/packaging/debian/init/cloud-management 
b/packaging/debian/init/cloud-management
index a1d64a8..bcd1b18 100755
--- a/packaging/debian/init/cloud-management
+++ b/packaging/debian/init/cloud-management
@@ -42,7 +42,8 @@

[cloudstack] branch CLOUDSTACK-10012 updated (d46f506 -> 79c302d)

2017-08-07 Thread bhaisaab

This is an automated email from the ASF dual-hosted git repository.

bhaisaab pushed a change to branch CLOUDSTACK-10012
in repository https://gitbox.apache.org/repos/asf/cloudstack.git.


from d46f506  centos7: fix missing paths
 new 7ff8bb1  centos7: remove dirs not created
 new 79c302d  packaging: read/load jars from /lib directory

The 2 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "add" were already present in the repository and have only
been added to this reference.


Summary of changes:
 debian/rules|  9 -
 packaging/centos7/cloud.spec| 12 +---
 packaging/debian/init/cloud-management  |  3 ++-
 packaging/systemd/cloudstack-management.default |  4 +++-
 4 files changed, 14 insertions(+), 14 deletions(-)

-- 
To stop receiving notification emails like this one, please contact
['"commits@cloudstack.apache.org" '].

[GitHub] sachinnitw1317 commented on a change in pull request #2204: [CLOUDSTACK-10025] Adding Support for NoVNC Console for KVM

2017-08-07 Thread git

sachinnitw1317 commented on a change in pull request #2204: [CLOUDSTACK-10025] 
Adding Support for NoVNC Console for KVM
URL: https://github.com/apache/cloudstack/pull/2204#discussion_r131701986
 
 

 ##
 File path: 
services/console-proxy/server/src/com/cloud/consoleproxy/vnc/VncClient.java
 ##
 @@ -16,6 +16,16 @@
 // under the License.
 package com.cloud.consoleproxy.vnc;
 
+import com.cloud.consoleproxy.ConsoleProxyClientListener;
 
 Review comment:
   done
 

This is an automated message from the Apache Git Service.
To respond to the message, please log on GitHub and use the
URL above to go to the specific comment.
 
For queries about this service, please contact Infrastructure at:
us...@infra.apache.org


With regards,
Apache Git Services

[GitHub] blueorangutan commented on issue #2227: Revert "CLOUDSTACK-9749: Disable password service on ilb systemvm (#1?

2017-08-07 Thread git

blueorangutan commented on issue #2227: Revert "CLOUDSTACK-9749: Disable 
password service on ilb systemvm (#1?
URL: https://github.com/apache/cloudstack/pull/2227#issuecomment-320709737
 
 
   @borisstoyanov a Trillian-Jenkins test job (centos7 mgmt + kvm-centos7) has 
been kicked to run smoke tests
 

This is an automated message from the Apache Git Service.
To respond to the message, please log on GitHub and use the
URL above to go to the specific comment.
 
For queries about this service, please contact Infrastructure at:
us...@infra.apache.org


With regards,
Apache Git Services

[GitHub] borisstoyanov commented on issue #2227: Revert "CLOUDSTACK-9749: Disable password service on ilb systemvm (#1?

2017-08-07 Thread git

borisstoyanov commented on issue #2227: Revert "CLOUDSTACK-9749: Disable 
password service on ilb systemvm (#1?
URL: https://github.com/apache/cloudstack/pull/2227#issuecomment-320709699
 
 
   @blueorangutan test
 

This is an automated message from the Apache Git Service.
To respond to the message, please log on GitHub and use the
URL above to go to the specific comment.
 
For queries about this service, please contact Infrastructure at:
us...@infra.apache.org


With regards,
Apache Git Services

[GitHub] blueorangutan commented on issue #2227: Revert "CLOUDSTACK-9749: Disable password service on ilb systemvm (#1?

2017-08-07 Thread git

blueorangutan commented on issue #2227: Revert "CLOUDSTACK-9749: Disable 
password service on ilb systemvm (#1?
URL: https://github.com/apache/cloudstack/pull/2227#issuecomment-320703844
 
 
   Packaging result: ?centos6 ?centos7 ?debian. JID-929
 

This is an automated message from the Apache Git Service.
To respond to the message, please log on GitHub and use the
URL above to go to the specific comment.
 
For queries about this service, please contact Infrastructure at:
us...@infra.apache.org


With regards,
Apache Git Services

[cloudstack] branch CLOUDSTACK-10012 updated: centos7: fix missing paths

2017-08-07 Thread bhaisaab

This is an automated email from the ASF dual-hosted git repository.

bhaisaab pushed a commit to branch CLOUDSTACK-10012
in repository https://gitbox.apache.org/repos/asf/cloudstack.git


The following commit(s) were added to refs/heads/CLOUDSTACK-10012 by this push:
 new d46f506  centos7: fix missing paths
d46f506 is described below

commit d46f5062371cedf179e427a39746387d140447fd
Author: Rohit Yadav 
AuthorDate: Mon Aug 7 17:43:40 2017 +0200

centos7: fix missing paths

Signed-off-by: Rohit Yadav 
---
 packaging/centos7/cloud.spec | 7 +--
 1 file changed, 1 insertion(+), 6 deletions(-)

diff --git a/packaging/centos7/cloud.spec b/packaging/centos7/cloud.spec
index 56a6ca4..b757bdd 100644
--- a/packaging/centos7/cloud.spec
+++ b/packaging/centos7/cloud.spec
@@ -231,7 +231,6 @@ cp -r 
plugins/network-elements/cisco-vnmc/scripts/network/cisco/* ${RPM_BUILD_RO
 
 # Management
 mkdir -p ${RPM_BUILD_ROOT}%{_datadir}/%{name}-management/
-mkdir -p ${RPM_BUILD_ROOT}%{_datadir}/%{name}-management/webapps/client
 mkdir -p ${RPM_BUILD_ROOT}%{_datadir}/%{name}-management/setup
 mkdir -p ${RPM_BUILD_ROOT}%{_localstatedir}/log/%{name}/management
 mkdir -p ${RPM_BUILD_ROOT}%{_sysconfdir}/%{name}/management
@@ -265,13 +264,9 @@ for name in db.properties log4j-cloud.xml 
server7-nonssl.xml server7-ssl.xml \
 commons-logging.properties classpath.conf \
 web.xml environment.properties java.security.ciphers
 do
-  mv 
${RPM_BUILD_ROOT}%{_datadir}/%{name}-management/webapps/client/WEB-INF/classes/$name
 \
-${RPM_BUILD_ROOT}%{_sysconfdir}/%{name}/management/$name
+  cp client/target/conf/$name 
${RPM_BUILD_ROOT}%{_sysconfdir}/%{name}/management/$name
 done
 
-ln -s %{_sysconfdir}/%{name}/management/log4j-cloud.xml \
-
${RPM_BUILD_ROOT}%{_datadir}/%{name}-management/webapps/client/WEB-INF/classes/log4j-cloud.xml
-
 install python/bindir/cloud-external-ipallocator.py 
${RPM_BUILD_ROOT}%{_bindir}/%{name}-external-ipallocator.py
 install -D client/target/pythonlibs/jasypt-1.9.2.jar 
${RPM_BUILD_ROOT}%{_datadir}/%{name}-common/lib/jasypt-1.9.2.jar
 

-- 
To stop receiving notification emails like this one, please contact
['"commits@cloudstack.apache.org" '].

[GitHub] blueorangutan commented on issue #2226: CLOUDSTACK-10012: Towards CloudStack fat jar

2017-08-07 Thread git

blueorangutan commented on issue #2226: CLOUDSTACK-10012: Towards CloudStack 
fat jar
URL: https://github.com/apache/cloudstack/pull/2226#issuecomment-320700055
 
 
   Packaging result: ?centos6 ?centos7 ?debian. JID-928
 

This is an automated message from the Apache Git Service.
To respond to the message, please log on GitHub and use the
URL above to go to the specific comment.
 
For queries about this service, please contact Infrastructure at:
us...@infra.apache.org


With regards,
Apache Git Services

[GitHub] marcaurele commented on issue #2226: CLOUDSTACK-10012: Towards CloudStack fat jar

2017-08-07 Thread git

marcaurele commented on issue #2226: CLOUDSTACK-10012: Towards CloudStack fat 
jar
URL: https://github.com/apache/cloudstack/pull/2226#issuecomment-320694032
 
 
   For postmortem, there are comments on this change in the linked PR #2207 
 

This is an automated message from the Apache Git Service.
To respond to the message, please log on GitHub and use the
URL above to go to the specific comment.
 
For queries about this service, please contact Infrastructure at:
us...@infra.apache.org


With regards,
Apache Git Services

[GitHub] borisstoyanov commented on issue #1912: CLOUDSTACK-9749: Disable password service on ilb systemvm

2017-08-07 Thread git

borisstoyanov commented on issue #1912: CLOUDSTACK-9749: Disable password 
service on ilb systemvm
URL: https://github.com/apache/cloudstack/pull/1912#issuecomment-320692834
 
 
   just did @rhtyd #2227 
 

This is an automated message from the Apache Git Service.
To respond to the message, please log on GitHub and use the
URL above to go to the specific comment.
 
For queries about this service, please contact Infrastructure at:
us...@infra.apache.org


With regards,
Apache Git Services

[GitHub] blueorangutan commented on issue #2227: Revert "CLOUDSTACK-9749: Disable password service on ilb systemvm (#1?

2017-08-07 Thread git

blueorangutan commented on issue #2227: Revert "CLOUDSTACK-9749: Disable 
password service on ilb systemvm (#1?
URL: https://github.com/apache/cloudstack/pull/2227#issuecomment-320690061
 
 
   @borisstoyanov a Jenkins job has been kicked to build packages. I'll keep 
you posted as I make progress.
 

This is an automated message from the Apache Git Service.
To respond to the message, please log on GitHub and use the
URL above to go to the specific comment.
 
For queries about this service, please contact Infrastructure at:
us...@infra.apache.org


With regards,
Apache Git Services

[GitHub] borisstoyanov commented on issue #2227: Revert "CLOUDSTACK-9749: Disable password service on ilb systemvm (#1?

2017-08-07 Thread git

borisstoyanov commented on issue #2227: Revert "CLOUDSTACK-9749: Disable 
password service on ilb systemvm (#1?
URL: https://github.com/apache/cloudstack/pull/2227#issuecomment-320689908
 
 
   @blueorangutan package
 

This is an automated message from the Apache Git Service.
To respond to the message, please log on GitHub and use the
URL above to go to the specific comment.
 
For queries about this service, please contact Infrastructure at:
us...@infra.apache.org


With regards,
Apache Git Services

[GitHub] borisstoyanov opened a new pull request #2227: Revert "CLOUDSTACK-9749: Disable password service on ilb systemvm (#1?

2017-08-07 Thread git

borisstoyanov opened a new pull request #2227: Revert "CLOUDSTACK-9749: Disable 
password service on ilb systemvm (#1?
URL: https://github.com/apache/cloudstack/pull/2227
 
 
   ?912)"
   
   This reverts commit 1414d20852f9df190189152dd73d81e5980ed839.
   This checks if smoketests failures has been introduced by this PR. 
 

This is an automated message from the Apache Git Service.
To respond to the message, please log on GitHub and use the
URL above to go to the specific comment.
 
For queries about this service, please contact Infrastructure at:
us...@infra.apache.org


With regards,
Apache Git Services

[GitHub] rhtyd commented on issue #1912: CLOUDSTACK-9749: Disable password service on ilb systemvm

2017-08-07 Thread git

rhtyd commented on issue #1912: CLOUDSTACK-9749: Disable password service on 
ilb systemvm
URL: https://github.com/apache/cloudstack/pull/1912#issuecomment-320685857
 
 
   @borisstoyanov if you suspect, do you mind creating a reverted PR branch and 
run test on it?
 

This is an automated message from the Apache Git Service.
To respond to the message, please log on GitHub and use the
URL above to go to the specific comment.
 
For queries about this service, please contact Infrastructure at:
us...@infra.apache.org


With regards,
Apache Git Services

[GitHub] rhtyd commented on issue #2207: Embedded jetty inside shaded jar

2017-08-07 Thread git

rhtyd commented on issue #2207: Embedded jetty inside shaded jar
URL: https://github.com/apache/cloudstack/pull/2207#issuecomment-320685545
 
 
   Thanks @marcaurele please collaborate on #2226 , feel free to directly push 
changes. I'll use your suggestions and incorporate them in the systemd scripts 
now, currently trying to fix centos packaging.
 

This is an automated message from the Apache Git Service.
To respond to the message, please log on GitHub and use the
URL above to go to the specific comment.
 
For queries about this service, please contact Infrastructure at:
us...@infra.apache.org


With regards,
Apache Git Services

[GitHub] blueorangutan commented on issue #2226: CLOUDSTACK-10012: Towards CloudStack fat jar

2017-08-07 Thread git

blueorangutan commented on issue #2226: CLOUDSTACK-10012: Towards CloudStack 
fat jar
URL: https://github.com/apache/cloudstack/pull/2226#issuecomment-320685044
 
 
   @rhtyd a Jenkins job has been kicked to build packages. I'll keep you posted 
as I make progress.
 

This is an automated message from the Apache Git Service.
To respond to the message, please log on GitHub and use the
URL above to go to the specific comment.
 
For queries about this service, please contact Infrastructure at:
us...@infra.apache.org


With regards,
Apache Git Services

[GitHub] rhtyd commented on issue #2226: CLOUDSTACK-10012: Towards CloudStack fat jar

2017-08-07 Thread git

rhtyd commented on issue #2226: CLOUDSTACK-10012: Towards CloudStack fat jar
URL: https://github.com/apache/cloudstack/pull/2226#issuecomment-320684892
 
 
   @blueorangutan package
 

This is an automated message from the Apache Git Service.
To respond to the message, please log on GitHub and use the
URL above to go to the specific comment.
 
For queries about this service, please contact Infrastructure at:
us...@infra.apache.org


With regards,
Apache Git Services

[GitHub] marcaurele closed pull request #2207: Embedded jetty inside shaded jar

2017-08-07 Thread git

marcaurele closed pull request #2207: Embedded jetty inside shaded jar
URL: https://github.com/apache/cloudstack/pull/2207
 
 
   
 

This is an automated message from the Apache Git Service.
To respond to the message, please log on GitHub and use the
URL above to go to the specific comment.
 
For queries about this service, please contact Infrastructure at:
us...@infra.apache.org


With regards,
Apache Git Services

[GitHub] marcaurele commented on issue #2207: Embedded jetty inside shaded jar

2017-08-07 Thread git

marcaurele commented on issue #2207: Embedded jetty inside shaded jar
URL: https://github.com/apache/cloudstack/pull/2207#issuecomment-320684649
 
 
   Ok, closing this one then in favor of #2226 
 

This is an automated message from the Apache Git Service.
To respond to the message, please log on GitHub and use the
URL above to go to the specific comment.
 
For queries about this service, please contact Infrastructure at:
us...@infra.apache.org


With regards,
Apache Git Services

[GitHub] rhtyd commented on issue #2226: CLOUDSTACK-10012: Towards CloudStack fat jar

2017-08-07 Thread git

rhtyd commented on issue #2226: CLOUDSTACK-10012: Towards CloudStack fat jar
URL: https://github.com/apache/cloudstack/pull/2226#issuecomment-320684214
 
 
   Travis green, so at least the mvn side of the world works: 
https://travis-ci.org/apache/cloudstack/builds/261836210 :)
 

This is an automated message from the Apache Git Service.
To respond to the message, please log on GitHub and use the
URL above to go to the specific comment.
 
For queries about this service, please contact Infrastructure at:
us...@infra.apache.org


With regards,
Apache Git Services

[cloudstack] 01/03: packaging: remove fedora packaging

2017-08-07 Thread bhaisaab

This is an automated email from the ASF dual-hosted git repository.

bhaisaab pushed a commit to branch CLOUDSTACK-10012
in repository https://gitbox.apache.org/repos/asf/cloudstack.git

commit 9a5df11a178dc4f13e2ca7ff0ba4efd892a1874b
Author: Rohit Yadav 
AuthorDate: Mon Aug 7 16:02:23 2017 +0200

packaging: remove fedora packaging

Signed-off-by: Rohit Yadav 
---
 packaging/fedora20/cloud-agent.rc | 118 -
 packaging/fedora20/cloud-ipallocator.rc   |  96 
 packaging/fedora20/cloud-management.rc| 115 -
 packaging/fedora20/cloud-management.sysconfig |  23 -
 packaging/fedora20/cloud-usage.rc | 156 --
 packaging/fedora20/cloud.spec | 655 --
 packaging/fedora20/cloudstack-agent.te|  33 --
 packaging/fedora20/cloudstack-sccs|  20 -
 packaging/fedora20/replace.properties |  59 ---
 packaging/fedora20/tomcat.sh  |  18 -
 packaging/fedora21/cloud-agent.rc | 118 -
 packaging/fedora21/cloud-ipallocator.rc   |  96 
 packaging/fedora21/cloud-management.rc| 115 -
 packaging/fedora21/cloud-management.sysconfig |  23 -
 packaging/fedora21/cloud-usage.rc | 156 --
 packaging/fedora21/cloud.spec | 655 --
 packaging/fedora21/cloudstack-agent.te|  33 --
 packaging/fedora21/cloudstack-sccs|  20 -
 packaging/fedora21/replace.properties |  59 ---
 packaging/fedora21/tomcat.sh  |  18 -
 20 files changed, 2586 deletions(-)

diff --git a/packaging/fedora20/cloud-agent.rc 
b/packaging/fedora20/cloud-agent.rc
deleted file mode 100755
index 2defa14..000
--- a/packaging/fedora20/cloud-agent.rc
+++ /dev/null
@@ -1,118 +0,0 @@
-#!/bin/bash
-
-# chkconfig: 35 99 10
-# description: Cloud Agent
-# pidfile: /var/run/cloudstack-agent.pid
-
-# Licensed to the Apache Software Foundation (ASF) under one
-# or more contributor license agreements.  See the NOTICE file
-# distributed with this work for additional information
-# regarding copyright ownership.  The ASF licenses this file
-# to you under the Apache License, Version 2.0 (the
-# "License"); you may not use this file except in compliance
-# with the License.  You may obtain a copy of the License at
-# 
-#   http://www.apache.org/licenses/LICENSE-2.0
-# 
-# Unless required by applicable law or agreed to in writing,
-# software distributed under the License is distributed on an
-# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied.  See the License for the
-# specific language governing permissions and limitations
-# under the License.
-
-# WARNING: if this script is changed, then all other initscripts MUST BE 
changed to match it as well
-
-. /etc/rc.d/init.d/functions
-
-# set environment variables
-
-SHORTNAME=$(basename $0 | sed -e 's/^[SK][0-9][0-9]//')
-PIDFILE=/var/run/"$SHORTNAME".pid
-LOCKFILE=/var/lock/subsys/"$SHORTNAME"
-LOGDIR=/var/log/cloudstack/agent
-LOGFILE=${LOGDIR}/agent.log
-PROGNAME="Cloud Agent"
-CLASS="com.cloud.agent.AgentShell"
-JSVC=`which jsvc 2>/dev/null`;
-
-# exit if we don't find jsvc
-if [ -z "$JSVC" ]; then
-echo no jsvc found in path;
-exit 1;
-fi
-
-unset OPTIONS
-[ -r /etc/sysconfig/"$SHORTNAME" ] && source /etc/sysconfig/"$SHORTNAME"
-
-# The first existing directory is used for JAVA_HOME (if JAVA_HOME is not 
defined in $DEFAULT)
-JDK_DIRS="/usr/lib/jvm/jre /usr/lib/jvm/java-7-openjdk 
/usr/lib/jvm/java-7-openjdk-i386 /usr/lib/jvm/java-7-openjdk-amd64 
/usr/lib/jvm/java-6-openjdk /usr/lib/jvm/java-6-openjdk-i386 
/usr/lib/jvm/java-6-openjdk-amd64 /usr/lib/jvm/java-6-sun"
-
-for jdir in $JDK_DIRS; do
-if [ -r "$jdir/bin/java" -a -z "${JAVA_HOME}" ]; then
-JAVA_HOME="$jdir"
-fi
-done
-export JAVA_HOME
-
-ACP=`ls /usr/share/cloudstack-agent/lib/*.jar | tr '\n' ':' | sed s'/.$//'`
-PCP=`ls /usr/share/cloudstack-agent/plugins/*.jar 2>/dev/null | tr '\n' ':' | 
sed s'/.$//'`
-
-# We need to append the JSVC daemon JAR to the classpath
-# AgentShell implements the JSVC daemon methods
-export 
CLASSPATH="/usr/share/java/commons-daemon.jar:$ACP:$PCP:/etc/cloudstack/agent:/usr/share/cloudstack-common/scripts"
-
-start() {
-echo -n $"Starting $PROGNAME: "
-if hostname --fqdn >/dev/null 2>&1 ; then
-$JSVC -Xms256m -Xmx2048m -cp "$CLASSPATH" -pidfile "$PIDFILE" \
--errfile $LOGDIR/cloudstack-agent.err -outfile 
$LOGDIR/cloudstack-agent.out $CLASS
-RETVAL=$?
-echo
-else
-failure
-echo
-echo The host name does not resolve properly to an IP address.  Cannot 
start "$PROGNAME". > /dev/stderr
-RETVAL=9
-fi
-[ $RETVAL = 0 ] && touch ${LOCKFILE}
-return $RETVAL
-}
-
-stop() {
-echo -n $"Stopping $PROGNAME: "
-$JSVC -pidfile "$PIDFILE" -stop $CLASS
-RETVAL=$?
-echo
-

[cloudstack] 02/03: centos7: fix centos7 spec

2017-08-07 Thread bhaisaab

This is an automated email from the ASF dual-hosted git repository.

bhaisaab pushed a commit to branch CLOUDSTACK-10012
in repository https://gitbox.apache.org/repos/asf/cloudstack.git

commit d5bf6c0644f42acebd30f35af47b4a95df37fa85
Author: Rohit Yadav 
AuthorDate: Mon Aug 7 16:26:29 2017 +0200

centos7: fix centos7 spec

Signed-off-by: Rohit Yadav 
---
 packaging/centos7/cloud.spec | 41 +
 1 file changed, 9 insertions(+), 32 deletions(-)

diff --git a/packaging/centos7/cloud.spec b/packaging/centos7/cloud.spec
index cc63f5f..56a6ca4 100644
--- a/packaging/centos7/cloud.spec
+++ b/packaging/centos7/cloud.spec
@@ -44,7 +44,6 @@ Source0:   %{name}-%{_maventag}.tgz
 BuildRoot: %{_tmppath}/%{name}-%{_maventag}-%{release}-build
 
 BuildRequires: java-1.8.0-openjdk-devel
-BuildRequires: tomcat => 7.0
 BuildRequires: ws-commons-util
 BuildRequires: jpackage-utils
 BuildRequires: gcc
@@ -59,7 +58,6 @@ intelligent IaaS cloud implementation.
 
 %package management
 Summary:   CloudStack management server UI
-Requires: tomcat => 7.0
 Requires: java => 1.8.0
 Requires: python
 Requires: bash
@@ -168,7 +166,6 @@ Apache CloudStack Marvin integration tests
 %package mysql-ha
 Summary: Apache CloudStack Balancing Strategy for MySQL
 Requires: mysql-connector-java
-Requires: tomcat => 7.0
 Group: System Environmnet/Libraries
 %description mysql-ha
 Apache CloudStack Balancing Strategy for MySQL
@@ -240,16 +237,9 @@ mkdir -p 
${RPM_BUILD_ROOT}%{_localstatedir}/log/%{name}/management
 mkdir -p ${RPM_BUILD_ROOT}%{_sysconfdir}/%{name}/management
 mkdir -p ${RPM_BUILD_ROOT}%{_localstatedir}/run
 
-# Specific for tomcat
-mkdir -p 
${RPM_BUILD_ROOT}%{_sysconfdir}/%{name}/management/Catalina/localhost/client
-ln -sf /usr/share/tomcat/bin 
${RPM_BUILD_ROOT}%{_datadir}/%{name}-management/bin
+# Setup Jetty
 ln -sf /etc/%{name}/management 
${RPM_BUILD_ROOT}%{_datadir}/%{name}-management/conf
-ln -sf /usr/share/tomcat/lib 
${RPM_BUILD_ROOT}%{_datadir}/%{name}-management/lib
 ln -sf /var/log/%{name}/management 
${RPM_BUILD_ROOT}%{_datadir}/%{name}-management/logs
-ln -sf /var/cache/%{name}/management/temp 
${RPM_BUILD_ROOT}%{_datadir}/%{name}-management/temp
-ln -sf /var/cache/%{name}/management/work 
${RPM_BUILD_ROOT}%{_datadir}/%{name}-management/work
-
-/bin/touch 
${RPM_BUILD_ROOT}%{_localstatedir}/log/%{name}/management/catalina.out
 
 install -D client/target/utilities/bin/cloud-migrate-databases 
${RPM_BUILD_ROOT}%{_bindir}/%{name}-migrate-databases
 install -D client/target/utilities/bin/cloud-set-guest-password 
${RPM_BUILD_ROOT}%{_bindir}/%{name}-set-guest-password
@@ -262,15 +252,18 @@ install -D client/target/utilities/bin/cloud-sysvmadm 
${RPM_BUILD_ROOT}%{_bindir
 install -D client/target/utilities/bin/cloud-update-xenserver-licenses 
${RPM_BUILD_ROOT}%{_bindir}/%{name}-update-xenserver-licenses
 
 cp -r client/target/utilities/scripts/db/* 
${RPM_BUILD_ROOT}%{_datadir}/%{name}-management/setup
-cp -r client/target/cloud-client-ui-%{_maventag}/* 
${RPM_BUILD_ROOT}%{_datadir}/%{name}-management/webapps/client
+cp -r client/target/cloud-client-ui-%{_maventag}.jar 
${RPM_BUILD_ROOT}%{_datadir}/%{name}-management/
+ln -s cloud-client-ui-%{_maventag}.jar 
${RPM_BUILD_ROOT}%{_datadir}/%{name}-management/cloud-management-server.jar
+cp client/target/bcprov-jdk15on-1.55.jar 
${RPM_BUILD_ROOT}%{_datadir}/%{name}-management/
+ln -s log4j-cloud.xml ${RPM_BUILD_ROOT}%{_datadir}/%{name}-management/log4j.xml
 
 # Don't package the scripts in the management webapp
 rm -rf 
${RPM_BUILD_ROOT}%{_datadir}/%{name}-management/webapps/client/WEB-INF/classes/scripts
 rm -rf 
${RPM_BUILD_ROOT}%{_datadir}/%{name}-management/webapps/client/WEB-INF/classes/vms
 
 for name in db.properties log4j-cloud.xml server7-nonssl.xml server7-ssl.xml \
-commons-logging.properties catalina.policy catalina.properties 
classpath.conf \
-tomcat-users.xml web.xml environment.properties 
java.security.ciphers
+commons-logging.properties classpath.conf \
+web.xml environment.properties java.security.ciphers
 do
   mv 
${RPM_BUILD_ROOT}%{_datadir}/%{name}-management/webapps/client/WEB-INF/classes/$name
 \
 ${RPM_BUILD_ROOT}%{_sysconfdir}/%{name}/management/$name
@@ -279,9 +272,6 @@ done
 ln -s %{_sysconfdir}/%{name}/management/log4j-cloud.xml \
 
${RPM_BUILD_ROOT}%{_datadir}/%{name}-management/webapps/client/WEB-INF/classes/log4j-cloud.xml
 
-mv 
${RPM_BUILD_ROOT}%{_datadir}/%{name}-management/webapps/client/WEB-INF/classes/context.xml
 \
-
${RPM_BUILD_ROOT}%{_sysconfdir}/%{name}/management/Catalina/localhost/client
-
 install python/bindir/cloud-external-ipallocator.py 
${RPM_BUILD_ROOT}%{_bindir}/%{name}-external-ipallocator.py
 install -D client/target/pythonlibs/jasypt-1.9.2.jar 
${RPM_BUILD_ROOT}%{_datadir}/%{name}-common/lib/jasypt-1.9.2.jar
 
@@ -291,12 +281,9 @@ install -D

[cloudstack] 03/03: packaging: refactor systemd scripts

2017-08-07 Thread bhaisaab

This is an automated email from the ASF dual-hosted git repository.

bhaisaab pushed a commit to branch CLOUDSTACK-10012
in repository https://gitbox.apache.org/repos/asf/cloudstack.git

commit 4f29cf1f3471779a558663587941651f337c885d
Author: Rohit Yadav 
AuthorDate: Mon Aug 7 16:43:52 2017 +0200

packaging: refactor systemd scripts

Signed-off-by: Rohit Yadav 
---
 debian/rules   |  4 +-
 packaging/systemd/cloudstack-management.default| 10 ++---
 .../systemd/cloudstack-management.default.ubuntu   | 50 --
 packaging/systemd/cloudstack-management.service| 15 +++
 .../systemd/cloudstack-management.service.ubuntu   | 40 -
 5 files changed, 14 insertions(+), 105 deletions(-)

diff --git a/debian/rules b/debian/rules
index 6fc10ad..b250650 100755
--- a/debian/rules
+++ b/debian/rules
@@ -99,8 +99,8 @@ override_dh_auto_install:
ln -s ../../../var/cache/$(PACKAGE)/management/work 
$(DESTDIR)/usr/share/$(PACKAGE)-management/work
 
install -d -m0755 debian/$(PACKAGE)-management/lib/systemd/system
-   install -m0644 packaging/systemd/$(PACKAGE)-management.service.ubuntu 
debian/$(PACKAGE)-management/lib/systemd/system/$(PACKAGE)-management.service
-   install -m0644 packaging/systemd/$(PACKAGE)-management.default.ubuntu 
$(DESTDIR)/$(SYSCONFDIR)/default/$(PACKAGE)-management
+   install -m0644 packaging/systemd/$(PACKAGE)-management.service 
debian/$(PACKAGE)-management/lib/systemd/system/$(PACKAGE)-management.service
+   install -m0644 packaging/systemd/$(PACKAGE)-management.default 
$(DESTDIR)/$(SYSCONFDIR)/default/$(PACKAGE)-management
 
# cloudstack-common
mkdir -p $(DESTDIR)/usr/share/$(PACKAGE)-common
diff --git a/packaging/systemd/cloudstack-management.default 
b/packaging/systemd/cloudstack-management.default
index 6e5fcf9..809cbde 100644
--- a/packaging/systemd/cloudstack-management.default
+++ b/packaging/systemd/cloudstack-management.default
@@ -27,14 +27,14 @@ CATALINA_HOME="/usr/share/cloudstack-management"
 JASPER_HOME="/usr/share/cloudstack-management"
 CATALINA_TMPDIR="/usr/share/cloudstack-management/temp"
 
-
+# Setup Java OPTS
 if [ -r "/etc/cloudstack/management/cloudmanagementserver.keystore" ] ; then
   JAVA_OPTS="-Djava.awt.headless=true -Dcom.sun.management.jmxremote=false 
-Xmx2g -XX:+HeapDumpOnOutOfMemoryError 
-XX:HeapDumpPath=/var/log/cloudstack/management/ -XX:PermSize=512M 
-XX:MaxPermSize=800m 
-Djavax.net.ssl.trustStore=/etc/cloudstack/management/cloudmanagementserver.keystore
 -Djavax.net.ssl.trustStorePassword=vmops.com "
 else
   JAVA_OPTS="-Djava.awt.headless=true -Dcom.sun.management.jmxremote=false 
-Xmx2g -XX:+HeapDumpOnOutOfMemoryError 
-XX:HeapDumpPath=/var/log/cloudstack/management/ -XX:PermSize=512M 
-XX:MaxPermSize=800m"
 fi
 
-TOMCAT_USER="cloud"
+CLOUDSTACK_USER="cloud"
 
 SECURITY_MANAGER="false"
 
@@ -42,8 +42,8 @@ SHUTDOWN_WAIT="30"
 
 SHUTDOWN_VERBOSE="false"
 
-# Set the TOMCAT_PID location
-CATALINA_PID="/var/run/cloudstack-management.pid"
+CLOUDSTACK_PID="/var/run/cloudstack-management.pid"
 
-CLASSPATH=/etc/cloudstack/management:/usr/share/cloudstack-common:/usr/share/cloudstack-management/setup
+CLASSPATH=/etc/cloudstack/management:/usr/share/cloudstack-common:/usr/share/cloudstack-management/setup:/usr/share/cloudstack-management:/usr/share/cloudstack-management/bcprov-jdk15on-1.55.jar:/usr/share/cloudstack-management/cloud-management-server.jar
 
+BOOTSTRAP_CLASS=org.apache.cloudstack.ServerDaemon
diff --git a/packaging/systemd/cloudstack-management.default.ubuntu 
b/packaging/systemd/cloudstack-management.default.ubuntu
deleted file mode 100644
index 0087495..000
--- a/packaging/systemd/cloudstack-management.default.ubuntu
+++ /dev/null
@@ -1,50 +0,0 @@
-# Licensed to the Apache Software Foundation (ASF) under one
-# or more contributor license agreements.  See the NOTICE file
-# distributed with this work for additional information
-# regarding copyright ownership.  The ASF licenses this file
-# to you under the Apache License, Version 2.0 (the
-# "License"); you may not use this file except in compliance
-# with the License.  You may obtain a copy of the License at
-#
-#   http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing,
-# software distributed under the License is distributed on an
-# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied.  See the License for the
-# specific language governing permissions and limitations
-# under the License.
-
-# Required for a tocmat cloned service
-SERVICE_NAME=cloudstack-management
-
-# Where your java installation lives
-#JAVA_HOME="/usr/lib/jvm/java"
-
-# Where your cloudstack-management installation lives
-CATALINA_BASE="/usr/share/cloudstack-management"
-CATALINA_HOME="/usr/share/cloudstack-management"

[cloudstack] branch CLOUDSTACK-10012 updated (4e9dcd1 -> 4f29cf1)

2017-08-07 Thread bhaisaab

This is an automated email from the ASF dual-hosted git repository.

bhaisaab pushed a change to branch CLOUDSTACK-10012
in repository https://gitbox.apache.org/repos/asf/cloudstack.git.


from 4e9dcd1  client: fix classpaths
 new 9a5df11  packaging: remove fedora packaging
 new d5bf6c0  centos7: fix centos7 spec
 new 4f29cf1  packaging: refactor systemd scripts

The 3 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "add" were already present in the repository and have only
been added to this reference.


Summary of changes:
 debian/rules   |   4 +-
 packaging/centos7/cloud.spec   |  41 +-
 packaging/fedora20/cloud-agent.rc  | 118 
 packaging/fedora20/cloud-ipallocator.rc|  96 ---
 packaging/fedora20/cloud-management.rc | 115 
 packaging/fedora20/cloud-management.sysconfig  |  23 -
 packaging/fedora20/cloud-usage.rc  | 156 -
 packaging/fedora20/cloud.spec  | 655 -
 packaging/fedora20/cloudstack-agent.te |  33 --
 packaging/fedora20/cloudstack-sccs |  20 -
 packaging/fedora20/replace.properties  |  59 --
 packaging/fedora20/tomcat.sh   |  18 -
 packaging/fedora21/cloud-agent.rc  | 118 
 packaging/fedora21/cloud-ipallocator.rc|  96 ---
 packaging/fedora21/cloud-management.rc | 115 
 packaging/fedora21/cloud-management.sysconfig  |  23 -
 packaging/fedora21/cloud-usage.rc  | 156 -
 packaging/fedora21/cloud.spec  | 655 -
 packaging/fedora21/cloudstack-agent.te |  33 --
 packaging/fedora21/cloudstack-sccs |  20 -
 packaging/fedora21/replace.properties  |  59 --
 packaging/fedora21/tomcat.sh   |  18 -
 packaging/systemd/cloudstack-management.default|  10 +-
 .../systemd/cloudstack-management.default.ubuntu   |  50 --
 packaging/systemd/cloudstack-management.service|  15 +-
 .../systemd/cloudstack-management.service.ubuntu   |  40 --
 26 files changed, 23 insertions(+), 2723 deletions(-)
 delete mode 100755 packaging/fedora20/cloud-agent.rc
 delete mode 100755 packaging/fedora20/cloud-ipallocator.rc
 delete mode 100755 packaging/fedora20/cloud-management.rc
 delete mode 100644 packaging/fedora20/cloud-management.sysconfig
 delete mode 100755 packaging/fedora20/cloud-usage.rc
 delete mode 100644 packaging/fedora20/cloud.spec
 delete mode 100644 packaging/fedora20/cloudstack-agent.te
 delete mode 100644 packaging/fedora20/cloudstack-sccs
 delete mode 100644 packaging/fedora20/replace.properties
 delete mode 100644 packaging/fedora20/tomcat.sh
 delete mode 100755 packaging/fedora21/cloud-agent.rc
 delete mode 100755 packaging/fedora21/cloud-ipallocator.rc
 delete mode 100755 packaging/fedora21/cloud-management.rc
 delete mode 100644 packaging/fedora21/cloud-management.sysconfig
 delete mode 100755 packaging/fedora21/cloud-usage.rc
 delete mode 100644 packaging/fedora21/cloud.spec
 delete mode 100644 packaging/fedora21/cloudstack-agent.te
 delete mode 100644 packaging/fedora21/cloudstack-sccs
 delete mode 100644 packaging/fedora21/replace.properties
 delete mode 100644 packaging/fedora21/tomcat.sh
 delete mode 100644 packaging/systemd/cloudstack-management.default.ubuntu
 delete mode 100644 packaging/systemd/cloudstack-management.service.ubuntu

-- 
To stop receiving notification emails like this one, please contact
['"commits@cloudstack.apache.org" '].

[GitHub] rhtyd commented on a change in pull request #2207: Embedded jetty inside shaded jar

2017-08-07 Thread git

rhtyd commented on a change in pull request #2207: Embedded jetty inside shaded 
jar
URL: https://github.com/apache/cloudstack/pull/2207#discussion_r131670158
 
 

 ##
 File path: packaging/debian/init/cloud-management
 ##
 @@ -103,30 +107,17 @@ if [ ! -f "$CATALINA_HOME/bin/bootstrap.jar" ]; then
 fi
 
 [ -f "$DAEMON" ] || exit 0
+[ -r "$UBER_JAR" ] || exit 0
+[ -d "$MANAGEMENT_CONFIG" ] || exit 0
 
-POLICY_CACHE="$CATALINA_BASE/work/catalina.policy"
-
-JAVA_OPTS="$JAVA_OPTS -Djava.endorsed.dirs=$CATALINA_HOME/endorsed 
-Dcatalina.base=$CATALINA_BASE -Dcatalina.home=$CATALINA_HOME 
-Djava.io.tmpdir=$JVM_TMP"
-
-# Set the JSP compiler if set in the tomcat6.default file
-if [ -n "$JSP_COMPILER" ]; then
-   JAVA_OPTS="$JAVA_OPTS -Dbuild.compiler=$JSP_COMPILER"
-fi
-
-if [ "$TOMCAT6_SECURITY" = "yes" ]; then
-   JAVA_OPTS="$JAVA_OPTS -Djava.security.manager 
-Djava.security.policy=$POLICY_CACHE"
-fi
+JAVA_OPTS="$JAVA_OPTS -Djava.io.tmpdir=$JVM_TMP"
 
-# Set juli LogManager if logging.properties is provided
-if [ -r "$CATALINA_BASE"/conf/logging.properties ]; then
-  JAVA_OPTS="$JAVA_OPTS 
"-Djava.util.logging.manager=org.apache.juli.ClassLoaderLogManager" 
"-Djava.util.logging.config.file="$CATALINA_BASE/conf/logging.properties"
+# Load extra arguments from java-opts.conf if any
+if [ -r "$MANAGEMENT_CONFIG/java-opts.conf" ]; then
+   JAVA_EXTRA_OPTS=$(cat $MANAGEMENT_CONFIG/java-opts.conf)
+   JAVA_OPTS="$JAVA_OPTS $JAVA_EXTRA_OPTS"
 
 Review comment:
   Nice
 

This is an automated message from the Apache Git Service.
To respond to the message, please log on GitHub and use the
URL above to go to the specific comment.
 
For queries about this service, please contact Infrastructure at:
us...@infra.apache.org


With regards,
Apache Git Services

[GitHub] rhtyd commented on issue #2207: Embedded jetty inside shaded jar

2017-08-07 Thread git

rhtyd commented on issue #2207: Embedded jetty inside shaded jar
URL: https://github.com/apache/cloudstack/pull/2207#issuecomment-320680234
 
 
   @marcaurele thanks, I started working on this PR based on your branch to fix 
the centos7 issues: https://github.com/apache/cloudstack/pull/2226 this is on 
ASF remote so any committer should be able to commit or send PRs.
 

This is an automated message from the Apache Git Service.
To respond to the message, please log on GitHub and use the
URL above to go to the specific comment.
 
For queries about this service, please contact Infrastructure at:
us...@infra.apache.org


With regards,
Apache Git Services

[GitHub] sgoeminn commented on a change in pull request #2223: CLOUDSTACK-10031: change default configuration for router.aggregation?

2017-08-07 Thread git

sgoeminn commented on a change in pull request #2223: CLOUDSTACK-10031: change 
default configuration for router.aggregation?
URL: https://github.com/apache/cloudstack/pull/2223#discussion_r131669559
 
 

 ##
 File path: setup/db/db/schema-430to440.sql
 ##
 @@ -788,7 +788,7 @@ ALTER TABLE `cloud`.`network_offerings` ADD COLUMN 
supports_streched_l2 boolean
 ALTER TABLE `cloud`.`networks` ADD COLUMN streched_l2 boolean default false;
 ALTER TABLE `cloud`.`vpc` ADD COLUMN region_level_vpc boolean default false;
 INSERT INTO `cloud`.`configuration`(category, instance, component, name, 
value, description, default_value) VALUES ('Advanced', 'DEFAULT', 
'NetworkOrchestrationService', 'router.redundant.vrrp.interval', '1', 'seconds 
between VRRP broadcast. It would 3 times broadcast fail to trigger fail-over 
mechanism of redundant router', '1') ON DUPLICATE KEY UPDATE 
category='Advanced';
-INSERT INTO `cloud`.`configuration`(category, instance, component, name, 
value, description, default_value) VALUES ('Advanced', 'DEFAULT', 
'NetworkOrchestrationService', 'router.aggregation.command.each.timeout', '3', 
'timeout in seconds for each Virtual Router command being aggregated. The final 
aggregation command timeout would be determined by this timeout * commands 
counts ', '3') ON DUPLICATE KEY UPDATE category='Advanced';
+INSERT INTO `cloud`.`configuration`(category, instance, component, name, 
value, description, default_value) VALUES ('Advanced', 'DEFAULT', 
'NetworkOrchestrationService', 'router.aggregation.command.each.timeout', 
'600', 'timeout in seconds for each Virtual Router command being aggregated. 
The final aggregation command timeout would be determined by this timeout * 
commands counts ', '600') ON DUPLICATE KEY UPDATE category='Advanced';
 
 Review comment:
   Thanks, I fixed it.
 

This is an automated message from the Apache Git Service.
To respond to the message, please log on GitHub and use the
URL above to go to the specific comment.
 
For queries about this service, please contact Infrastructure at:
us...@infra.apache.org


With regards,
Apache Git Services

[GitHub] marcaurele commented on issue #2207: Embedded jetty inside shaded jar

2017-08-07 Thread git

marcaurele commented on issue #2207: Embedded jetty inside shaded jar
URL: https://github.com/apache/cloudstack/pull/2207#issuecomment-320668587
 
 
   There should be an option to let maintainer edit a PR (on github), so I 
guess the content of it too. But it does not seem to be active on the 
repository 
(https://help.github.com/articles/allowing-changes-to-a-pull-request-branch-created-from-a-fork/)
 

This is an automated message from the Apache Git Service.
To respond to the message, please log on GitHub and use the
URL above to go to the specific comment.
 
For queries about this service, please contact Infrastructure at:
us...@infra.apache.org


With regards,
Apache Git Services

[cloudstack] branch CLOUDSTACK-10012 updated: client: fix classpaths

2017-08-07 Thread bhaisaab

This is an automated email from the ASF dual-hosted git repository.

bhaisaab pushed a commit to branch CLOUDSTACK-10012
in repository https://gitbox.apache.org/repos/asf/cloudstack.git


The following commit(s) were added to refs/heads/CLOUDSTACK-10012 by this push:
 new 4e9dcd1  client: fix classpaths
4e9dcd1 is described below

commit 4e9dcd1bec788cda34d52e0cffb1877088363764
Author: Rohit Yadav 
AuthorDate: Mon Aug 7 15:47:23 2017 +0200

client: fix classpaths

Signed-off-by: Rohit Yadav 
---
 client/pom.xml | 7 +++
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/client/pom.xml b/client/pom.xml
index 9b0df82..07d5df5 100644
--- a/client/pom.xml
+++ b/client/pom.xml
@@ -566,13 +566,12 @@
   6
 
   
-  
${project.build.directory}/generated-webapp/WEB-INF/web.xml
-  
${project.build.directory}/generated-webapp
+  
${project.build.directory}/classes/META-INF/webapp/WEB-INF/web.xml
+  
${project.build.directory}/classes/META-INF/webapp/
   
 /client
-
${project.build.directory}/utilities/scripts/db/;${project.build.directory}/utilities/scripts/db/db/
+
${project.build.directory}/conf/;${project.build.directory}/utilities/scripts/db/;${project.build.directory}/utilities/scripts/db/db/
   
-  
   
   
  log4j.configuration

-- 
To stop receiving notification emails like this one, please contact
['"commits@cloudstack.apache.org" '].

[GitHub] marcaurele commented on a change in pull request #2207: Embedded jetty inside shaded jar

2017-08-07 Thread git

marcaurele commented on a change in pull request #2207: Embedded jetty inside 
shaded jar
URL: https://github.com/apache/cloudstack/pull/2207#discussion_r131658140
 
 

 ##
 File path: packaging/debian/init/cloud-management
 ##
 @@ -103,30 +107,17 @@ if [ ! -f "$CATALINA_HOME/bin/bootstrap.jar" ]; then
 fi
 
 [ -f "$DAEMON" ] || exit 0
+[ -r "$UBER_JAR" ] || exit 0
+[ -d "$MANAGEMENT_CONFIG" ] || exit 0
 
-POLICY_CACHE="$CATALINA_BASE/work/catalina.policy"
-
-JAVA_OPTS="$JAVA_OPTS -Djava.endorsed.dirs=$CATALINA_HOME/endorsed 
-Dcatalina.base=$CATALINA_BASE -Dcatalina.home=$CATALINA_HOME 
-Djava.io.tmpdir=$JVM_TMP"
-
-# Set the JSP compiler if set in the tomcat6.default file
-if [ -n "$JSP_COMPILER" ]; then
-   JAVA_OPTS="$JAVA_OPTS -Dbuild.compiler=$JSP_COMPILER"
-fi
-
-if [ "$TOMCAT6_SECURITY" = "yes" ]; then
-   JAVA_OPTS="$JAVA_OPTS -Djava.security.manager 
-Djava.security.policy=$POLICY_CACHE"
-fi
+JAVA_OPTS="$JAVA_OPTS -Djava.io.tmpdir=$JVM_TMP"
 
-# Set juli LogManager if logging.properties is provided
-if [ -r "$CATALINA_BASE"/conf/logging.properties ]; then
-  JAVA_OPTS="$JAVA_OPTS 
"-Djava.util.logging.manager=org.apache.juli.ClassLoaderLogManager" 
"-Djava.util.logging.config.file="$CATALINA_BASE/conf/logging.properties"
+# Load extra arguments from java-opts.conf if any
+if [ -r "$MANAGEMENT_CONFIG/java-opts.conf" ]; then
+   JAVA_EXTRA_OPTS=$(cat $MANAGEMENT_CONFIG/java-opts.conf)
+   JAVA_OPTS="$JAVA_OPTS $JAVA_EXTRA_OPTS"
 
 Review comment:
   @rhtyd there's the inclusion of a java-opts.conf file if present that helps 
to add extra parameters to the classpath, like extra JARs, extra config 
directories, JMX...
 

This is an automated message from the Apache Git Service.
To respond to the message, please log on GitHub and use the
URL above to go to the specific comment.
 
For queries about this service, please contact Infrastructure at:
us...@infra.apache.org


With regards,
Apache Git Services

[GitHub] marcaurele commented on issue #2207: Embedded jetty inside shaded jar

2017-08-07 Thread git

marcaurele commented on issue #2207: Embedded jetty inside shaded jar
URL: https://github.com/apache/cloudstack/pull/2207#issuecomment-320667081
 
 
   Even if it looks like a fat/uber jar, the startup script still runs it as a 
normal multi jar. If you really want, you could have a single jar. Due to 
bouncycastle and the JCE signature check, it is not possible to run it as a 
single jar.
   
   To start it, I use:
   ```
   # normal start
   java -Dlog4j.configuration=log4j-cloud.xml -cp 
"client/target/conf:client/target/bcprov-jdk15on-1.55.jar:client/target/cloud-client-ui-X.X.X.X-SNAPSHOT.jar"
 org.apache.cloudstack.ServerDaemon
   
   # with remote debug for example and specifying a port for Jetty
   java -Xdebug -Xnoagent 
-Xrunjdwp:transport=dt_socket,address=8787,server=y,suspend=n 
-Djava.net.preferIPv4Stack=true -Dlog4j.configuration=log4j-cloud.xml 
-Djetty.port=8080 -cp 
"client/target/conf:client/target/bcprov-jdk15on-1.55.jar:client/target/cloud-client-ui-X.X.X.X-SNAPSHOT.jar"
 org.apache.cloudstack.ServerDaemon
   ```
 

This is an automated message from the Apache Git Service.
To respond to the message, please log on GitHub and use the
URL above to go to the specific comment.
 
For queries about this service, please contact Infrastructure at:
us...@infra.apache.org


With regards,
Apache Git Services

[GitHub] vedulasantosh commented on issue #2153: CLOUDSTACK-9956 File search on the vmware datastore may select wrong file if there are multiple files with same name.

2017-08-07 Thread git

vedulasantosh commented on issue #2153: CLOUDSTACK-9956 File search on the 
vmware datastore may select wrong file if there are multiple files with same 
name.
URL: https://github.com/apache/cloudstack/pull/2153#issuecomment-320658751
 
 
   Tested LGTM. while doing Volume operations like 
attach/detach,download,snapshot it taking vmdk files from the correct folders 
but not from excluded folders setted in global 
configuration(vmware.search.exclude.folders).
 

This is an automated message from the Apache Git Service.
To respond to the message, please log on GitHub and use the
URL above to go to the specific comment.
 
For queries about this service, please contact Infrastructure at:
us...@infra.apache.org


With regards,
Apache Git Services

[GitHub] rhtyd commented on issue #2207: Embedded jetty inside shaded jar

2017-08-07 Thread git

rhtyd commented on issue #2207: Embedded jetty inside shaded jar
URL: https://github.com/apache/cloudstack/pull/2207#issuecomment-320651759
 
 
   @marcaurele with the above fix I could get the build to work, however can 
you share how would you run the management server both using mvn and scripts? 
I'm unable to get it to work.
 

This is an automated message from the Apache Git Service.
To respond to the message, please log on GitHub and use the
URL above to go to the specific comment.
 
For queries about this service, please contact Infrastructure at:
us...@infra.apache.org


With regards,
Apache Git Services

[GitHub] borisstoyanov commented on issue #2225: [master] Smoketest health checkrun

2017-08-07 Thread git

borisstoyanov commented on issue #2225: [master] Smoketest health checkrun
URL: https://github.com/apache/cloudstack/pull/2225#issuecomment-320646830
 
 
   @rhtyd regarding test_nic.py failure we get the same error: 
   ```Resource [Host:2] is unreachable: Host 2: Unable to start instance due to 
Unable to start  VM:68a22e6f-beb3-472e-967e-2ea41ace9d50 due to error in 
finalizeStart, not retrying'}, accountid : 
u'2fabd7d5-7a9a-11e7-8c7f-06feba010709'}\n"]```
   maybe the bug is not in the reverted changes
 

This is an automated message from the Apache Git Service.
To respond to the message, please log on GitHub and use the
URL above to go to the specific comment.
 
For queries about this service, please contact Infrastructure at:
us...@infra.apache.org


With regards,
Apache Git Services

[GitHub] blueorangutan commented on issue #2226: CLOUDSTACK-10012: Towards CloudStack fat jar

2017-08-07 Thread git

blueorangutan commented on issue #2226: CLOUDSTACK-10012: Towards CloudStack 
fat jar
URL: https://github.com/apache/cloudstack/pull/2226#issuecomment-320646288
 
 
   @rhtyd a Trillian-Jenkins test job (ubuntu mgmt + kvm-ubuntu) has been 
kicked to run smoke tests
 

This is an automated message from the Apache Git Service.
To respond to the message, please log on GitHub and use the
URL above to go to the specific comment.
 
For queries about this service, please contact Infrastructure at:
us...@infra.apache.org


With regards,
Apache Git Services

[GitHub] rhtyd commented on issue #2226: CLOUDSTACK-10012: Towards CloudStack fat jar

2017-08-07 Thread git

rhtyd commented on issue #2226: CLOUDSTACK-10012: Towards CloudStack fat jar
URL: https://github.com/apache/cloudstack/pull/2226#issuecomment-320646127
 
 
   @blueorangutan test ubuntu kvm-ubuntu 
 

This is an automated message from the Apache Git Service.
To respond to the message, please log on GitHub and use the
URL above to go to the specific comment.
 
For queries about this service, please contact Infrastructure at:
us...@infra.apache.org


With regards,
Apache Git Services

[GitHub] rhtyd commented on issue #2226: CLOUDSTACK-10012: Towards CloudStack fat jar

2017-08-07 Thread git

rhtyd commented on issue #2226: CLOUDSTACK-10012: Towards CloudStack fat jar
URL: https://github.com/apache/cloudstack/pull/2226#issuecomment-320646074
 
 
   @blueorangutan ubuntu kvm-ubuntu
 

This is an automated message from the Apache Git Service.
To respond to the message, please log on GitHub and use the
URL above to go to the specific comment.
 
For queries about this service, please contact Infrastructure at:
us...@infra.apache.org


With regards,
Apache Git Services

[GitHub] rhtyd commented on issue #2226: CLOUDSTACK-10012: Towards CloudStack fat jar

2017-08-07 Thread git

rhtyd commented on issue #2226: CLOUDSTACK-10012: Towards CloudStack fat jar
URL: https://github.com/apache/cloudstack/pull/2226#issuecomment-320646074
 
 
   @blueorangutan ubuntu kvm-ubuntu
 

This is an automated message from the Apache Git Service.
To respond to the message, please log on GitHub and use the
URL above to go to the specific comment.
 
For queries about this service, please contact Infrastructure at:
us...@infra.apache.org


With regards,
Apache Git Services

[GitHub] blueorangutan commented on issue #2226: CLOUDSTACK-10012: Towards CloudStack fat jar

2017-08-07 Thread git

blueorangutan commented on issue #2226: CLOUDSTACK-10012: Towards CloudStack 
fat jar
URL: https://github.com/apache/cloudstack/pull/2226#issuecomment-320645567
 
 
   Packaging result: ?centos6 ?centos7 ?debian. JID-927
 

This is an automated message from the Apache Git Service.
To respond to the message, please log on GitHub and use the
URL above to go to the specific comment.
 
For queries about this service, please contact Infrastructure at:
us...@infra.apache.org


With regards,
Apache Git Services

[GitHub] blueorangutan commented on issue #2226: CLOUDSTACK-10012: Towards CloudStack fat jar

2017-08-07 Thread git

blueorangutan commented on issue #2226: CLOUDSTACK-10012: Towards CloudStack 
fat jar
URL: https://github.com/apache/cloudstack/pull/2226#issuecomment-320638760
 
 
   @rhtyd a Jenkins job has been kicked to build packages. I'll keep you posted 
as I make progress.
 

This is an automated message from the Apache Git Service.
To respond to the message, please log on GitHub and use the
URL above to go to the specific comment.
 
For queries about this service, please contact Infrastructure at:
us...@infra.apache.org


With regards,
Apache Git Services

[GitHub] rhtyd opened a new pull request #2226: CLOUDSTACK-10012: Towards CloudStack fat jar

2017-08-07 Thread git

rhtyd opened a new pull request #2226: CLOUDSTACK-10012: Towards CloudStack fat 
jar
URL: https://github.com/apache/cloudstack/pull/2226
 
 
   From https://github.com/apache/cloudstack/pull/2207
   I've moved the branch to ASF remote to allow cross-collaboration between ACS 
committers. Feel free to discuss and push your changes in this branch.
   
   @blueorangutan package
 

This is an automated message from the Apache Git Service.
To respond to the message, please log on GitHub and use the
URL above to go to the specific comment.
 
For queries about this service, please contact Infrastructure at:
us...@infra.apache.org


With regards,
Apache Git Services

[cloudstack] 02/05: Modify cloudtack-amanement init with uber jar startup

2017-08-07 Thread bhaisaab

This is an automated email from the ASF dual-hosted git repository.

bhaisaab pushed a commit to branch CLOUDSTACK-10012
in repository https://gitbox.apache.org/repos/asf/cloudstack.git

commit f7cc6300b8add1227f1dea76e07d19337c66fa31
Author: Marc-Aurèle Brothier 
AuthorDate: Mon Jul 31 08:11:37 2017 +0200

Modify cloudtack-amanement init with uber jar startup
---
 packaging/debian/init/cloud-management | 111 +++--
 1 file changed, 36 insertions(+), 75 deletions(-)

diff --git a/packaging/debian/init/cloud-management 
b/packaging/debian/init/cloud-management
index 05c38be..a1d64a8 100755
--- a/packaging/debian/init/cloud-management
+++ b/packaging/debian/init/cloud-management
@@ -34,9 +34,16 @@ PATH=/bin:/usr/bin:/sbin:/usr/sbin
 NAME=cloudstack-management
 DESC="CloudStack-specific Tomcat servlet engine"
 DAEMON=/usr/bin/jsvc
-CATALINA_HOME=/usr/share/cloudstack-management
-DEFAULT=/etc/cloudstack/management/tomcat6.conf
+MANAGEMENT_HOME=/usr/share/$NAME
+MANAGEMENT_CONFIG="/etc/cloudstack/management"
 JVM_TMP=/tmp/$NAME-temp
+USER="cloud"
+GROUP="cloud"
+UBER_JAR="$MANAGEMENT_HOME/cloud-management-server.jar"
+BOOTSTRAP_CLASS="org.apache.cloudstack.ServerDaemon"
+MANAGEMENT_PID="/var/run/$NAME.pid"
+JSVC_CLASSPATH="/usr/share/java/commons-daemon.jar:$MANAGEMENT_HOME/bcprov-jdk15on-1.55.jar:$MANAGEMENT_CONFIG:/usr/share/$NAME/setup:$MANAGEMENT_HOME:$UBER_JAR"
+
 
 # We have to explicitly set the HOME variable to the homedir from the user 
"cloud"
 # This is because various scripts run by the management server read the HOME 
variable
@@ -60,9 +67,6 @@ fi
 
 # The following variables can be overwritten in $DEFAULT
 
-# Run Tomcat 6 as this user ID
-TOMCAT6_USER=tomcat6
-
 # The first existing directory is used for JAVA_HOME (if JAVA_HOME is not
 # defined in $DEFAULT)
 JDK_DIRS="/usr/lib/jvm/java-8-openjdk-amd64 /usr/lib/jvm/java-8-openjdk-i386 
/usr/lib/jvm/java-8-oracle /usr/lib/jvm/java-8-openjdk"
@@ -70,7 +74,7 @@ JDK_DIRS="/usr/lib/jvm/java-8-openjdk-amd64 
/usr/lib/jvm/java-8-openjdk-i386 /us
 # Look for the right JVM to use
 for jdir in $JDK_DIRS; do
 if [ -r "$jdir/bin/java" -a -z "${JAVA_HOME}" ]; then
-   JAVA_HOME="$jdir"
+JAVA_HOME="$jdir"
 fi
 done
 export JAVA_HOME
@@ -103,30 +107,17 @@ if [ ! -f "$CATALINA_HOME/bin/bootstrap.jar" ]; then
 fi
 
 [ -f "$DAEMON" ] || exit 0
+[ -r "$UBER_JAR" ] || exit 0
+[ -d "$MANAGEMENT_CONFIG" ] || exit 0
 
-POLICY_CACHE="$CATALINA_BASE/work/catalina.policy"
-
-JAVA_OPTS="$JAVA_OPTS -Djava.endorsed.dirs=$CATALINA_HOME/endorsed 
-Dcatalina.base=$CATALINA_BASE -Dcatalina.home=$CATALINA_HOME 
-Djava.io.tmpdir=$JVM_TMP"
-
-# Set the JSP compiler if set in the tomcat6.default file
-if [ -n "$JSP_COMPILER" ]; then
-   JAVA_OPTS="$JAVA_OPTS -Dbuild.compiler=$JSP_COMPILER"
-fi
-
-if [ "$TOMCAT6_SECURITY" = "yes" ]; then
-   JAVA_OPTS="$JAVA_OPTS -Djava.security.manager 
-Djava.security.policy=$POLICY_CACHE"
-fi
+JAVA_OPTS="$JAVA_OPTS -Djava.io.tmpdir=$JVM_TMP"
 
-# Set juli LogManager if logging.properties is provided
-if [ -r "$CATALINA_BASE"/conf/logging.properties ]; then
-  JAVA_OPTS="$JAVA_OPTS 
"-Djava.util.logging.manager=org.apache.juli.ClassLoaderLogManager" 
"-Djava.util.logging.config.file="$CATALINA_BASE/conf/logging.properties"
+# Load extra arguments from java-opts.conf if any
+if [ -r "$MANAGEMENT_CONFIG/java-opts.conf" ]; then
+   JAVA_EXTRA_OPTS=$(cat $MANAGEMENT_CONFIG/java-opts.conf)
+   JAVA_OPTS="$JAVA_OPTS $JAVA_EXTRA_OPTS"
 fi
 
-# Define other required variables
-CATALINA_PID="/var/run/$NAME.pid"
-BOOTSTRAP_CLASS=org.apache.catalina.startup.Bootstrap
-JSVC_CLASSPATH="/usr/share/java/commons-daemon.jar:$CATALINA_HOME/bin/bootstrap.jar:/etc/cloudstack/management:/usr/share/cloudstack-management/setup"
-
 # Look for Java Secure Sockets Extension (JSSE) JARs
 if [ -z "${JSSE_HOME}" -a -r "${JAVA_HOME}/jre/lib/jsse.jar" ]; then
 JSSE_HOME="${JAVA_HOME}/jre/"
@@ -140,25 +131,9 @@ case "$1" in
exit 1
fi
 
-   if [ ! -d "$CATALINA_BASE/conf" ]; then
-   log_failure_msg "invalid CATALINA_BASE: $CATALINA_BASE"
-   exit 1
-   fi
-
log_daemon_msg "Starting $DESC" "$NAME"
-   if start-stop-daemon --test --start --pidfile "$CATALINA_PID" \
-   --user $TOMCAT6_USER --startas "$JAVA_HOME/bin/java" \
-   >/dev/null; then
-
-   # Regenerate POLICY_CACHE file
-   umask 022
-   echo "// AUTO-GENERATED FILE from /etc/tomcat6/policy.d/" \
-   > "$POLICY_CACHE"
-   echo ""  >> "$POLICY_CACHE"
-   if ls $CATALINA_BASE/conf/policy.d/*.policy > /dev/null 2>&1 ; 
then
-   cat $CATALINA_BASE/conf/policy.d/*.policy \
-   >> "$POLICY_CACHE"
-   fi
+   if start-stop-daemon --test --start --quiet --pidfile "$MANAGEMENT_PID" 
\
+   --user $USER --startas

[cloudstack] 03/05: Remove dependency on tomcat, modify installation script for debian

2017-08-07 Thread bhaisaab

This is an automated email from the ASF dual-hosted git repository.

bhaisaab pushed a commit to branch CLOUDSTACK-10012
in repository https://gitbox.apache.org/repos/asf/cloudstack.git

commit 4b5531fcc8929e96415bff7631bf83d1cc369841
Author: Marc-Aurèle Brothier 
AuthorDate: Mon Jul 31 08:18:43 2017 +0200

Remove dependency on tomcat, modify installation script for debian
---
 debian/cloudstack-management.install  | 13 -
 debian/cloudstack-management.postinst | 20 
 debian/control|  2 +-
 debian/rules  | 10 ++
 4 files changed, 7 insertions(+), 38 deletions(-)

diff --git a/debian/cloudstack-management.install 
b/debian/cloudstack-management.install
index 9c3f04e..353813d 100644
--- a/debian/cloudstack-management.install
+++ b/debian/cloudstack-management.install
@@ -15,25 +15,12 @@
 # specific language governing permissions and limitations
 # under the License.
 
-/etc/cloudstack/management/catalina.policy
-/etc/cloudstack/management/catalina.properties
-/etc/cloudstack/management/logging.properties
 /etc/cloudstack/management/ehcache.xml
-/etc/cloudstack/management/server-ssl.xml
-/etc/cloudstack/management/server-nonssl.xml
-/etc/cloudstack/management/server7-ssl.xml
-/etc/cloudstack/management/server7-nonssl.xml
-/etc/cloudstack/management/classpath.conf
 /etc/cloudstack/management/db.properties
-/etc/cloudstack/management/tomcat6-ssl.conf
-/etc/cloudstack/management/tomcat6-nonssl.conf
-/etc/cloudstack/management/tomcat6.conf
 /etc/cloudstack/management/web.xml
 /etc/cloudstack/management/environment.properties
 /etc/cloudstack/management/java.security.ciphers
 /etc/cloudstack/management/log4j-cloud.xml
-/etc/cloudstack/management/tomcat-users.xml
-/etc/cloudstack/management/context.xml
 /etc/default/cloudstack-management
 /etc/init.d/cloudstack-management
 /etc/security/limits.d/cloudstack-limits.conf
diff --git a/debian/cloudstack-management.postinst 
b/debian/cloudstack-management.postinst
index 240224d..0891f70 100644
--- a/debian/cloudstack-management.postinst
+++ b/debian/cloudstack-management.postinst
@@ -61,26 +61,6 @@ if [ "$1" = configure ]; then
 chmod 0640 ${CONFDIR}/${DBPROPS}
 chgrp cloud ${CONFDIR}/${DBPROPS}
 
-if [ -d "/usr/share/tomcat7" ]; then
-rm -f /usr/share/cloudstack-management/bin
-rm -f /usr/share/cloudstack-management/lib
-ln -s /usr/share/tomcat7/bin /usr/share/cloudstack-management/bin
-ln -s /usr/share/tomcat7/lib /usr/share/cloudstack-management/lib
-invoke-rc.d tomcat7 stop || true
-if [ ! -f "/etc/cloudstack/management/server.xml" ]; then
-ln -s /etc/cloudstack/management/server7-nonssl.xml 
/etc/cloudstack/management/server.xml
-fi
-elif [ -d "/usr/share/tomcat6" ]; then
-rm -f /usr/share/cloudstack-management/bin
-rm -f /usr/share/cloudstack-management/lib
-ln -s /usr/share/tomcat6/bin /usr/share/cloudstack-management/bin
-ln -s /usr/share/tomcat6/lib /usr/share/cloudstack-management/lib
-invoke-rc.d tomcat6 stop || true
-if [ ! -f "/etc/cloudstack/management/server.xml" ]; then
-ln -s /etc/cloudstack/management/server-nonssl.xml 
/etc/cloudstack/management/server.xml
-fi
-fi
-
 # Add jdbc MySQL driver settings to db.properties if not present
 grep -s -q "db.cloud.driver=jdbc:mysql" ${CONFDIR}/${DBPROPS} || sed -i -e 
"\$adb.cloud.driver=jdbc:mysql" ${CONFDIR}/${DBPROPS}
 grep -s -q "db.usage.driver=jdbc:mysql" ${CONFDIR}/${DBPROPS} || sed -i -e 
"\$adb.usage.driver=jdbc:mysql" ${CONFDIR}/${DBPROPS}
diff --git a/debian/control b/debian/control
index f402325..971b0a8 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: ${python:Depends}, openjdk-8-jre-headless | java8-runtime-headless | 
java8-runtime | openjdk-7-jre-headless, cloudstack-common (= 
${source:Version}), tomcat6 | tomcat7, sudo, jsvc, python-mysql.connector, 
libmysql-java, augeas-tools, mysql-client, adduser, bzip2, ipmitool, 
lsb-release, init-system-helpers (>= 1.14~)
+Depends: ${python:Depends}, openjdk-8-jre-headless | java8-runtime-headless | 
java8-runtime | openjdk-7-jre-headless, cloudstack-common (= 
${source:Version}), sudo, jsvc, python-mysql.connector, libmysql-java, 
augeas-tools, mysql-client, adduser, bzip2, ipmitool, lsb-release, 
init-system-helpers (>= 1.14~)
 Conflicts: cloud-server, cloud-client, cloud-client-ui
 Description: CloudStack server library
  The CloudStack management server
diff --git a/debian/rules b/debian/rules
index 82a40239..6fc10ad 100755
--- a/debian/rules
+++ b/debian/rules
@@ -66,7 +66,6 @@ override_dh_auto_install:
mkdir -p $(DESTDIR)/$(SYSCONFDIR)/security/limits.d/
mkdir -p $(DESTDIR)/$(SYSCONFDIR)/sudoers.d/

[cloudstack] branch CLOUDSTACK-10012 created (now a448241)

2017-08-07 Thread bhaisaab

This is an automated email from the ASF dual-hosted git repository.

bhaisaab pushed a change to branch CLOUDSTACK-10012
in repository https://gitbox.apache.org/repos/asf/cloudstack.git.


  at a448241  apidoc: Fix regressions, use fatjar instead of path

This branch includes the following new commits:

 new 8abc75f  Inception for backport jetty embedded with shaded jar
 new f7cc630  Modify cloudtack-amanement init with uber jar startup
 new 4b5531f  Remove dependency on tomcat, modify installation script for 
debian
 new c5d8167  Add jetty dependencies version 9.2 (java 7+)
 new a448241  apidoc: Fix regressions, use fatjar instead of path

The 5 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "add" were already present in the repository and have only
been added to this reference.


-- 
To stop receiving notification emails like this one, please contact
['"commits@cloudstack.apache.org" '].

[cloudstack] 01/05: Inception for backport jetty embedded with shaded jar

2017-08-07 Thread bhaisaab

This is an automated email from the ASF dual-hosted git repository.

bhaisaab pushed a commit to branch CLOUDSTACK-10012
in repository https://gitbox.apache.org/repos/asf/cloudstack.git

commit 8abc75f2f50a02d0b7c2a8279d349c8da86391fd
Author: Marc-Aurèle Brothier 
AuthorDate: Fri Jul 28 08:17:56 2017 +0200

Inception for backport jetty embedded with shaded jar
---
 client/pom.xml | 233 -
 client/src/org/apache/cloudstack/ServerDaemon.java | 205 ++
 2 files changed, 381 insertions(+), 57 deletions(-)

diff --git a/client/pom.xml b/client/pom.xml
index 9b8fa38..9b0df82 100644
--- a/client/pom.xml
+++ b/client/pom.xml
@@ -13,7 +13,7 @@
   4.0.0
   cloud-client-ui
   Apache CloudStack Client UI
-  war
+  jar
   
 org.apache.cloudstack
 cloudstack
@@ -29,184 +29,257 @@
 
   
 
+  javax.servlet
+  javax.servlet-api
+
+
+  org.eclipse.jetty
+  jetty-server
+
+
+  org.eclipse.jetty
+  jetty-servlet
+
+
+  org.eclipse.jetty
+  jetty-servlets
+
+
+  org.eclipse.jetty
+  jetty-jmx
+
+
+  org.eclipse.jetty
+  jetty-util
+
+
+  org.eclipse.jetty
+  jetty-webapp
+
+
+  org.eclipse.jetty
+  jetty-annotations
+
+
+  mysql
+  mysql-connector-java
+  runtime
+
+
   org.apache.cloudstack
   cloud-framework-spring-module
   ${project.version}
+  runtime
 
 
   org.apache.cloudstack
   cloud-framework-spring-lifecycle
   ${project.version}
+  runtime
 
 
   org.apache.cloudstack
   cloud-plugin-storage-volume-solidfire
   ${project.version}
+  runtime
 
 
   org.apache.cloudstack
   cloud-plugin-storage-volume-cloudbyte
   ${project.version}
+  runtime
 
 
   org.apache.cloudstack
   cloud-server
   ${project.version}
+  runtime
 
 
   org.apache.cloudstack
   cloud-plugin-acl-static-role-based
   ${project.version}
+  runtime
 
 
   org.apache.cloudstack
   cloud-plugin-acl-dynamic-role-based
   ${project.version}
+  runtime
 
 
   org.apache.cloudstack
   cloud-plugin-dedicated-resources
   ${project.version}
+  runtime
 
 
   org.apache.cloudstack
   cloud-plugin-api-limit-account-based
   ${project.version}
+  runtime
 
 
   org.apache.cloudstack
   cloud-plugin-api-discovery
   ${project.version}
+  runtime
 
 
   org.apache.cloudstack
   cloud-plugin-user-authenticator-ldap
   ${project.version}
+  runtime
 
 
   org.apache.cloudstack
   cloud-plugin-user-authenticator-md5
   ${project.version}
+  runtime
 
 
   org.apache.cloudstack
   cloud-plugin-user-authenticator-pbkdf2
   ${project.version}
+  runtime
 
 
   org.apache.cloudstack
   cloud-plugin-user-authenticator-plaintext
   ${project.version}
+  runtime
 
 
   org.apache.cloudstack
   cloud-plugin-user-authenticator-saml2
   ${project.version}
+  runtime
 
 
   org.apache.cloudstack
   cloud-plugin-user-authenticator-sha256salted
   ${project.version}
+  runtime
 
 
   org.apache.cloudstack
   cloud-plugin-metrics
   ${project.version}
+  runtime
 
 
   org.apache.cloudstack
   cloud-plugin-network-nvp
   ${project.version}
+  runtime
 
 
   org.apache.cloudstack
   cloud-plugin-network-contrail
   ${project.version}
+  runtime
 
 
   org.apache.cloudstack
   cloud-plugin-network-palo-alto
   ${project.version}
+  runtime
 
 
   org.apache.cloudstack
   cloud-plugin-network-netscaler
   ${project.version}
+  runtime
 
 
-  org.apache.cloudstack
+org.apache.cloudstack
   cloud-plugin-network-ovs
   ${project.version}
+  runtime
 
 
   org.apache.cloudstack
   cloud-plugin-network-elb
   ${project.version}
+  runtime
 
 
   org.apache.cloudstack
   cloud-plugin-network-bigswitch
   ${project.version}
+  runtime
 
 
   org.apache.cloudstack
   cloud-plugin-network-ssp
   ${project.version}
+  runtime
 
 
   org.apache.cloudstack
   cloud-plugin-network-internallb
   ${project.version}
+  runtime
 
 
   org.apache.cloudstack
   cloud-plugin-network-vxlan
   ${project.version}
+  runtime
 
 
   org.apache.cloudstack
   cloud-plugin-network-opendaylight
   ${project.version}
+  runtime
 
 
   org.apache.cloudstack
   cloud-plugin-network-vcs
   ${project.version}
+  runtime
 
 
   org.apache.cloudstack

[cloudstack] 04/05: Add jetty dependencies version 9.2 (java 7+)

2017-08-07 Thread bhaisaab

This is an automated email from the ASF dual-hosted git repository.

bhaisaab pushed a commit to branch CLOUDSTACK-10012
in repository https://gitbox.apache.org/repos/asf/cloudstack.git

commit c5d81679c8b011f86363eadd6266596510f75f3a
Author: Marc-Aurèle Brothier 
AuthorDate: Mon Jul 31 09:41:09 2017 +0200

Add jetty dependencies version 9.2 (java 7+)
---
 pom.xml | 36 
 1 file changed, 36 insertions(+)

diff --git a/pom.xml b/pom.xml
index edfd649..b3fea69 100644
--- a/pom.xml
+++ b/pom.xml
@@ -124,6 +124,7 @@
 3.1.4
 2.4.7
 10.1
+9.2.22.v20170606
   
 
   
@@ -474,6 +475,41 @@
 slf4j-log4j12
 1.7.22
   
+  
+org.eclipse.jetty
+jetty-server
+${cs.jetty.version}
+  
+  
+org.eclipse.jetty
+jetty-servlet
+${cs.jetty.version}
+  
+  
+org.eclipse.jetty
+jetty-servlets
+${cs.jetty.version}
+  
+  
+org.eclipse.jetty
+jetty-webapp
+${cs.jetty.version}
+  
+  
+org.eclipse.jetty
+jetty-jmx
+${cs.jetty.version}
+  
+  
+org.eclipse.jetty
+jetty-util
+${cs.jetty.version}
+  
+  
+org.eclipse.jetty
+jetty-annotations
+${cs.jetty.version}
+  
 
   
 

-- 
To stop receiving notification emails like this one, please contact
"commits@cloudstack.apache.org" .

[cloudstack] 05/05: apidoc: Fix regressions, use fatjar instead of path

2017-08-07 Thread bhaisaab

This is an automated email from the ASF dual-hosted git repository.

bhaisaab pushed a commit to branch CLOUDSTACK-10012
in repository https://gitbox.apache.org/repos/asf/cloudstack.git

commit a4482417c637a5263209b10d4e07c56a617c9735
Author: Rohit Yadav 
AuthorDate: Mon Aug 7 13:24:08 2017 +0200

apidoc: Fix regressions, use fatjar instead of path

Signed-off-by: Rohit Yadav 
---
 pom.xml  | 3 +--
 tools/apidoc/build-apidoc.sh | 2 +-
 tools/apidoc/gen_toc.py  | 3 ++-
 tools/apidoc/pom.xml | 4 ++--
 4 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/pom.xml b/pom.xml
index b3fea69..0a7b5a8 100644
--- a/pom.xml
+++ b/pom.xml
@@ -120,11 +120,10 @@
 2.8.1
 1.8
 2.3.4_1
-9.2.20.v20161216
 3.1.4
 2.4.7
 10.1
-9.2.22.v20170606
+9.2.22.v20170606
   
 
   
diff --git a/tools/apidoc/build-apidoc.sh b/tools/apidoc/build-apidoc.sh
index 8ab69c8..4e1f9a6 100755
--- a/tools/apidoc/build-apidoc.sh
+++ b/tools/apidoc/build-apidoc.sh
@@ -47,7 +47,7 @@ fi
 
 CP=$PATHSEP/
 
-java -cp $CP$PATHSEP$TARGETJARDIR/*$PATHSEP$DEPSDIR/* 
com.cloud.api.doc.ApiXmlDocWriter -d "$DISTDIR" $*
+java -cp $CP$PATHSEP$TARGETJARDIR$PATHSEP$DEPSDIR 
com.cloud.api.doc.ApiXmlDocWriter -d "$DISTDIR" $*
 
 if [ $? -ne 0 ]
 then
diff --git a/tools/apidoc/gen_toc.py b/tools/apidoc/gen_toc.py
index a261037..39e1576 100644
--- a/tools/apidoc/gen_toc.py
+++ b/tools/apidoc/gen_toc.py
@@ -180,7 +180,8 @@ known_categories = {
 'stopNetScalerVpx' : 'Load Balancer',
 'deleteServicePackageOffering' : 'Load Balancer',
 'destroyNsVpx' : 'Load Balancer',
-'startNsVpx' : 'Load Balancer'
+'startNsVpx' : 'Load Balancer',
+'listElastistorInterface': 'Misc'
 }
 
 
diff --git a/tools/apidoc/pom.xml b/tools/apidoc/pom.xml
index e6804a0..61c1ccd 100644
--- a/tools/apidoc/pom.xml
+++ b/tools/apidoc/pom.xml
@@ -21,8 +21,8 @@
 ../pom.xml
 
 
-
../../client/target/cloud-client-ui-${project.version}/WEB-INF/
-${client.config.base}/lib
+../../client/target/
+
${client.config.base}/cloud-client-ui-${project.version}.jar
 ${client.config.base}/classes
 
 

-- 
To stop receiving notification emails like this one, please contact
"commits@cloudstack.apache.org" .

[GitHub] rhtyd commented on issue #2207: Embedded jetty inside shaded jar

2017-08-07 Thread git

rhtyd commented on issue #2207: Embedded jetty inside shaded jar
URL: https://github.com/apache/cloudstack/pull/2207#issuecomment-320638183
 
 
   @marcaurele I've found the fix, can you put this commit in your branch as I 
cannot push changes:
   ```
   diff --git a/tools/apidoc/build-apidoc.sh b/tools/apidoc/build-apidoc.sh
   index 8ab69c8373..4e1f9a639d 100755
   --- a/tools/apidoc/build-apidoc.sh
   +++ b/tools/apidoc/build-apidoc.sh
   @@ -47,7 +47,7 @@ fi

CP=$PATHSEP/

   -java -cp $CP$PATHSEP$TARGETJARDIR/*$PATHSEP$DEPSDIR/* 
com.cloud.api.doc.ApiXmlDocWriter -d "$DISTDIR" $*
   +java -cp $CP$PATHSEP$TARGETJARDIR$PATHSEP$DEPSDIR 
com.cloud.api.doc.ApiXmlDocWriter -d "$DISTDIR" $*

if [ $? -ne 0 ]
then
   diff --git a/tools/apidoc/gen_toc.py b/tools/apidoc/gen_toc.py
   index a261037d80..39e1576422 100644
   --- a/tools/apidoc/gen_toc.py
   +++ b/tools/apidoc/gen_toc.py
   @@ -180,7 +180,8 @@ known_categories = {
'stopNetScalerVpx' : 'Load Balancer',
'deleteServicePackageOffering' : 'Load Balancer',
'destroyNsVpx' : 'Load Balancer',
   -'startNsVpx' : 'Load Balancer'
   +'startNsVpx' : 'Load Balancer',
   +'listElastistorInterface': 'Misc'
}


   diff --git a/tools/apidoc/pom.xml b/tools/apidoc/pom.xml
   index e6804a0e78..61c1ccd593 100644
   --- a/tools/apidoc/pom.xml
   +++ b/tools/apidoc/pom.xml
   @@ -21,8 +21,8 @@
../pom.xml


   -
../../client/target/cloud-client-ui-${project.version}/WEB-INF/
   -${client.config.base}/lib
   +../../client/target/
   +
${client.config.base}/cloud-client-ui-${project.version}.jar

${client.config.base}/classes

   ```
 

This is an automated message from the Apache Git Service.
To respond to the message, please log on GitHub and use the
URL above to go to the specific comment.
 
For queries about this service, please contact Infrastructure at:
us...@infra.apache.org


With regards,
Apache Git Services

[GitHub] blueorangutan commented on issue #1960: [4.11/Future] CLOUDSTACK-9782: Host HA and KVM HA provider

2017-08-07 Thread git

blueorangutan commented on issue #1960: [4.11/Future] CLOUDSTACK-9782: Host HA 
and KVM HA provider
URL: https://github.com/apache/cloudstack/pull/1960#issuecomment-320633973
 
 
   @borisstoyanov a Trillian-Jenkins test job (centos7 mgmt + vmware-55u3) has 
been kicked to run smoke tests
 

This is an automated message from the Apache Git Service.
To respond to the message, please log on GitHub and use the
URL above to go to the specific comment.
 
For queries about this service, please contact Infrastructure at:
us...@infra.apache.org


With regards,
Apache Git Services

[GitHub] borisstoyanov commented on issue #1960: [4.11/Future] CLOUDSTACK-9782: Host HA and KVM HA provider

2017-08-07 Thread git

borisstoyanov commented on issue #1960: [4.11/Future] CLOUDSTACK-9782: Host HA 
and KVM HA provider
URL: https://github.com/apache/cloudstack/pull/1960#issuecomment-320633833
 
 
   @blueorangutan test centos7 vmware-55u3
 

This is an automated message from the Apache Git Service.
To respond to the message, please log on GitHub and use the
URL above to go to the specific comment.
 
For queries about this service, please contact Infrastructure at:
us...@infra.apache.org


With regards,
Apache Git Services

[GitHub] blueorangutan commented on issue #2224: CLOUDSTACK-10032 : Database entries for templates created from snapshots disappear after management-server service restart

2017-08-07 Thread git

blueorangutan commented on issue #2224: CLOUDSTACK-10032 : Database entries for 
templates created from snapshots disappear after management-server service 
restart
URL: https://github.com/apache/cloudstack/pull/2224#issuecomment-320627145
 
 
   Packaging result: ?centos6 ?centos7 ?debian. JID-926
 

This is an automated message from the Apache Git Service.
To respond to the message, please log on GitHub and use the
URL above to go to the specific comment.
 
For queries about this service, please contact Infrastructure at:
us...@infra.apache.org


With regards,
Apache Git Services

[GitHub] blueorangutan commented on issue #2207: Embedded jetty inside shaded jar

2017-08-07 Thread git

blueorangutan commented on issue #2207: Embedded jetty inside shaded jar
URL: https://github.com/apache/cloudstack/pull/2207#issuecomment-320627155
 
 
   Packaging result: ?centos6 ?centos7 ?debian. JID-925
 

This is an automated message from the Apache Git Service.
To respond to the message, please log on GitHub and use the
URL above to go to the specific comment.
 
For queries about this service, please contact Infrastructure at:
us...@infra.apache.org


With regards,
Apache Git Services

[GitHub] blueorangutan commented on issue #1960: [4.11/Future] CLOUDSTACK-9782: Host HA and KVM HA provider

2017-08-07 Thread git

blueorangutan commented on issue #1960: [4.11/Future] CLOUDSTACK-9782: Host HA 
and KVM HA provider
URL: https://github.com/apache/cloudstack/pull/1960#issuecomment-320625072
 
 
   Packaging result: ?centos6 ?centos7 ?debian. JID-924
 

This is an automated message from the Apache Git Service.
To respond to the message, please log on GitHub and use the
URL above to go to the specific comment.
 
For queries about this service, please contact Infrastructure at:
us...@infra.apache.org


With regards,
Apache Git Services

[GitHub] blueorangutan commented on issue #2224: CLOUDSTACK-10032 : Database entries for templates created from snapshots disappear after management-server service restart

2017-08-07 Thread git

blueorangutan commented on issue #2224: CLOUDSTACK-10032 : Database entries for 
templates created from snapshots disappear after management-server service 
restart
URL: https://github.com/apache/cloudstack/pull/2224#issuecomment-320619827
 
 
   @rhtyd a Jenkins job has been kicked to build packages. I'll keep you posted 
as I make progress.
 

This is an automated message from the Apache Git Service.
To respond to the message, please log on GitHub and use the
URL above to go to the specific comment.
 
For queries about this service, please contact Infrastructure at:
us...@infra.apache.org


With regards,
Apache Git Services

[GitHub] rhtyd commented on issue #2224: CLOUDSTACK-10032 : Database entries for templates created from snapshots disappear after management-server service restart

2017-08-07 Thread git

rhtyd commented on issue #2224: CLOUDSTACK-10032 : Database entries for 
templates created from snapshots disappear after management-server service 
restart
URL: https://github.com/apache/cloudstack/pull/2224#issuecomment-320619634
 
 
   @blueorangutan package
 

This is an automated message from the Apache Git Service.
To respond to the message, please log on GitHub and use the
URL above to go to the specific comment.
 
For queries about this service, please contact Infrastructure at:
us...@infra.apache.org


With regards,
Apache Git Services

[GitHub] rhtyd commented on a change in pull request #2224: CLOUDSTACK-10032 : Database entries for templates created from snapshots disappear after management-server service restart

2017-08-07 Thread git

rhtyd commented on a change in pull request #2224: CLOUDSTACK-10032 : Database 
entries for templates created from snapshots disappear after management-server 
service restart
URL: https://github.com/apache/cloudstack/pull/2224#discussion_r131613684
 
 

 ##
 File path: 
services/secondary-storage/server/src/org/apache/cloudstack/storage/resource/NfsSecondaryStorageResource.java
 ##
 @@ -525,6 +525,8 @@ protected Answer 
copySnapshotToTemplateFromNfsToNfs(CopyCommand cmd, SnapshotObj
 bufferWriter.write("\n");
 long size = _storage.getSize(destFileFullPath);
 bufferWriter.write("size=" + size);
+bufferWriter.close();
 
 Review comment:
   @niteshsarda I see what you're saying, however I disagree. You can refactor 
the code in either multiple try-with-resource blocks or methods in such blocks, 
save the `template.properties` file first and use the 
processor/template-location in another block. FWIW, it's still acceptable. 
 

This is an automated message from the Apache Git Service.
To respond to the message, please log on GitHub and use the
URL above to go to the specific comment.
 
For queries about this service, please contact Infrastructure at:
us...@infra.apache.org


With regards,
Apache Git Services

[GitHub] rhtyd commented on issue #2207: Embedded jetty inside shaded jar

2017-08-07 Thread git

rhtyd commented on issue #2207: Embedded jetty inside shaded jar
URL: https://github.com/apache/cloudstack/pull/2207#issuecomment-320617540
 
 
   @marcaurele thanks, I'll have a look this week. Can you fix Travis failures 
as well, are there any changes wrt how a developer builds, runs and tests 
CloudStack?
   
   I've one reservation -- if we put everything in a single jar, it might be 
difficult for users to apply UI changes and add custom jars, anyway to do that? 
Maybe add a custom path (add a classpath) for an override directory from where 
jars may be loaded and maybe split the UI as a separate rpm/deb?
   
   Can you also allow me to push on the exoscale:CLOUDSTACK-10012 branch? 
Alternatively, you may push the changes to the upstream branch so I can 
collaborate and make changes with you.
 

This is an automated message from the Apache Git Service.
To respond to the message, please log on GitHub and use the
URL above to go to the specific comment.
 
For queries about this service, please contact Infrastructure at:
us...@infra.apache.org


With regards,
Apache Git Services

[GitHub] blueorangutan commented on issue #2207: Embedded jetty inside shaded jar

2017-08-07 Thread git

blueorangutan commented on issue #2207: Embedded jetty inside shaded jar
URL: https://github.com/apache/cloudstack/pull/2207#issuecomment-320618023
 
 
   @rhtyd a Jenkins job has been kicked to build packages. I'll keep you posted 
as I make progress.
 

This is an automated message from the Apache Git Service.
To respond to the message, please log on GitHub and use the
URL above to go to the specific comment.
 
For queries about this service, please contact Infrastructure at:
us...@infra.apache.org


With regards,
Apache Git Services

[GitHub] rhtyd commented on issue #2207: Embedded jetty inside shaded jar

2017-08-07 Thread git

rhtyd commented on issue #2207: Embedded jetty inside shaded jar
URL: https://github.com/apache/cloudstack/pull/2207#issuecomment-320617812
 
 
   @blueorangutan package
 

This is an automated message from the Apache Git Service.
To respond to the message, please log on GitHub and use the
URL above to go to the specific comment.
 
For queries about this service, please contact Infrastructure at:
us...@infra.apache.org


With regards,
Apache Git Services

[GitHub] rhtyd commented on issue #2207: Embedded jetty inside shaded jar

2017-08-07 Thread git

rhtyd commented on issue #2207: Embedded jetty inside shaded jar
URL: https://github.com/apache/cloudstack/pull/2207#issuecomment-320617540
 
 
   @marcaurele thanks, I'll have a look this week. I've one reservation -- if 
we put everything in a single jar, it might be difficult for users to apply UI 
changes and add custom jars, anyway to do that? Maybe add a custom path (add a 
classpath) for an override directory from where jars may be loaded and maybe 
split the UI as a separate rpm/deb?
   Can you also allow me to push on the exoscale:CLOUDSTACK-10012 branch? 
Alternatively, you may push the changes to the upstream branch so I can 
collaborate and make changes with you.
 

This is an automated message from the Apache Git Service.
To respond to the message, please log on GitHub and use the
URL above to go to the specific comment.
 
For queries about this service, please contact Infrastructure at:
us...@infra.apache.org


With regards,
Apache Git Services

[GitHub] rhtyd commented on issue #2207: Embedded jetty inside shaded jar

2017-08-07 Thread git

rhtyd commented on issue #2207: Embedded jetty inside shaded jar
URL: https://github.com/apache/cloudstack/pull/2207#issuecomment-320617540
 
 
   @marcaurele thanks, I'll have a look this week. I've one reservation -- if 
we put everything in a single jar, it might be difficult for users to apply UI 
changes and add custom jars, anyway to do that? Maybe add a custom path (add a 
classpath) for an override directory from where jars may be loaded and maybe 
split the UI as a separate rpm/deb?
 

This is an automated message from the Apache Git Service.
To respond to the message, please log on GitHub and use the
URL above to go to the specific comment.
 
For queries about this service, please contact Infrastructure at:
us...@infra.apache.org


With regards,
Apache Git Services

[GitHub] blueorangutan commented on issue #1960: [4.11/Future] CLOUDSTACK-9782: Host HA and KVM HA provider

2017-08-07 Thread git

blueorangutan commented on issue #1960: [4.11/Future] CLOUDSTACK-9782: Host HA 
and KVM HA provider
URL: https://github.com/apache/cloudstack/pull/1960#issuecomment-320613040
 
 
   @borisstoyanov a Jenkins job has been kicked to build packages. I'll keep 
you posted as I make progress.
 

This is an automated message from the Apache Git Service.
To respond to the message, please log on GitHub and use the
URL above to go to the specific comment.
 
For queries about this service, please contact Infrastructure at:
us...@infra.apache.org


With regards,
Apache Git Services

[GitHub] borisstoyanov commented on issue #1960: [4.11/Future] CLOUDSTACK-9782: Host HA and KVM HA provider

2017-08-07 Thread git

borisstoyanov commented on issue #1960: [4.11/Future] CLOUDSTACK-9782: Host HA 
and KVM HA provider
URL: https://github.com/apache/cloudstack/pull/1960#issuecomment-320612903
 
 
   @blueorangutan package
 

This is an automated message from the Apache Git Service.
To respond to the message, please log on GitHub and use the
URL above to go to the specific comment.
 
For queries about this service, please contact Infrastructure at:
us...@infra.apache.org


With regards,
Apache Git Services

[GitHub] SudharmaJain commented on issue #876: CLOUDSTACK-8865: Adding SR doesn't create Storage_pool_host_ref entry?

2017-08-07 Thread git

SudharmaJain commented on issue #876: CLOUDSTACK-8865: Adding SR doesn't create 
Storage_pool_host_ref entry?
URL: https://github.com/apache/cloudstack/pull/876#issuecomment-320611109
 
 
   @karuturi I had rebased the branch. 
 

This is an automated message from the Apache Git Service.
To respond to the message, please log on GitHub and use the
URL above to go to the specific comment.
 
For queries about this service, please contact Infrastructure at:
us...@infra.apache.org


With regards,
Apache Git Services

[GitHub] SudharmaJain commented on issue #2153: CLOUDSTACK-9956 File search on the vmware datastore may select wrong file if there are multiple files with same name.

2017-08-07 Thread git

SudharmaJain commented on issue #2153: CLOUDSTACK-9956 File search on the 
vmware datastore may select wrong file if there are multiple files with same 
name.
URL: https://github.com/apache/cloudstack/pull/2153#issuecomment-320608307
 
 
   @borisstoyanov This bug is not a consistently reproducing scenario. So 
marvin test may pass even with the code without fix. Please let me know your 
opinion. 
 

This is an automated message from the Apache Git Service.
To respond to the message, please log on GitHub and use the
URL above to go to the specific comment.
 
For queries about this service, please contact Infrastructure at:
us...@infra.apache.org


With regards,
Apache Git Services

[GitHub] SowjanyaPatha commented on issue #2109: CLOUDSTACK-9922 Unable to use 8081 port for Load balancing

2017-08-07 Thread git

SowjanyaPatha commented on issue #2109: CLOUDSTACK-9922 Unable to use 8081 port 
for Load balancing
URL: https://github.com/apache/cloudstack/pull/2109#issuecomment-320603039
 
 
   tag:MergeReady
 

This is an automated message from the Apache Git Service.
To respond to the message, please log on GitHub and use the
URL above to go to the specific comment.
 
For queries about this service, please contact Infrastructure at:
us...@infra.apache.org


With regards,
Apache Git Services

[GitHub] marcaurele commented on issue #2207: [WIP] Embedded jetty inside shaded jar

2017-08-07 Thread git

marcaurele commented on issue #2207: [WIP] Embedded jetty inside shaded jar
URL: https://github.com/apache/cloudstack/pull/2207#issuecomment-320597661
 
 
   @rhtyd I think I backported all necessary changes (for Ubuntu distro). Can 
you have a look & try?
 

This is an automated message from the Apache Git Service.
To respond to the message, please log on GitHub and use the
URL above to go to the specific comment.
 
For queries about this service, please contact Infrastructure at:
us...@infra.apache.org


With regards,
Apache Git Services

[GitHub] SudharmaJain commented on a change in pull request #2054: CLOUDSTACK-9886 : After restarting cloudstack-management , It takes time to connect hosts

2017-08-07 Thread git

SudharmaJain commented on a change in pull request #2054: CLOUDSTACK-9886 : 
After restarting cloudstack-management , It takes time to connect hosts
URL: https://github.com/apache/cloudstack/pull/2054#discussion_r131580079
 
 

 ##
 File path: test/integration/component/test_host.py
 ##
 @@ -0,0 +1,156 @@
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
+#
+#   http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+from __builtin__ import False
+""" BVT tests for Hosts Test
+"""
+
+# Import Local Modules
+from marvin.codes import FAILED
+from marvin.cloudstackTestCase import *
+from marvin.cloudstackAPI import *
+from marvin.lib.utils import *
+from marvin.lib.base import *
+from marvin.lib.common import *
+from nose.plugins.attrib import attr
+from marvin.sshClient import SshClient
+import time
+from time import sleep
+
+_multiprocess_shared_ = False
+
+
+class TestHostHA(cloudstackTestCase):
+
+def setUp(self):
+self.logger = logging.getLogger('TestHM')
+self.stream_handler = logging.StreamHandler()
+self.logger.setLevel(logging.DEBUG)
+self.logger.addHandler(self.stream_handler)
+self.apiclient = self.testClient.getApiClient()
+self.hypervisor = self.testClient.getHypervisorInfo()
+self.mgtSvrDetails = self.config.__dict__["mgtSvr"][0].__dict__
+self.dbclient = self.testClient.getDbConnection()
+self.services = self.testClient.getParsedTestDataConfig()
+self.zone = get_zone(self.apiclient, self.testClient.getZoneForTests())
+self.pod = get_pod(self.apiclient, self.zone.id)
+self.cleanup = []
+self.services = {
+ "sleep": 60,
+ "timeout": 10,
+ }
+
+
+def tearDown(self):
+try:
+# Clean up, terminate the created templates
+cleanup_resources(self.apiclient, self.cleanup)
+
+except Exception as e:
+raise Exception("Warning: Exception during cleanup : %s" % e)
+
+return
+
+
+def checkHostUp(self, fromHostIp, testHostIp):
+try:
+ssh = SshClient(fromHostIp, 22, "root", "password") 
+res = ssh.execute("ping -c 1 %s" % testHostIp)
+result = str(res)
+if result.count(" 0% packet loss") == 1:
+return True, 1
+else:
+return False, 1
+except Exception as e:
+self.logger.debug("Got exception %s" % e)
+return False, 1
+  
+def checkHostStateInCloudstack(self, state, hostId):
+try:
+listHost = Host.list(
+   self.apiclient,
+   type='Routing',
+   zoneid=self.zone.id,
+   podid=self.pod.id,
+   id=hostId
+   )
+self.assertEqual(
+   isinstance(listHost, list),
+   True,
+   "Check if listHost returns a valid response"
+   )
+
+self.assertEqual(
+   len(listHost),
+   1,
+   "Check if listHost returns a host"
+   )
+self.logger.debug(" Host state is %s " % listHost[0].state)
+if listHost[0].state == state:
+return True, 1
+else:
+return False, 1
+except Exception as e:
+self.logger.debug("Got exception %s" % e)
+return False, 1
+
+def updateConfigurAndRestart(self, name, value):
+Configurations.update(self.apiclient, name, value)
+self.RestartServers()
+time.sleep(self.services["sleep"])
+
+def RestartServers(self):
+""" Restart management
+server and usage server """
+sshClient = SshClient(
+self.mgtSvrDetails["mgtSvrIp"],
+22,
+"user", #self.mgtSvrDetails["user"],
 
 Review comment:
   @mrunalinikankariya username shouldn't be hardcoded.
 

This is an automated message from the Apache Git Service.
To respond to the message, please log on GitHub and

[GitHub] niteshsarda commented on a change in pull request #2224: CLOUDSTACK-10032 : Database entries for templates created from snapshots disappear after management-server service restart

2017-08-07 Thread git

niteshsarda commented on a change in pull request #2224: CLOUDSTACK-10032 : 
Database entries for templates created from snapshots disappear after 
management-server service restart
URL: https://github.com/apache/cloudstack/pull/2224#discussion_r131579351
 
 

 ##
 File path: 
services/secondary-storage/server/src/org/apache/cloudstack/storage/resource/NfsSecondaryStorageResource.java
 ##
 @@ -525,6 +525,8 @@ protected Answer 
copySnapshotToTemplateFromNfsToNfs(CopyCommand cmd, SnapshotObj
 bufferWriter.write("\n");
 long size = _storage.getSize(destFileFullPath);
 bufferWriter.write("size=" + size);
+bufferWriter.close();
 
 Review comment:
   @rhtyd : We already have try-with-resource declaration for the bufferWriter. 
But here we need to explicitly close this bufferWriter because in below code 
within try block , call is being made to save() method of TemplateLocation 
class where one more bufferWriter comes into picture for writing few other 
properties in Template.properties file. 
 

This is an automated message from the Apache Git Service.
To respond to the message, please log on GitHub and use the
URL above to go to the specific comment.
 
For queries about this service, please contact Infrastructure at:
us...@infra.apache.org


With regards,
Apache Git Services

[GitHub] borisstoyanov commented on issue #2219: CLOUDSTACK-9989: Extend smoketests suite

2017-08-07 Thread git

borisstoyanov commented on issue #2219: CLOUDSTACK-9989: Extend smoketests suite
URL: https://github.com/apache/cloudstack/pull/2219#issuecomment-320578841
 
 
   Yes @rhtyd, I've run them on a Trillian env before moving them in the 
smoketests
 

This is an automated message from the Apache Git Service.
To respond to the message, please log on GitHub and use the
URL above to go to the specific comment.
 
For queries about this service, please contact Infrastructure at:
us...@infra.apache.org


With regards,
Apache Git Services

[GitHub] SudharmaJain commented on issue #2188: CLOUDSTACK-10004 : On deletion, Vmware volume snapshots are left behind with message 'the snapshot has child, can't delete it on the storage'

2017-08-07 Thread git

SudharmaJain commented on issue #2188: CLOUDSTACK-10004 : On deletion, Vmware 
volume snapshots are left behind with message 'the snapshot has child, can't 
delete it on the storage'
URL: https://github.com/apache/cloudstack/pull/2188#issuecomment-320578510
 
 
   LGTM code changes. 
 

This is an automated message from the Apache Git Service.
To respond to the message, please log on GitHub and use the
URL above to go to the specific comment.
 
For queries about this service, please contact Infrastructure at:
us...@infra.apache.org


With regards,
Apache Git Services

97 matches

Mail list logo