[cloudstack] 01/01: Merge forward PR#4668 of Branch 4.14 on branch 4.15
This is an automated email from the ASF dual-hosted git repository. rafael pushed a commit to branch 4.15 in repository https://gitbox.apache.org/repos/asf/cloudstack.git commit 569720fcc28a94cb7d7a2d7631f25645f1bab2ee Merge: 88337bd 7be87f1 Author: Rafael Weingärtner AuthorDate: Thu Feb 25 21:14:21 2021 -0300 Merge forward PR#4668 of Branch 4.14 on branch 4.15 .../apache/cloudstack/ca/provider/RootCAProviderTest.java | 15 +++ 1 file changed, 7 insertions(+), 8 deletions(-)
[cloudstack] branch 4.15 updated (88337bd -> 569720f)
This is an automated email from the ASF dual-hosted git repository. rafael pushed a change to branch 4.15 in repository https://gitbox.apache.org/repos/asf/cloudstack.git. from 88337bd server: fix finding pools for volume migration (#4693) add e1f3179 Adjust tests to fix a problem with the container builders (https://github.com/khos2ow/cloudstack-deb-builder) (#4668) add 7be87f1 Merge forward PR#4668 of Branch 4.13 on branch 4.14 new 569720f Merge forward PR#4668 of Branch 4.14 on branch 4.15 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: .../apache/cloudstack/ca/provider/RootCAProviderTest.java | 15 +++ 1 file changed, 7 insertions(+), 8 deletions(-)
[cloudstack] 01/01: Merge forward PR#4668 of Branch 4.13 on branch 4.14
This is an automated email from the ASF dual-hosted git repository.
rafael pushed a commit to branch 4.14
in repository https://gitbox.apache.org/repos/asf/cloudstack.git
commit 7be87f1cf8292493ae87f937911548d5de799b64
Merge: 3b5f99a e1f3179
Author: Rafael Weingärtner
AuthorDate: Thu Feb 25 21:01:18 2021 -0300
Merge forward PR#4668 of Branch 4.13 on branch 4.14
.../apache/cloudstack/ca/provider/RootCAProviderTest.java | 15 +++
1 file changed, 7 insertions(+), 8 deletions(-)
diff --cc
plugins/ca/root-ca/src/test/java/org/apache/cloudstack/ca/provider/RootCAProviderTest.java
index 04aba36,1f16360..f9fd531
---
a/plugins/ca/root-ca/src/test/java/org/apache/cloudstack/ca/provider/RootCAProviderTest.java
+++
b/plugins/ca/root-ca/src/test/java/org/apache/cloudstack/ca/provider/RootCAProviderTest.java
@@@ -41,7 -41,8 +41,10 @@@ import org.junit.Assert
import org.junit.Before;
import org.junit.Test;
import org.junit.runner.RunWith;
++
+import org.mockito.junit.MockitoJUnitRunner;
+ import org.mockito.Mockito;
-import org.mockito.runners.MockitoJUnitRunner;
++
@RunWith(MockitoJUnitRunner.class)
public class RootCAProviderTest {
[cloudstack] branch 4.14 updated (3b5f99a -> 7be87f1)
This is an automated email from the ASF dual-hosted git repository. rafael pushed a change to branch 4.14 in repository https://gitbox.apache.org/repos/asf/cloudstack.git. from 3b5f99a kvm: Prevent KVM from performing volume migrations of running instances (#4562) add e1f3179 Adjust tests to fix a problem with the container builders (https://github.com/khos2ow/cloudstack-deb-builder) (#4668) new 7be87f1 Merge forward PR#4668 of Branch 4.13 on branch 4.14 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: .../apache/cloudstack/ca/provider/RootCAProviderTest.java | 15 +++ 1 file changed, 7 insertions(+), 8 deletions(-)
[cloudstack] branch 4.13 updated: Adjust tests to fix a problem with the container builders (https://github.com/khos2ow/cloudstack-deb-builder) (#4668)
This is an automated email from the ASF dual-hosted git repository.
rafael pushed a commit to branch 4.13
in repository https://gitbox.apache.org/repos/asf/cloudstack.git
The following commit(s) were added to refs/heads/4.13 by this push:
new e1f3179 Adjust tests to fix a problem with the container builders
(https://github.com/khos2ow/cloudstack-deb-builder) (#4668)
e1f3179 is described below
commit e1f3179446529da3683154c044b15f277d0d7eab
Author: Daniel Augusto Veronezi Salvador
<38945620+gutoveron...@users.noreply.github.com>
AuthorDate: Thu Feb 25 20:28:11 2021 -0300
Adjust tests to fix a problem with the container builders
(https://github.com/khos2ow/cloudstack-deb-builder) (#4668)
* Changes to allow builders containers to build ACS
Co-authored-by: Daniel Augusto Veronezi Salvador
---
.../apache/cloudstack/ca/provider/RootCAProviderTest.java | 15 +--
1 file changed, 5 insertions(+), 10 deletions(-)
diff --git
a/plugins/ca/root-ca/src/test/java/org/apache/cloudstack/ca/provider/RootCAProviderTest.java
b/plugins/ca/root-ca/src/test/java/org/apache/cloudstack/ca/provider/RootCAProviderTest.java
index d5d6428..1f16360 100644
---
a/plugins/ca/root-ca/src/test/java/org/apache/cloudstack/ca/provider/RootCAProviderTest.java
+++
b/plugins/ca/root-ca/src/test/java/org/apache/cloudstack/ca/provider/RootCAProviderTest.java
@@ -41,6 +41,7 @@ import org.junit.Assert;
import org.junit.Before;
import org.junit.Test;
import org.junit.runner.RunWith;
+import org.mockito.Mockito;
import org.mockito.runners.MockitoJUnitRunner;
@RunWith(MockitoJUnitRunner.class)
@@ -57,12 +58,6 @@ public class RootCAProviderTest {
f.set(provider, o);
}
-private void overrideDefaultConfigValue(final ConfigKey configKey, final
String name, final Object o) throws IllegalAccessException,
NoSuchFieldException {
-Field f = ConfigKey.class.getDeclaredField(name);
-f.setAccessible(true);
-f.set(configKey, o);
-}
-
@Before
public void setUp() throws Exception {
caKeyPair = CertUtils.generateRandomKeyPair(1024);
@@ -133,17 +128,17 @@ public class RootCAProviderTest {
@Test
public void testCreateSSLEngineWithoutAuthStrictness() throws Exception {
-overrideDefaultConfigValue(RootCAProvider.rootCAAuthStrictness,
"_defaultValue", "false");
+provider.rootCAAuthStrictness = Mockito.mock(ConfigKey.class);
+
Mockito.when(provider.rootCAAuthStrictness.value()).thenReturn(Boolean.FALSE);
final SSLEngine e = provider.createSSLEngine(SSLUtils.getSSLContext(),
"/1.2.3.4:5678", null);
-Assert.assertFalse(e.getUseClientMode());
Assert.assertFalse(e.getNeedClientAuth());
}
@Test
public void testCreateSSLEngineWithAuthStrictness() throws Exception {
-overrideDefaultConfigValue(RootCAProvider.rootCAAuthStrictness,
"_defaultValue", "true");
+provider.rootCAAuthStrictness = Mockito.mock(ConfigKey.class);
+
Mockito.when(provider.rootCAAuthStrictness.value()).thenReturn(Boolean.TRUE);
final SSLEngine e = provider.createSSLEngine(SSLUtils.getSSLContext(),
"/1.2.3.4:5678", null);
-Assert.assertFalse(e.getUseClientMode());
Assert.assertTrue(e.getNeedClientAuth());
}
[cloudstack] branch 4.11.3 created (now 1756b0f)
This is an automated email from the ASF dual-hosted git repository. rafael pushed a change to branch 4.11.3 in repository https://gitbox.apache.org/repos/asf/cloudstack.git. at 1756b0f noVNC console integration (#3967) No new revisions were added by this update.
[cloudstack] branch master updated: Improvements after jquery update (#3183)
This is an automated email from the ASF dual-hosted git repository.
rafael pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/cloudstack.git
The following commit(s) were added to refs/heads/master by this push:
new 89d5480 Improvements after jquery update (#3183)
89d5480 is described below
commit 89d548052b821ba1255c3c575f0c193894446371
Author: Nico Wohlfarth
AuthorDate: Thu Apr 25 21:09:43 2019 +0200
Improvements after jquery update (#3183)
* Add jQuery ui stylings to the project
* Adapt stylings to jquery ui stylings
- remove unnecessary (empty) style definitions
* Check if jquery autocomplete is initialized before destroying it
* Use dialog modal option instead of setting z-index styling
- set minimum heigth of dialog
* Swap removeAttr() for prop() since it's not longer recommended as of
jQuery 3.0
* Fix reccuring snapshots modal view
* Further style improvements
* More improvements on the instance-wizard (and multi-wizard in general)
* Raise input hints over modal z-index
* Adapt/fix stylings
- center buttons of create form modals
- fix width of select menu in service offerings
- fix width of modal in Network -> VPC -> configure -> static NAT -> aquire
new Ip -> enable static nat
* Adapt width of dynamic-input container
---
ui/css/cloudstack3.css | 557 +---
ui/index.html |1 +
ui/lib/jquery-ui/css/jquery-ui.css | 1151
ui/scripts/configuration.js|2 +-
ui/scripts/roles.js|5 +-
ui/scripts/system.js |8 +-
ui/scripts/ui-custom/instanceWizard.js | 11 +-
ui/scripts/ui/widgets/toolTip.js |2 +-
ui/scripts/vpc.js |2 +-
ui/scripts/zoneWizard.js | 16 +-
10 files changed, 1339 insertions(+), 416 deletions(-)
diff --git a/ui/css/cloudstack3.css b/ui/css/cloudstack3.css
index ab0fd5a..cfad99d 100644
--- a/ui/css/cloudstack3.css
+++ b/ui/css/cloudstack3.css
@@ -17,9 +17,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-/*+clearfix {*/
div.toolbar:after,
-.multi-wizard .progress ul li:after,
.multi-wizard.zone-wizard .select-container .field .select-array-item:after {
content: ".";
display: block;
@@ -30,21 +28,16 @@ div.toolbar:after,
}
div.toolbar,
-.multi-wizard .progress ul li,
.multi-wizard.zone-wizard .select-container .field .select-array-item {
display: inline-block;
}
div.toolbar,
-.multi-wizard .progress ul li,
.multi-wizard.zone-wizard .select-container .field .select-array-item {
- /*\*/
display: block;
- /**/
- -height: 1px;
+ height: 1px;
}
-/*+}*/
body {
min-width: 1224px;
font-family: sans-serif;
@@ -938,9 +931,6 @@ div.list-view div.toolbar div.section-switcher
div.section-select label {
margin: auto;
}
-.install-wizard .step.intro {
-}
-
.install-wizard .step.intro iframe {
width: 99%;
height: 99%;
@@ -,9 +1101,6 @@ div.notification-box .container ul li.first {
border-top: none;
}
-div.notification-box .container ul li.last {
-}
-
div.notification-box .button {
float: left;
background: url(../images/buttons.png) no-repeat;
@@ -1243,9 +1230,6 @@ div.notification.corner-alert div.message span {
}
/*Tooltips*/
-.tooltip {
-}
-
.tooltip-info {
width: 239px;
min-height: 83px;
@@ -1528,9 +1512,6 @@ span.compact {
opacity: 0.35;
}
-.quick-view-tooltip > div.title span.title {
-}
-
.quick-view-tooltip .container {
border: 1px solid #9EA2A5;
background: #FF;
@@ -1547,9 +1528,6 @@ span.compact {
}
/*** Quick view detail view*/
-.quick-view-tooltip .detail-view {
-}
-
.quick-view-tooltip .detail-view .main-groups {
width: 456px;
height: 170px;
@@ -1567,9 +1545,6 @@ span.compact {
box-shadow: 0px 1px #E6E6E6;
}
-.quick-view-tooltip .detail-view .actions {
-}
-
.quick-view-tooltip .detail-view .tagger {
display: none;
}
@@ -1725,21 +1700,6 @@ span.compact {
padding: 0 0 0 14px;
}
-.ui-tabs ul.ui-tabs-nav {
- margin-top: 42px;
- display: block;
- width: 100%;
- height: 41px;
- float: left;
- border: none;
- overflow: hidden;
- z-index: 2;
- /*+placement:shift 0px 2px;*/
- position: relative;
- left: 0px;
- top: 2px;
-}
-
.ui-tabs .info {
background: #EFEFEF;
width: 91%;
@@ -1767,41 +1727,6 @@ span.compact {
color: #506273;
}
-.ui-tabs ul.ui-tabs-subnav li {
- display: block;
- float: left;
-}
-
-.ui-tabs li a {
- float: left;
- padding: 15px 10px;
- min-width: 91px;
- text-align: center;
- font-size: 11px;
- margin-right: 5px;
- color: #4E6070;
- text-decoration: none;
- /*+placement:shift 0px 2px;*/
- position: relative;
- left: 0px;
- top: 2px;
-}
-
-.ui-tabs li {
- float: le
[cloudstack-www] branch asf-site updated (e2ad5be -> 677d87a)
This is an automated email from the ASF dual-hosted git repository.
rafael pushed a change to branch asf-site
in repository https://gitbox.apache.org/repos/asf/cloudstack-www.git.
from e2ad5be Fix 4.12.0.0 download link pointing to
http://www.apache.org/dyn/closer.lua/cloudstack/releases/4.12.0.0/apache-cloudstack-4.12.0.0-src.tar.bz2
new be1e269 CloudStack API docs and cloudstack.yml updated to 4.12.0.0
non-LTS (#54)
new fa86199 updated events on startpage (#56)
new 8e44ce4 Update committers and PMC members
new 618589e Add table beginning to the output and fix the UTF-8 encoding
new 57ed944 Merge pull request #57 from
rafaelweingartner/updateCommittersAndPMCsList
new 26b55c4 updated PR#57 to include compiled content
new c40ab44 Fix all of the issues with file extension
new a6d98ff Merge branch 'master' into asf-site
new 677d87a Add content after fixing the files extensions
The 195 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:
build.sh | 2 +-
content/api.html | 148
...190402-22354-5xunz6 => api20190410-8282-tgtmmg} | 0
content/archives.html | 6 +
content/developers | 6 +-
content/downloads.html | 11 +-
content/index.html | 42 +-
content/stylesheets/all.css| 223 ++
content/stylesheets/normalize.css | 375 ++
content/who| 811 +
content/who.html | 811 +
makewholist.py | 25 +-
source/{about.markdown => about.html.markdown} | 0
source/{api.markdown => api.html.markdown} | 0
...rchives.markdown => api_archives.html.markdown} | 0
{content => source}/archives.html | 6 +
...{archives.md.erb => archives.html.markdown.erb} | 0
source/{bylaws.markdown => bylaws.html.markdown} | 0
...k-faq.markdown => cloudstack-faq.html.markdown} | 0
...ontribute.markdown => contribute.html.markdown} | 0
{content => source}/developers | 6 +-
...evelopers.markdown => developers.html.markdown} | 0
{content => source}/downloads.html | 11 +-
source/downloads.html.erb | 21 +-
source/downloads.md.erb| 216 --
.../{features.markdown => features.html.markdown} | 0
source/{history.markdown => history.html.markdown} | 0
{content => source}/images/background.png | Bin
{content => source}/images/middleman.png | Bin
source/index.html.erb | 42 +-
...-lists.markdown => mailing-lists.html.markdown} | 0
.../{security.markdown => security.html.markdown} | 0
.../{software.markdown => software.html.markdown} | 0
source/stylesheets/normalize.css | 375 ++
source/{survey.markdown => survey.html.markdown} | 0
...markdown => trademark-guidelines.html.markdown} | 0
source/{users.markdown => users.html.markdown} | 0
source/{videos.markdown => videos.html.markdown} | 0
source/{who.markdown => who} | 69 +-
source/{who.markdown => who.html.markdown} | 23 +-
40 files changed, 1303 insertions(+), 1926 deletions(-)
copy content/api/{api20190402-22354-5xunz6 => api20190410-8282-tgtmmg} (100%)
create mode 100644 content/stylesheets/normalize.css
mode change 100644 => 100755 makewholist.py
rename source/{about.markdown => about.html.markdown} (100%)
rename source/{api.markdown => api.html.markdown} (100%)
rename source/{api_archives.markdown => api_archives.html.markdown} (100%)
copy {content => source}/archives.html (97%)
rename source/{archives.md.erb => archives.html.markdown.erb} (100%)
rename source/{bylaws.markdown => bylaws.html.markdown} (100%)
rename source/{cloudstack-faq.markdown => cloudstack-faq.html.markdown} (100%)
rename source/{contribute.markdown => contribute.html.markdown} (100%)
copy {content => source}/developers (99%)
rename source/{developers.markdown => developers.html.markdown} (100%)
copy {content => source}/downloads.html (99%)
delete mode 100644 source/downloads.md.erb
rename source/{features.markdown => features.html.markdown} (100%)
rename source/{history.markdown => history.html.markdown} (100%)
copy {content => source}/images/background.png (100%)
copy {content => source}/images/mi
[cloudstack-www] branch master updated: Add table beginning to the output and fix the UTF-8 encoding
This is an automated email from the ASF dual-hosted git repository.
rafael pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/cloudstack-www.git
The following commit(s) were added to refs/heads/master by this push:
new 618589e Add table beginning to the output and fix the UTF-8 encoding
new 57ed944 Merge pull request #57 from
rafaelweingartner/updateCommittersAndPMCsList
618589e is described below
commit 618589ec6d222a2328ef62696bac41e06fb279d2
Author: Rafael Weingärtner
AuthorDate: Mon Apr 8 13:55:29 2019 -0300
Add table beginning to the output and fix the UTF-8 encoding
Add function to remove emeritus members that are defined with a parameter
---
makewholist.py | 25 +
source/who.markdown | 54 +
2 files changed, 22 insertions(+), 57 deletions(-)
diff --git a/makewholist.py b/makewholist.py
old mode 100644
new mode 100755
index 27e4e56..0e5969f
--- a/makewholist.py
+++ b/makewholist.py
@@ -24,6 +24,7 @@ Can be used at command line by running: python
makewholist.py"""
import json
import sys
import urllib
+import argparse
GROUPS_URL = "https://projects.apache.org/json/foundation/groups.json";
NAMES_URL = "https://projects.apache.org/json/foundation/people_name.json";
@@ -31,6 +32,8 @@ NAMES_URL =
"https://projects.apache.org/json/foundation/people_name.json";
names = {} # Placeholder for names parsed in getNames()
groups = {} # Placeholder for groups parsed in getCommittersAndPMC()
+reload(sys)
+sys.setdefaultencoding('utf8')
def getCommittersAndPMC():
"""Get Committer and PMC info from ASF"""
@@ -52,7 +55,7 @@ def getNames():
print "Error during names JSON download or parsing: %s" % ex.message
-def printWhoList():
+def printWhoList(emeritus_members=''):
if len(names) == 0 or len(groups) == 0:
print "Names or groups not initialized, aborting"
sys.exit(1)
@@ -60,21 +63,35 @@ def printWhoList():
print ("Active Project Management Committee contains "
"(in alphabetical order of their usernames):")
+print "{:.table-bordered}"
print "| Username | Name |"
print "|--|--|"
for pmc in groups['cloudstack-pmc']:
-print "|%s|%s|" % (pmc, names[pmc])
+if pmc not in emeritus_members.split(','):
+print "|%s|%s|" % (pmc, names[pmc])
+
print ""
print ""
print ("Active list of committers "
"(in alphabetical order of their usernames):")
+
+print "{:.table-bordered}"
print "| Username | Name |"
print "|--|--|"
for committer in groups['cloudstack']:
-print "|%s|%s|" % (committer, names[committer])
+if committer not in emeritus_members.split(','):
+print "|%s|%s|" % (committer, names[committer])
if __name__ == "__main__":
+# construct the argument parse and parse the arguments
+ap = argparse.ArgumentParser()
+ap.add_argument("-e", "--emeritusMembers", required=False, help="Emeritus
PMCs and committers usernames (comma separated values).", default='')
+
+args = vars(ap.parse_args())
+
+emeritus_members = args["emeritusMembers"]
+
getNames()
getCommittersAndPMC()
-printWhoList()
+printWhoList(emeritus_members)
diff --git a/source/who.markdown b/source/who.markdown
index a9c6b48..9a4cc42 100644
--- a/source/who.markdown
+++ b/source/who.markdown
@@ -21,7 +21,6 @@ This page includes the Apache CloudStack Project Management
Committee (PMC) memb
## PMC
Active Project Management Committee contains (in alphabetical order of their
usernames):
-
{:.table-bordered}
| Username | Name |
|--|--|
@@ -32,7 +31,6 @@ Active Project Management Committee contains (in alphabetical
order of their use
|chipchilders|Chip Childers|
|chiradeep|Chiradeep Vittal|
|dahn|Daan|
-|edison|Disheng Su|
|ekho|Wilder Rodrigues|
|erikw|Erik Weber|
|giles|Giles Sirett|
@@ -81,57 +79,11 @@ PMC members who are no longer active include:
Active list of committers (in alphabetical order of their usernames)
+Active list of committers (in alphabetical order of their usernames):
{:.table-bordered}
| Username | Name |
|--|--|
-|ahuang|Alex Huang|
-|akarasulu|Alex Karasulu|
-|alena1108|Alena Prokharchyk|
-|animesh|Animesh|
-|boris|Boris Schrijver|
-|chipchilders|Chip Childers|
-|chiradeep|Chiradeep Vittal|
-|dahn|Daan|
-|duffy|Ian Duffy|
-|edison|Disheng Su|
-|ekho|Wilder Rodrigues|
-|erikw|Erik Weber|
-|giles|Giles Sirett|
-|gochiba|Go Chiba|
-|hogst
svn commit: r33145 - /dev/cloudstack/4.8.2.0/
Author: rafael Date: Fri Mar 22 18:01:21 2019 New Revision: 33145 Log: Removing old source release files for 4.8.2.0 Removed: dev/cloudstack/4.8.2.0/
svn commit: r33144 - /dev/cloudstack/4.12.0.0/ /release/cloudstack/releases/4.12.0.0/
Author: rafael Date: Fri Mar 22 17:59:12 2019 New Revision: 33144 Log: Publishing 4.12.0.0 release Added: release/cloudstack/releases/4.12.0.0/ - copied from r33143, dev/cloudstack/4.12.0.0/ Removed: dev/cloudstack/4.12.0.0/
svn commit: r32362 - /release/cloudstack/KEYS
Author: rafael Date: Wed Feb 6 13:32:04 2019 New Revision: 32362 Log: KEYS: add key of gabriel (Gabriel Beims Bräscher) to CloudStack KEYS Modified: release/cloudstack/KEYS Modified: release/cloudstack/KEYS == --- release/cloudstack/KEYS (original) +++ release/cloudstack/KEYS Wed Feb 6 13:32:04 2019 @@ -1750,3 +1750,62 @@ hD5kgnASVOZbZs2fV1aguIX8rIXrfofcygc2Vzmq jNc7Zqol+RJHwIGl =oF75 -END PGP PUBLIC KEY BLOCK- + +pub 4096R/25908455 2019-02-05 [expires: 2024-02-04] +uid Gabriel Beims Brascher (ASF Committer Key) +sig 325908455 2019-02-05 Gabriel Beims Brascher (ASF Committer Key) +sub 4096R/D939824F 2019-02-05 [expires: 2024-02-04] +sig 25908455 2019-02-05 Gabriel Beims Brascher (ASF Committer Key) + +-BEGIN PGP PUBLIC KEY BLOCK- +Version: GnuPG v1 + +mQINBFxZ1M4BEADeEg2Tm+3o4fndlCs/RhCAc7v1spWru9BaTRJjjEVZ4W/jClK9 +8RkyjakUKDUv5CQZzidoHiB5dsKngzQt+BpL8FzR2doxbRKYDr/724H7v33KQy1P ++DXTWESHA5H1YR1KwIL0DlqnY6YlDdKT+qPJj/HAqveL61r4W53hGoO/LVRqnSbm +/EXKcucovQI8A3l7ni2Gfct6CWQAO7dqg2nUs4ROIftx0KWl5kZswFPKbUn/gA3B +lAkw1FEqHJvxFFvpO5iq/Z/ewXr0WMoRdFxhAXTeVcsupjltYjTuaIf2pf8IFHE1 +vR8TlTJhTJvuEkwsnduUDtQgFSeAYSZuJSWxSEJhALF5w41pEz1gtF0CNDu16GpE +Y/XpGV7d9x4KsPrmeXavUnILXp1gy2X8R5OpwthhcbJvFjA6uCOrd/HrGfnoJi/p +5LiKCNap+NsFMQZriLd2kBEOIRF5oJM5R8Y39EvOsfJVUjHrfpQE4FHFW6dpPZxq +G7SHG9bUd2RdLIp0fHT+bXud7pUZVHKp7ED1puXfaDPqyXWiIlRWPYi5onrPsZZg +QTzH2vbiJ4547KKPFekLaLQ5ia30f9WJlZzoykeFxx3jyZXYyUypcjJJSTabfA1/ +eh4ajdLzKtObSvhLw45VDdK2BT6kceTby8JnRbC4fQtd+/GzgN1Ur5SlRQARAQAB +tD9HYWJyaWVsIEJlaW1zIEJyYXNjaGVyIChBU0YgQ29tbWl0dGVyIEtleSkgPGdh +YnJpZWxAYXBhY2hlLm9yZz6JAj4EEwECACgFAlxZ1M4CGwMFCQlmAYAGCwkIBwMC +BhUIAgkKCwQWAgMBAh4BAheAAAoJEOgcqc4lkIRVniEP/iibmM9xtQ/O0LH5QkTb +FuttEd/qhnepMMkUVeZbz0463ceXSjIxeqBChNuhAOz7QrledCx6irnMlmf8r5FY +KATiylekLuhPBAiaIPYACVrmsjd13UKuaBT/XYV22FWp+XYESGU8C8C72ypqfnTY +DyS0VR7aQ3qPfZscigQr1baquHtzN7eDaPX9CGVVxAHDOjezeJcUEA655wt0Iaeu +2jcKf9icBEIeUTvrcJnw9Y0DqDApJk1klK4ggHNVXg8GlpPitMLlA68xdNyBjciE +V8+2/2XTUntfiiWEd+Zf9/hFha9NhgT4E/v4zAEZhSmftix80mi54M3mIJ9PuUOX +f7uhhgSP/MBmwMSXOFFLUjIWmoZhlyi6YepSt60LrUsdzCRhJYe5wwNBnDo/1hsN +cmACJqHRoJ1/b0zQORw05ddwt2s+OiBkFHIxj+zOD+BCIo6l4KF88VdMy9NEcPYt +aWPym09T7Yg7SRdr/Ypw1m4F14Hx3dyh9FRMogF1nTFk78KjKQHRCIkJDZYcIDqT +Rpq8l1M2WkV7CaQeEp1de0isCMhdw9L9M+AS52krf/IBI5fd6YER01D2iJTBaTo8 +8/6sC8hkvjuWEEbHCgrdhkCS0btWidqhoT+Qh1FTQ/ayn7V+bNvrBj953rvLzyp3 +LwfU/eeIAyzAJEyfMmbPIPBruQINBFxZ1M4BEADYrSvyT+u+U3nJp8NEeM7y9jlV +JLncyTT62LhG7vtNyUcQxZe3d0B0dvNgyq0FATuINY62wJcFW0bGGFYtGUr8sIov +38xBk7YTDCuSZBYQiSAfhih1RZRGDS7N4+2t4ecdRBALeJsxjjngrvJ1qu28oyGm +X6eibexhABWJnd8+YUIsOKpvQg28W7gUWgHUuJ9VzROsGoXGv3JUif3M4Bmoc7t/ +1jPmsDDMXhbxsp66X0hzjvjRQl6GFn9CUEkJ+k5t3ajjk3yYrLqj/pJxOnSQ+O3Q +djbKk0g4L4ILjzMrhx95jo3aPDW0VT6xUIaPBlEr/CaoGHV6wQA6YY0FBY8ZCbaA +6YaHLRnNOziD/vuH5Lbx0FX+9zcjXF4IOsti1E5U3rhDB5zi63T+jR1IeoItq4RH +s2EuEUUx1PB4Jk2c417X07LM4fzyHQ0hOgtfZRgS9awPyqCpXhctJC3lYZgX31+J +qjJ0A7nUCq9weBtAtZcABUPRA6vL2Fn9thep0PmBJU66/eJt9VTXWmOPMsM3PFVa +ME8dYAAuz1SOryf+vRZZKkcPRqZHF5CuJAKtYcVeCVCHwrHrC+TEyBp+6u6rSLeZ +WvhLfub9zJ3IIIUTYb1CLqLtSuXpJFHTNsLcAdStygI97fpfzXRpax43LKgRYTeB +4sVsJa4hq/6bBr2ulwARAQABiQIlBBgBAgAPBQJcWdTOAhsMBQkJZgGAAAoJEOgc +qc4lkIRV+xUP/1zVcrr7pBS4PyYPdxYXarZOwMeX+gmBRxlEiKvnhgFjF9Fk5gm9 +GYkDBd2ElZMS7QkXs6nsDTVka9JNnCrlMxpeflx0RGWf6r7xkcGG0YbFR3gIvKbB +KQ/bbOR8MKkE5UewvlCicJC3efUV1nKPTmiczabcEVuVOV0IIXmntpnZ/mic/NED +gPzx9U7y18F09tb8KtgvEwo45R5W61y+g0R4UT9Y5sLYKaJS06uKjraFotapM99r +9syXL0sEl6RUIwE4MN/MA016QzqGNg5fossCqXKxKAMqesX9AKAoCtmsDZ+TeqQr +oXU725+pzVoM0DNV4NTm2lF7jzNAfaoKBHraw5v7x7TaUBj5RBaZ+zEzvc38c7eT +23JHQCQTSaMr2ebDGlFarIFhlLr1SVDCpWsbqVB4/Erdgf33Q177kLiukPLsepaC +1xoTK523+6AdEQl5cYdy4G42WWu56yHwDiBo52CFi6pGXrXtHqNZKTfg3YyWADRC +IBpL+pLhq/wLJC9why//N0xd6cbSes4u8wnuJ3PfJSShoGnNoSBpPJHclvBYjQaW +q0aa+/664zayGc5ontlkdP9u6MfsyA/kbc/ZEOXTIrMQQ1RijShL6KXgdxT0nmVD +67C/PWmmnkhs8GVNXP+SyjineY82LM/7GccjPOXLBCNCI6eIOAalY2D8 +=uiqe +-END PGP PUBLIC KEY BLOCK--- \ No newline at end of file
svn commit: r32361 - /release/cloudstack/KEYS
Author: rafael Date: Wed Feb 6 13:28:45 2019 New Revision: 32361 Log: KEYS: add key of rafael (Rafael Weingärtner) to CloudStack KEYS Modified: release/cloudstack/KEYS Modified: release/cloudstack/KEYS == --- release/cloudstack/KEYS (original) +++ release/cloudstack/KEYS Wed Feb 6 13:28:45 2019 @@ -1669,3 +1669,84 @@ mZ/hQYDgcA== =BV/P -END PGP PUBLIC KEY BLOCK- +pub 4096R/FDB20E26 2015-12-09 [expires: 2020-12-07] +uid Rafael Weing\xe4\x72tner (Rafael) +sig 3FDB20E26 2015-12-09 Rafael Weing\xe4\x72tner (Rafael) +sub 4096R/5CEA7D77 2015-12-09 [expires: 2020-12-07] +sig FDB20E26 2015-12-09 Rafael Weing\xe4\x72tner (Rafael) + +-BEGIN PGP PUBLIC KEY BLOCK- +Version: GnuPG v1 + +mQINBFZoeO8BEADjOyq3+7/MeMYLb0EG3S7TZ8NxD19FyNCI96oBLfUhxW/bdoKx +CzaaxzQLxONhVsEl1im9tfauWDQjDGXldZ5Uau+wRONa9nhkwKZv3MjchJS/CQSG +X43m7WkYNBiZd2hzNrFMlHp7NODJ2G+b3J9gRLpVaszPGhgPTD24/kedCeyEBhp8 +X4sKYHJXGY7haeTnM6/3tWzDkISQ/iarm3QJM5ZaJxldiI+Xp4s5PlKXVMmjhfw6 +kpRs4zHku+GhE666o9Rvx3wYND+eL0GbmUvJjpp9ZDRFfTJyRn5JweaUtrRhGTaZ +r6XXblvxcxkbjjE8uDfePCuYkJbmFiY/dO3+KTYIPPCp9+iteo0ntRPSWkfw5wlf +By5bqahW2W4oKnxhOvKk/GtPuJdcKJGuLR1j7V0hMT004hy4I+oicNmury5nFgmd +IHZaN3WfihZUcAuAblqGlSiYbmmGH0J3SlIPnCdWYD5NSCjj9Dp/ZqZJoCJN28EH +9Nuiz3lYqc7/BFaBwuo7B7qqo4OlbWGGk9nPcLarQR+/PHaQWlTEfig3ph0ufugz +V0/NbuRJcklh6sEpsq1fQ01DUrXNhXDOhNDvPeU62XTgUj4mkXsUGtlv0qeK9PWv +FqEWjIFdGTpkWcdame/dgzp0qR+TzIEVlcRB98Nn93lAefJ9UNXJxckvDwARAQAB +tDlSYWZhZWwgV2VpbmfkcnRuZXIgKFJhZmFlbCkgPHJhZmFlbHdlaW5nYXJ0bmVy +QGdtYWlsLmNvbT6JAj4EEwECACgFAlZoeO8CGwMFCQlmAYAGCwkIBwMCBhUIAgkK +CwQWAgMBAh4BAheAAAoJEOKKB+j9sg4mACAQAL27lwrXV84aKop0DuD2QDF/Iyei +E4TSoWDDeyM+X7W7dwP09RPhxESvpzFM14aBqFddGtA1/nYdEQ19oz7EsYEpoi6G +AaegcAlQs8KmdK/sTiKkBdnCMNcwB2TANPsA8QszaKDQB9xsZB+7AHx4R6bjCoKP +o7r5HIBO5eXNHStBeekhwCHugUooSsQqDDvoS9Yb2vyf8jX/hJSYmc6Nb5iY1LMM +tysiglWiYGrPcaj4i5WJhT+FOlLgjqeQ8NkYz1ZcoByCIKy/1UdjARIOlJTATin6 +mHNKr03agGaiiFEzc21+WB5ZPEjA5nL8wRmWMz4QRg4CyzH87cOhyzc3GVoHciQ7 +FJ8jddihGgGewD7rDAp+7NQHTKo2rAgcRYbHFjEDFksB1UiapzrFIUkh1pAeftSK +mJYjOD8gVwHZqBMWOJdod480zrasXxE5wINLBP8+Q5iV053fCu0owzZm3Ra0TgEI +qHs/JKisxeYZwNT5kdbT6IiU+8pYRqIrORgU6SSu7v9f44zHW+H68nM4L9oeeAyK +sl/dfUmtej8/8A/xOjvaf4kYaUwNLmecf/dlxgz+/Ty37AH2Khk00PITdAyGo1r3 +ogjMYozZOFnki7LMh/j0CVD9GUwCKmOFLu0gex8DbeJBiu2OF9vemXoDlVLHJHQo +vmVDuPHuWsdOsTUQuQINBFZoeO8BEAChzqwjKM6/7MH4hGPx/XKNhgKOsh0RRcIL +51UB6QQ7kEA0TOJZQSz01PMgbBX6jEhq3IVC5B79pnsMa/fBxhiRwWzVKnq3nrQq +0gwOeyxQWqXauBRvCuIMqp3yCI1oklc1Nxso2m6J5dVOA96zXtzR6bshwZ83xtTC +l367ffEJDmtLBWIXyEnzZdUwtD/dX/hx3E/yl0BVPSmb50g3JMujjtCG7YiyvK5f +Saowq66l6fC9v0TGDuOWuOIPvYWXzjtrWTGlMiR2aKt5+w6aHzGffhq1vCsdsiN5 +ROEdhivsIIHG3j1yaVOkhfRUKBlUFJPA1iK8/RAaRQ2WqVRRyhp6OkdSlWfgADrY +pryvvUziWy0YR3wpLAtWZDCBBiug0uEgTHSnKptGqUiy9CBY0d9Nj71DJud03WZ8 +xFvSY2LqwiO8Z+y2vl4MwqLWh2EsC7DRH3K6yWN6c7ui0hJZlJHPX2Z0hlTT397J +BVGeyHVXrTQJmuATwN25O8OlFiOKKWpzQIAfkG2Dy4oeDlEGcAUT4Zq+V/KcN8YN +TgA4b1MlMAzHLVT9tEYO2lXYcXcWCY33sCjMuTK6Gs6OKdI1g0J4sQxd4rrgqNUL +mhaxF4hdkp28NC8eIq+jBiJaC8k6BiRCag8215cyB3FkIs2ivvku27YilWLVlzZI +ZVi5XdR5yQARAQABiQIlBBgBAgAPBQJWaHjvAhsMBQkJZgGAAAoJEOKKB+j9sg4m +fgUP/R9FThBvBJPinc5brv3wrrHdlk4lcAlGdscW338q6NjjadcoQksiFWhzGNo+ +sS7r4hXN0wGdNsfZbXA2b79re6QnwCJy6GkHlCHgfGoCoGAAVg6Dvi2NeGrw4FlJ +siWvGdomEu2p1gf4AfAAvAeCUSSvM2JeYR0I9Rjz8F2eCqBXy7nAyiE78Qn4qzfy +NCHKE8qNyssQcbJn3RYsfiXnnS3O0N8G/Um4nw+jHZHrWKICbkr/GLpaO7Ji5U00 +3OWmkAGuLUNWJYVG2YLzJz19dzzaYEAHooEMvseCXhQT8xkQBITaT7jaFU9iBD+z +HfQ+hZwzSl4884TO7yGKn++YkjT4+0jPMdLMnRJt1qMnrgM+mcs2URUbPDdAszBM +q0LUAtaFEvB0zVYFV9a7uItXaYqNF/w+eO0q4LwOsQSYNkkT0Pb8lh8NEQc3VJYe +rcwu+qKgSw/wxIELK/7H1efG7wso0/i+qkveiwp4Y/X8o5RMC+c6kpSD+IuUkRhR +uzA31xQ4r/6g4RCSGs9+QMQHKnJeotpH2BSwmT2WcaZnCi18gi0Cs+uYwLFfzSKd +C97QBqrVQoGBWtvnUe0YH61b5qwCG5ovljk88bgKCdjyinQXPlDd6hlZ601cwYKK +EX0iPVTfUfIFgRPE8OgqCGKmf/s+KTb19aOW3FkSgLI3wLNFuQINBFZpaa4BEAC+ +94A+1XD1ZxHqchKfWSJ3m9WyAW6LpfY++vAFRsHAKrq+oehj5A2HScnn6PhlNsH+ +vSpAPuu6Md7l11/JcCNtDNBNzUEWPF5nTCTDGw2TfhyVtNzk6M7kgGn/6UL2xiOG +9ttpoH1uBMcPXDIYZWTd6mj4aYhpEjWLrJhL9JA8VET9G2PyEREHFTmMp2fKRiRG +dSa4iOPO5iFJWYsc6PIZjr+4AmBowpvSpmKBZopBGGb4NBhN7PsgViG+29NyYH7p +NaNdh3hg66tojfKT71zFc9pOWBVNOsg9PnOZ/lmgIfkujUQ8lL/uAMpatAKqtALg +92WyRXCOC0Q/o2OZeiqWxbV2Z5TmVsa5KsGoFgKfmj/B2lemB0D8tgjwYnM9BR2L +DF9SFJhLqjajRhL/eLh34gSyTWCpYl45pqYOo7mL/5Kx8dTn2TxNHbK5CQX/EX0Q +XJ2uhtQtI+sZ3P9b+1J5wfTQde+jaFidt9XFEE3oClCaNuGNSkzQTU+o0vC9XTd0 +mk2pRTRdm/Mp1I2ejGr5uqmViuVVBgzWz/U8NjKOsk+4172lCu8wGuLW81ylWVux +LLhg74sidwUfMQbtyYYeVcD8g9H/pGtICUTlUlnYqvZ98EaJAzGOQ8+HeVCoMdJf +px1FbtRfolAwJNpxKrvTVsA3TkgiEqjJFJ+/mQ5yaQARAQABiQIlBBgBAgAPBQJW +aWmuAhsgBQkB4TOAAAoJEOKKB+j9sg4mlHYP/iq2wEeXJ+GkW+/J0zTxCPJRj56z ++Fcu4FXYMKatz45PkJXiPbRs65s7PXZ+7QNCNzOakJ9vd+FoK5wSwT8Q8x4xp0/S +o0eN0okjfBnYNJkQFhS5KWJUx2JoXTfCrboxEePcQOe/GEB32IZiCeHEX3XF61K8 +ca0z0k6LsPUHsY6dVmmU9+qIAq/MHrws3a3TtkL1hqk4OGm+Fq5Ih0aQOcM1/y+i ++7KnWI3HZUqbLtcoAlQN7sPRwc1ZIOD8wVOaTOTKGx4XWyPSXqIXPNkA2A581qCQ +wS
[cloudstack] branch master updated: Extend PR#2535 to enable remote debugging for CentOS63 as well (#3128)
This is an automated email from the ASF dual-hosted git repository.
rafael pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/cloudstack.git
The following commit(s) were added to refs/heads/master by this push:
new df6288f Extend PR#2535 to enable remote debugging for CentOS63 as
well (#3128)
df6288f is described below
commit df6288f4bcfa813fcbe6702345c46ab9f0a6dbf5
Author: Rafael Weingärtner
AuthorDate: Mon Jan 14 22:15:01 2019 -0200
Extend PR#2535 to enable remote debugging for CentOS63 as well (#3128)
This PR is an extension of #2535. By doing this, we also create an easy
method to enable remote debug in CentOS63 as well.
---
packaging/centos63/cloud-management.rc | 2 +-
packaging/centos63/cloud-usage.rc | 2 +-
packaging/systemd/cloudstack-management.default | 12 +---
3 files changed, 11 insertions(+), 5 deletions(-)
diff --git a/packaging/centos63/cloud-management.rc
b/packaging/centos63/cloud-management.rc
index 0ef5fc4..eb075da 100755
--- a/packaging/centos63/cloud-management.rc
+++ b/packaging/centos63/cloud-management.rc
@@ -88,7 +88,7 @@ start() {
echo -n "Starting $PROGNAME" "$SHORTNAME"
-if daemon --pidfile $PIDFILE $DAEMON -home "$JAVA_HOME" -cp "$CLASSPATH"
-pidfile "$PIDFILE" -user "$USER" \
+if daemon --pidfile $PIDFILE $DAEMON $JAVA_DEBUG -home "$JAVA_HOME" -cp
"$CLASSPATH" -pidfile "$PIDFILE" -user "$USER" \
-errfile $LOGDIR/cloudstack-management.err $JAVA_OPTS $CLASS
RETVAL=$?
then
diff --git a/packaging/centos63/cloud-usage.rc
b/packaging/centos63/cloud-usage.rc
index 7741137..15e9ee5 100755
--- a/packaging/centos63/cloud-usage.rc
+++ b/packaging/centos63/cloud-usage.rc
@@ -96,7 +96,7 @@ start() {
echo -n "Starting $PROGNAME" "$SHORTNAME"
-if daemon --pidfile $PIDFILE $DAEMON -home "$JAVA_HOME" -cp "$CLASSPATH"
-pidfile "$PIDFILE" -user "$USER" \
+if daemon --pidfile $PIDFILE $DAEMON $JAVA_DEBUG -home "$JAVA_HOME" -cp
"$CLASSPATH" -pidfile "$PIDFILE" -user "$USER" \
-errfile $LOGDIR/cloudstack-usage.err -outfile
$LOGDIR/cloudstack-usage.out -Dpid=$$ $CLASS
RETVAL=$?
then
diff --git a/packaging/systemd/cloudstack-management.default
b/packaging/systemd/cloudstack-management.default
index 05f4a50..cd6a1ca 100644
--- a/packaging/systemd/cloudstack-management.default
+++ b/packaging/systemd/cloudstack-management.default
@@ -34,6 +34,12 @@
CLASSPATH="/etc/cloudstack/management:/usr/share/cloudstack-common:/usr/share/cl
BOOTSTRAP_CLASS=org.apache.cloudstack.ServerDaemon
-#You can uncomment this if you want to enable Java remote debugging.
-#You can change the parameters at your will. The 'address' field defines the
port to be used.
-#JAVA_DEBUG="-agentlib:jdwp=transport=dt_socket,address=8000,server=y,suspend=n"
\ No newline at end of file
+
+#You can uncomment one of these options if you want to enable Java remote
debugging. #
+#You can change the parameters at your will. The 'address' field defines the
port to be used. #
+
+# This option here should be used with 'systemmd' based operating systems such
as CentOS7, Ubuntu 16, and so on.
+#JAVA_DEBUG="-agentlib:jdwp=transport=dt_socket,address=8000,server=y,suspend=n"
+
+# On the other hand, this option is used by CentOS6.
+#JAVA_DEBUG="-Xrunjdwp:transport=dt_socket,address=8000,server=y,suspend=n"
\ No newline at end of file
[cloudstack] annotated tag shapeblue-4.5.2-05-samlquota deleted (was a102c07)
This is an automated email from the ASF dual-hosted git repository. rafael pushed a change to annotated tag shapeblue-4.5.2-05-samlquota in repository https://gitbox.apache.org/repos/asf/cloudstack.git. *** WARNING: tag shapeblue-4.5.2-05-samlquota was deleted! *** tag was a102c07 The revisions that were on this annotated tag are still contained in other references; therefore, this change does not discard any commits from the repository.
[cloudstack] annotated tag shapeblue-4.5.2-01-samlquota deleted (was 9b74a73)
This is an automated email from the ASF dual-hosted git repository. rafael pushed a change to annotated tag shapeblue-4.5.2-01-samlquota in repository https://gitbox.apache.org/repos/asf/cloudstack.git. *** WARNING: tag shapeblue-4.5.2-01-samlquota was deleted! *** tag was 9b74a73 This change permanently discards the following revisions: discard d0852ef quota service discard 873dba4 CLOUDSTACK-8701: Add administrative contact block as per SAML IDP expectations discard 43136a8 CLOUDSTACK-8301: Enable configuring local storage use for system VMs at zone level discard ef86ff4 travis: add sudo required discard 6b041a2 travis: don't force M2_HOME, let Travis use the bundled maven3 discard fd790e3 CLOUDSTACK-8642: SSO Method not allowed bug fix. Due to CLOUDSTACK-8505 and commit 1c81b241e7914b24b06c3b7b3ee98bc0d3b4f68b discard 46433c1 CLOUDSTACK-8231: Fixed UI empty drop-down list for LB rules discard f50a948 CLOUDSTACK-8701: Allow users to switch across SAML account/domains from topbar discard 7f55b75 CLOUDSTACK-8701: Allow SAML users to switch accounts discard 2f12c11 CLOUDSTACK-8702: Add/refactor sessionkey checking code to HttpUtils discard 20f7f77 CLOUDSTACK-8505: Don't allow non-POST requests for default login API
[cloudstack] annotated tag 4.9.1.0-shapeblue2 deleted (was 7eab9eb)
This is an automated email from the ASF dual-hosted git repository. rafael pushed a change to annotated tag 4.9.1.0-shapeblue2 in repository https://gitbox.apache.org/repos/asf/cloudstack.git. *** WARNING: tag 4.9.1.0-shapeblue2 was deleted! *** tag was 7eab9eb This change permanently discards the following revisions: discard 2b31107 CLOUDSTACK-9569: add router.aggregation.command.each.timeout to agent properties discard 236cfa2 CLOUDSTACK-9569: override default setting with values set in agent.properties discard 23fdd7b CLOUDSTACK-9569: add router.aggregation.command.each.timeout to agent.properties discard 69e63e4 CLOUDSTACK-9473: storage pool capacity check when volume is resized or migrated is added discard fcf9282 CLOUDSTACK-8896: when the volume migrated to another pool the capacity calculations are fixed to take into account disk usage shifting from one pool to another discard 1f355d6 CLOUDSTACK-9687: if the allocated amount is 0 the capacity updates are not done, resulting in wrong values being shown as allocated value instead of zero discard b0b4960 CLOUDSTACK-9688: Fix VR smoke test failure in vpc_vpn discard cae081d CLOUDSTACK-9688: Fix failing test_volumes on centos7/kvm discard 2c4881b CLOUDSTACK-9673 Exception occured while creating the CPVM in the VmWare Setup over standard vSwitches discard 2e5dca1 CLOUDSTACK-9649: In the management server log there is an error related to 0.0.0.0 IP address discard 0dc0b91 CLOUDSTACK-9639: Unable to create shared network with vLan isolation discard 37e4b25 CLOUDSTACK-9676 Start instance fails after reverting to a VM snapshot, when there are child VM snapshots discard 8ef4671 CLOUDSTACK-9612: Fixed issue in restarting redundant network with cleanup Rvr Network with cleanup which is updated from the isolated network is failed. Corrected the column name string issue. discard d086ee4 CLOUDSTACK-9617: Fixed enabling remote access after PF or LB configured on vpn tcp ports discard 6efd803 CLOUDSTACK-9615: Fixed applying ingress rules without ports discard 0f8080c CLOUDSTACK-9683: system.vm.default.hypervisor will pin the hypervisor for VR too with this fix discard df5949d CLOUDSTACK-9688: Fix failing smoke tests
[cloudstack] annotated tag shapeblue-4.5.2-03-samlquota deleted (was 1bb730f)
This is an automated email from the ASF dual-hosted git repository. rafael pushed a change to annotated tag shapeblue-4.5.2-03-samlquota in repository https://gitbox.apache.org/repos/asf/cloudstack.git. *** WARNING: tag shapeblue-4.5.2-03-samlquota was deleted! *** tag was 1bb730f The revisions that were on this annotated tag are still contained in other references; therefore, this change does not discard any commits from the repository.
[cloudstack] annotated tag 4.5.2.1-shapeblue4 deleted (was c226e42)
This is an automated email from the ASF dual-hosted git repository. rafael pushed a change to annotated tag 4.5.2.1-shapeblue4 in repository https://gitbox.apache.org/repos/asf/cloudstack.git. *** WARNING: tag 4.5.2.1-shapeblue4 was deleted! *** tag was c226e42 This change permanently discards the following revisions: discard 323dd64 CLOUDSTACK-9586: Marvin test to check if the templates are downloaded to the primary store successfully discard f46f24a CLOUDSTACK-9586: When using shared storage with Xenserver prepareTemplate does not work when there are more than 1 hosts discard ad51d7b CLOUDSTACK-9544: Check access on account trying to generate user API keys discard bfec958 Merge pull request #2 from shapeblue/dbconn discard 2fe7ccf SUPPORT-69: Async Job Database Connection Timeouts, connection refresh during create volume discard 5f5c928 SUPPORT-69: Async Job Database Connection Timeouts
[cloudstack] tag shapeblue-4.6.0-00 deleted (was e31ade0)
This is an automated email from the ASF dual-hosted git repository. rafael pushed a change to tag shapeblue-4.6.0-00 in repository https://gitbox.apache.org/repos/asf/cloudstack.git. *** WARNING: tag shapeblue-4.6.0-00 was deleted! *** was e31ade0 Updating pom.xml version numbers for release 4.6.0 The revisions that were on this tag are still contained in other references; therefore, this change does not discard any commits from the repository.
[cloudstack] annotated tag shapeblue-4.5.2-15-samlquota deleted (was 7480e5e)
This is an automated email from the ASF dual-hosted git repository. rafael pushed a change to annotated tag shapeblue-4.5.2-15-samlquota in repository https://gitbox.apache.org/repos/asf/cloudstack.git. *** WARNING: tag shapeblue-4.5.2-15-samlquota was deleted! *** tag was 7480e5e This change permanently discards the following revisions: discard 3295fdf Restrict default login to ldap/native users discard c838064 Quota: consolidated lockable account check to a method. Added unit tests to check lockablity of various accounts discard 4d911fc QUOTA: fix admin account check, add debug info for serv ice offering, mv credit entry check to a boolena method discard 3b18d74 CLOUDSTACK-9174: A deleted account results in NPE discard a0c90a3 CLOUDSTACK-9153: When negative credits are added to an account the balance credits can become negative for that account. This will fix will lock the account if quota is enforced. discard 5bead93 CLOUDSTACK-9161: fix the quota marvin test discard 3c7d455 QUOTA: Ensuring that the dates displayed are as per user expectations discard 3a64bd0 fix labels discard 134ea17 Quota: remove comments discard 128be3a CLOUDSTACK-9131: Create a new API to check if the plugin is enabled. discard ec830d4 Quota: future credit netries should be incorporated when the balance is calculated discard 53ce8c0 QUOTA: Brazilian translations discard d928c0d QUOTA: ENSURING THAT THE DATES DISPLAYED ARE AS PER USER EXPECTATIONS discard 068f97a QUOTA: On a rerun the last balance is now getting added discard 07fce09 quota review fixes discard 88266eb quota review fixes discard 6716c9a Quota review fixes discard 58b3769 QUOTA REVIEW FIXES discard f08a3ee QUOTA REVIEW FIXES discard 0151cda CLOUDSTACK-8592: optimization and fixes 1. Process usage entries that have greater than 0 usage 2. Process quota entries only if tariff is non zero 3. If there are credit entries but no balance entry create a dummy balance entry 4. Remove any credit entries that are before the last balance entry when displaying balance statement 5. Bug: write the balance entry, boundary condition discard 517baf9 metrics: fix instance count discard 35bbd4b CLOUDSTACK-8592: making API more UI friendly discard e56c0a0 CLOUDSTACK-8592: disable quota UI if quota service is disabled discard 1e8dc86 CLOUDSTACK-8592: adding summary, full listing and enforce quota fix discard 785a2a1 CLOUDSTACK-8592: fix misc UI and authorization issues discard df5788e CLOUDSTACK-8592: 1. Fixing boundary condition when there is no summary in database, the UI hangs; 2. Tariff edit accounting for bad values and putting limits of date picker discard 98c8862 CLOUDSTACK-8592: merge fixes discard 9deb531 CLOUDSTACK-8592: defining additonal labels discard 16502fd CLOUDSTACK-8592: disable future dates from date picker discard 9eb57e1 CLOUDSTACK-8592: account and domain search added in javascript discard 837a822 CLOUDSTACK-8592: display negative balance in red discard 0b3fc1b CLOUDSTACK-8592: adding currency, page refreshes after update and credit form discard 40c95da CLOUDSTACK-8592: quota UI with summary page linked to quota usage and quota balance discard a05e5c5 CLOUDSTACK-8592: Updated Quota UI with Quota Summary report discard 9de4211 CLOUDSTACK-8592: add start and end date with each quota entry discard ecd6b20 CLOUDSTACK-8592: code review fix for empty check on lists discard 363cd8c CLOUDSTACK-8592: add dummy quota entry of 0 quota use if no quota entries exist for a period discard 8308aa8 CLOUDSTACK-8592: in case of no quota values available for a period return 0 quota usage and 0 balance, instead of throwing invalid param exception on dates discard 9b2cf8a CLOUDSTACK-8592: defined quota labels discard d4415f1 CLOUDSTACK-9020: Increase UI container width by 200px discard 4c50474 CLOUDSTACK-9020: add ipaddress in instances view discard 8deb914 CLOUDSTACK-9020: add instances count in host view, ip address in instances view discard 0d7fe1e3 CLOUDSTACK-9020: Metrics views for CloudStack UI discard 84d5aeb ui/quota: implement a better quota UI plugin discard 662b54b ui/widget: make framework changes to allow for text area input in edit views discard 4b249bd CLOUDSTACK-8592: quota alert test cases are moved to QuotaAlertManagerImplTest discard 9c99d03 CLOUDSTACK-8592: initial ui changes discard db3c1bb CLOUDSTACK-8592: Report quotaSummary command returns quota balance, quota usage and state for all account. discard d9e3b4c CLOUDSTACK-8592: adding quotaUpdateCmd that refreshes quota balances, and, sends alerts and statements discard 42c8cbf CLOUDSTACK-8592: changing default email templates to reflect the fact that exhausted quota may not result in a locked account discard b4462dc CLOUDSTACK-8592: adding balance summary report discard 625406b CLOUDSTACK-8592: adding more test, fine tuning 0 quota conditions
[cloudstack] annotated tag shapeblue-4.6.2.1-05-secfix-vrperf deleted (was 69f849f)
This is an automated email from the ASF dual-hosted git repository. rafael pushed a change to annotated tag shapeblue-4.6.2.1-05-secfix-vrperf in repository https://gitbox.apache.org/repos/asf/cloudstack.git. *** WARNING: tag shapeblue-4.6.2.1-05-secfix-vrperf was deleted! *** tag was 69f849f The revisions that were on this annotated tag are still contained in other references; therefore, this change does not discard any commits from the repository.
[cloudstack] tag shapeblue-4.5.2.0-01-srscanfix deleted (was 6bcefb4)
This is an automated email from the ASF dual-hosted git repository. rafael pushed a change to tag shapeblue-4.5.2.0-01-srscanfix in repository https://gitbox.apache.org/repos/asf/cloudstack.git. *** WARNING: tag shapeblue-4.5.2.0-01-srscanfix was deleted! *** was 6bcefb4 CLOUDSTACK-9586: When using shared storage with Xenserver prepareTemplate does not work when there are more than 1 hosts This change permanently discards the following revisions: discard 6bcefb4 CLOUDSTACK-9586: When using shared storage with Xenserver prepareTemplate does not work when there are more than 1 hosts
[cloudstack] tag shapeblue-4.8.1.1-00 deleted (was 0cd0f98)
This is an automated email from the ASF dual-hosted git repository. rafael pushed a change to tag shapeblue-4.8.1.1-00 in repository https://gitbox.apache.org/repos/asf/cloudstack.git. *** WARNING: tag shapeblue-4.8.1.1-00 was deleted! *** was 0cd0f98 tools: fix checkstyle issue This change permanently discards the following revisions: discard 0cd0f98 tools: fix checkstyle issue
[cloudstack] tag shapeblue-4.5.2-01-drs deleted (was ca5f90b)
This is an automated email from the ASF dual-hosted git repository. rafael pushed a change to tag shapeblue-4.5.2-01-drs in repository https://gitbox.apache.org/repos/asf/cloudstack.git. *** WARNING: tag shapeblue-4.5.2-01-drs was deleted! *** was ca5f90b CLOUDSTACK-9042: VR: DHCP: fix missing DHCP host enties This change permanently discards the following revisions: discard ca5f90b CLOUDSTACK-9042: VR: DHCP: fix missing DHCP host enties discard c7e1d78 CLOUDSTACK-8848: added null pointer guard to new public method discard f63ac08 CLOUDSTACK-8848: ensure power state is up to date when handling missing VMs in powerReport
[cloudstack] annotated tag shapeblue-4.5.2-13-samlquota deleted (was 66d59f5)
This is an automated email from the ASF dual-hosted git repository. rafael pushed a change to annotated tag shapeblue-4.5.2-13-samlquota in repository https://gitbox.apache.org/repos/asf/cloudstack.git. *** WARNING: tag shapeblue-4.5.2-13-samlquota was deleted! *** tag was 66d59f5 The revisions that were on this annotated tag are still contained in other references; therefore, this change does not discard any commits from the repository.
[cloudstack] annotated tag shapeblue-4.5.2-12-samlquota deleted (was c4f09a5)
This is an automated email from the ASF dual-hosted git repository. rafael pushed a change to annotated tag shapeblue-4.5.2-12-samlquota in repository https://gitbox.apache.org/repos/asf/cloudstack.git. *** WARNING: tag shapeblue-4.5.2-12-samlquota was deleted! *** tag was c4f09a5 The revisions that were on this annotated tag are still contained in other references; therefore, this change does not discard any commits from the repository.
[cloudstack] annotated tag shapeblue-4.5.2-02-samlquota deleted (was 0d00c32)
This is an automated email from the ASF dual-hosted git repository. rafael pushed a change to annotated tag shapeblue-4.5.2-02-samlquota in repository https://gitbox.apache.org/repos/asf/cloudstack.git. *** WARNING: tag shapeblue-4.5.2-02-samlquota was deleted! *** tag was 0d00c32 The revisions that were on this annotated tag are still contained in other references; therefore, this change does not discard any commits from the repository.
[cloudstack] tag shapeblue-4.5.2-02-dbconn deleted (was 23c6248)
This is an automated email from the ASF dual-hosted git repository. rafael pushed a change to tag shapeblue-4.5.2-02-dbconn in repository https://gitbox.apache.org/repos/asf/cloudstack.git. *** WARNING: tag shapeblue-4.5.2-02-dbconn was deleted! *** was 23c6248 SUPPORT-69: Async Job Database Connection Timeouts, connection refresh during create volume This change permanently discards the following revisions: discard 23c6248 SUPPORT-69: Async Job Database Connection Timeouts, connection refresh during create volume
[cloudstack] tag shapeblue-4.3.2-01 deleted (was ebf9897)
This is an automated email from the ASF dual-hosted git repository. rafael pushed a change to tag shapeblue-4.3.2-01 in repository https://gitbox.apache.org/repos/asf/cloudstack.git. *** WARNING: tag shapeblue-4.3.2-01 was deleted! *** was ebf9897 CLOUDSTACK-7301, CLOUDSTACK-7947: double check if parent snapshot is removed or not The revisions that were on this tag are still contained in other references; therefore, this change does not discard any commits from the repository.
[cloudstack] tag shapeblue-4.9.0.1-00 deleted (was f441ac0)
This is an automated email from the ASF dual-hosted git repository. rafael pushed a change to tag shapeblue-4.9.0.1-00 in repository https://gitbox.apache.org/repos/asf/cloudstack.git. *** WARNING: tag shapeblue-4.9.0.1-00 was deleted! *** was f441ac0 tools: fix checkstyle version This change permanently discards the following revisions: discard f441ac0 tools: fix checkstyle version
[cloudstack] annotated tag shapeblue-4.5.2-09-samlquota deleted (was 6d7e5d8)
This is an automated email from the ASF dual-hosted git repository. rafael pushed a change to annotated tag shapeblue-4.5.2-09-samlquota in repository https://gitbox.apache.org/repos/asf/cloudstack.git. *** WARNING: tag shapeblue-4.5.2-09-samlquota was deleted! *** tag was 6d7e5d8 The revisions that were on this annotated tag are still contained in other references; therefore, this change does not discard any commits from the repository.
[cloudstack] annotated tag shapeblue-4.5.2-07-samlquota deleted (was 05f434d)
This is an automated email from the ASF dual-hosted git repository. rafael pushed a change to annotated tag shapeblue-4.5.2-07-samlquota in repository https://gitbox.apache.org/repos/asf/cloudstack.git. *** WARNING: tag shapeblue-4.5.2-07-samlquota was deleted! *** tag was 05f434d The revisions that were on this annotated tag are still contained in other references; therefore, this change does not discard any commits from the repository.
[cloudstack] tag shapeblue-4.4.4-00 deleted (was 6f41061)
This is an automated email from the ASF dual-hosted git repository. rafael pushed a change to tag shapeblue-4.4.4-00 in repository https://gitbox.apache.org/repos/asf/cloudstack.git. *** WARNING: tag shapeblue-4.4.4-00 was deleted! *** was 6f41061 Updating pom.xml version numbers for release 4.4.4 The revisions that were on this tag are still contained in other references; therefore, this change does not discard any commits from the repository.
[cloudstack] tag shapeblue-systemvmtemplate-bigvarlog deleted (was 82bf254)
This is an automated email from the ASF dual-hosted git repository. rafael pushed a change to tag shapeblue-systemvmtemplate-bigvarlog in repository https://gitbox.apache.org/repos/asf/cloudstack.git. *** WARNING: tag shapeblue-systemvmtemplate-bigvarlog was deleted! *** was 82bf254 systemvm: reduce verbosity of network rules logging This change permanently discards the following revisions: discard 82bf254 systemvm: reduce verbosity of network rules logging discard beec8ed appliance: increase /var/log partition to max 15GB
[cloudstack] tag shapeblue-4.9.0-00-rc1 deleted (was 643f75a)
This is an automated email from the ASF dual-hosted git repository. rafael pushed a change to tag shapeblue-4.9.0-00-rc1 in repository https://gitbox.apache.org/repos/asf/cloudstack.git. *** WARNING: tag shapeblue-4.9.0-00-rc1 was deleted! *** was 643f75a Updating pom.xml version numbers for release 4.9.0 The revisions that were on this tag are still contained in other references; therefore, this change does not discard any commits from the repository.
[cloudstack] tag shapeblue-4.6.2.1-02-netupgrade deleted (was a3ff3e7)
This is an automated email from the ASF dual-hosted git repository. rafael pushed a change to tag shapeblue-4.6.2.1-02-netupgrade in repository https://gitbox.apache.org/repos/asf/cloudstack.git. *** WARNING: tag shapeblue-4.6.2.1-02-netupgrade was deleted! *** was a3ff3e7 Backport of CLOUDSTACK-9296 (#1) The revisions that were on this tag are still contained in other references; therefore, this change does not discard any commits from the repository.
[cloudstack] tag shapeblue-4.8.0-01-agent-jdkfix deleted (was ac6ab0d)
This is an automated email from the ASF dual-hosted git repository. rafael pushed a change to tag shapeblue-4.8.0-01-agent-jdkfix in repository https://gitbox.apache.org/repos/asf/cloudstack.git. *** WARNING: tag shapeblue-4.8.0-01-agent-jdkfix was deleted! *** was ac6ab0d packaging: remove openjdk install deps on cloudstack-agent This change permanently discards the following revisions: discard ac6ab0d packaging: remove openjdk install deps on cloudstack-agent
[cloudstack] tag shapeblue-4.8.0-01-oraclejdk-agent deleted (was 5318f16)
This is an automated email from the ASF dual-hosted git repository. rafael pushed a change to tag shapeblue-4.8.0-01-oraclejdk-agent in repository https://gitbox.apache.org/repos/asf/cloudstack.git. *** WARNING: tag shapeblue-4.8.0-01-oraclejdk-agent was deleted! *** was 5318f16 packaging: remove openjdk install deps on cloudstack-agent The revisions that were on this tag are still contained in other references; therefore, this change does not discard any commits from the repository.
[cloudstack] tag shapeblue-4.5.3-00-vmwarediskcontroller deleted (was 6a55d87)
This is an automated email from the ASF dual-hosted git repository. rafael pushed a change to tag shapeblue-4.5.3-00-vmwarediskcontroller in repository https://gitbox.apache.org/repos/asf/cloudstack.git. *** WARNING: tag shapeblue-4.5.3-00-vmwarediskcontroller was deleted! *** was 6a55d87 CLOUDSTACK-4787: Allow users to select disk controller for VM/template This change permanently discards the following revisions: discard 6a55d87 CLOUDSTACK-4787: Allow users to select disk controller for VM/template discard 81571b2 CLOUDSTACK-4787 Allow selection of scsi controller type in vSphere
[cloudstack] tag shapeblue-4.6.1-00 deleted (was beb840f)
This is an automated email from the ASF dual-hosted git repository. rafael pushed a change to tag shapeblue-4.6.1-00 in repository https://gitbox.apache.org/repos/asf/cloudstack.git. *** WARNING: tag shapeblue-4.6.1-00 was deleted! *** was beb840f Updating pom.xml version numbers for release 4.6.1 The revisions that were on this tag are still contained in other references; therefore, this change does not discard any commits from the repository.
[cloudstack] tag shapeblue-4.5.2-saml deleted (was 8bb0a70)
This is an automated email from the ASF dual-hosted git repository. rafael pushed a change to tag shapeblue-4.5.2-saml in repository https://gitbox.apache.org/repos/asf/cloudstack.git. *** WARNING: tag shapeblue-4.5.2-saml was deleted! *** was 8bb0a70 CLOUDSTACK-8457: SAML auth plugin improvements for production usage This change permanently discards the following revisions: discard 8bb0a70 CLOUDSTACK-8457: SAML auth plugin improvements for production usage discard 76868f5 cloudstack: Change version to 4.5.2 discard e1f650f 4.4.4 to 4.5.2 upgrade discard 7520c60 engine: add upgrade path from 4.5.1 to 4.5.2 discard 11a6073 schema: fix foreign key checks for 3.0.7 to 4.1.0 upgrade path discard 95b46de Adding upgrade path to go with current 4.5.2 version for this branch
[cloudstack] annotated tag shapeblue-4.5.2-14-samlquota deleted (was e8b6e81)
This is an automated email from the ASF dual-hosted git repository. rafael pushed a change to annotated tag shapeblue-4.5.2-14-samlquota in repository https://gitbox.apache.org/repos/asf/cloudstack.git. *** WARNING: tag shapeblue-4.5.2-14-samlquota was deleted! *** tag was e8b6e81 The revisions that were on this annotated tag are still contained in other references; therefore, this change does not discard any commits from the repository.
[cloudstack] annotated tag shapeblue-4.5.2-10-samlquota deleted (was 9c144e6)
This is an automated email from the ASF dual-hosted git repository. rafael pushed a change to annotated tag shapeblue-4.5.2-10-samlquota in repository https://gitbox.apache.org/repos/asf/cloudstack.git. *** WARNING: tag shapeblue-4.5.2-10-samlquota was deleted! *** tag was 9c144e6 The revisions that were on this annotated tag are still contained in other references; therefore, this change does not discard any commits from the repository.
[cloudstack] annotated tag shapeblue-4.5.2-11-samlquota deleted (was dc108a8)
This is an automated email from the ASF dual-hosted git repository. rafael pushed a change to annotated tag shapeblue-4.5.2-11-samlquota in repository https://gitbox.apache.org/repos/asf/cloudstack.git. *** WARNING: tag shapeblue-4.5.2-11-samlquota was deleted! *** tag was dc108a8 The revisions that were on this annotated tag are still contained in other references; therefore, this change does not discard any commits from the repository.
[cloudstack] annotated tag shapeblue-4.5.2-08-samlquota deleted (was 4f2525a)
This is an automated email from the ASF dual-hosted git repository. rafael pushed a change to annotated tag shapeblue-4.5.2-08-samlquota in repository https://gitbox.apache.org/repos/asf/cloudstack.git. *** WARNING: tag shapeblue-4.5.2-08-samlquota was deleted! *** tag was 4f2525a The revisions that were on this annotated tag are still contained in other references; therefore, this change does not discard any commits from the repository.
[cloudstack] annotated tag shapeblue-4.5.2-04-samlquota deleted (was 7493b54)
This is an automated email from the ASF dual-hosted git repository. rafael pushed a change to annotated tag shapeblue-4.5.2-04-samlquota in repository https://gitbox.apache.org/repos/asf/cloudstack.git. *** WARNING: tag shapeblue-4.5.2-04-samlquota was deleted! *** tag was 7493b54 The revisions that were on this annotated tag are still contained in other references; therefore, this change does not discard any commits from the repository.
[cloudstack] annotated tag shapeblue-4.5.2-06-samlquota deleted (was f24d47b)
This is an automated email from the ASF dual-hosted git repository. rafael pushed a change to annotated tag shapeblue-4.5.2-06-samlquota in repository https://gitbox.apache.org/repos/asf/cloudstack.git. *** WARNING: tag shapeblue-4.5.2-06-samlquota was deleted! *** tag was f24d47b The revisions that were on this annotated tag are still contained in other references; therefore, this change does not discard any commits from the repository.
[cloudstack] tag shapeblue-4.5.2-02-dbconn-an deleted (was d89d1ee)
This is an automated email from the ASF dual-hosted git repository. rafael pushed a change to tag shapeblue-4.5.2-02-dbconn-an in repository https://gitbox.apache.org/repos/asf/cloudstack.git. *** WARNING: tag shapeblue-4.5.2-02-dbconn-an was deleted! *** was d89d1ee framework/db: add checkConnection method This change permanently discards the following revisions: discard d89d1ee framework/db: add checkConnection method discard 3c30e97 SUPPORT-69: Async Job Database Connection Timeouts, connection refresh during create volume
[cloudstack] annotated tag shapeblue-4.5.2-02-vmware-disks deleted (was 0ea5d70)
This is an automated email from the ASF dual-hosted git repository. rafael pushed a change to annotated tag shapeblue-4.5.2-02-vmware-disks in repository https://gitbox.apache.org/repos/asf/cloudstack.git. *** WARNING: tag shapeblue-4.5.2-02-vmware-disks was deleted! *** tag was 0ea5d70 The revisions that were on this annotated tag are still contained in other references; therefore, this change does not discard any commits from the repository.
[cloudstack] annotated tag shapeblue-4.5.2-03-listtemplates deleted (was 588b993)
This is an automated email from the ASF dual-hosted git repository. rafael pushed a change to annotated tag shapeblue-4.5.2-03-listtemplates in repository https://gitbox.apache.org/repos/asf/cloudstack.git. *** WARNING: tag shapeblue-4.5.2-03-listtemplates was deleted! *** tag was 588b993 This change permanently discards the following revisions: discard 2eda5a8 CLOUDSTACK-9376: Restrict listTemplates API with filter=all for root admin discard a4677f7 vmware: fix NPE case, disk controller improvements discard 8393108 vmware: support for listing pci device path discard b6a6add vmware: improve support for disk controllers discard dd2d886 CLOUDSTACK-4787: Allow users to select disk controller for VM/template discard 683a344 CLOUDSTACK-4787 Allow selection of scsi controller type in vSphere
[cloudstack] annotated tag shapeblue-4.5.2-01-vmware-disks deleted (was 708c460)
This is an automated email from the ASF dual-hosted git repository. rafael pushed a change to annotated tag shapeblue-4.5.2-01-vmware-disks in repository https://gitbox.apache.org/repos/asf/cloudstack.git. *** WARNING: tag shapeblue-4.5.2-01-vmware-disks was deleted! *** tag was 708c460 The revisions that were on this annotated tag are still contained in other references; therefore, this change does not discard any commits from the repository.
[cloudstack] tag shapeblue-4.5.2-00 deleted (was 7385441)
This is an automated email from the ASF dual-hosted git repository. rafael pushed a change to tag shapeblue-4.5.2-00 in repository https://gitbox.apache.org/repos/asf/cloudstack.git. *** WARNING: tag shapeblue-4.5.2-00 was deleted! *** was 7385441 Updating pom.xml version numbers for release 4.5.2 The revisions that were on this tag are still contained in other references; therefore, this change does not discard any commits from the repository.
[cloudstack] tag 4.9.2.0-shapeblue1 deleted (was 044ae8a)
This is an automated email from the ASF dual-hosted git repository. rafael pushed a change to tag 4.9.2.0-shapeblue1 in repository https://gitbox.apache.org/repos/asf/cloudstack.git. *** WARNING: tag 4.9.2.0-shapeblue1 was deleted! *** was 044ae8a CLOUDSTACK-9363: Fix HVM VM restart bug in XenServer The revisions that were on this tag are still contained in other references; therefore, this change does not discard any commits from the repository.
[cloudstack] tag shapeblue-4.4.3-00 deleted (was 97949bc)
This is an automated email from the ASF dual-hosted git repository. rafael pushed a change to tag shapeblue-4.4.3-00 in repository https://gitbox.apache.org/repos/asf/cloudstack.git. *** WARNING: tag shapeblue-4.4.3-00 was deleted! *** was 97949bc Updating pom.xml version numbers for release 4.4.3 This change permanently discards the following revisions: discard 97949bc Updating pom.xml version numbers for release 4.4.3
[cloudstack] tag shapeblue-4.5.1-00 deleted (was 54f3e77)
This is an automated email from the ASF dual-hosted git repository. rafael pushed a change to tag shapeblue-4.5.1-00 in repository https://gitbox.apache.org/repos/asf/cloudstack.git. *** WARNING: tag shapeblue-4.5.1-00 was deleted! *** was 54f3e77 debian: allow openjdk1.8 as optional dependency The revisions that were on this tag are still contained in other references; therefore, this change does not discard any commits from the repository.
[cloudstack] tag 4.9.2.0-shapeblue2 deleted (was b24948b)
This is an automated email from the ASF dual-hosted git repository. rafael pushed a change to tag 4.9.2.0-shapeblue2 in repository https://gitbox.apache.org/repos/asf/cloudstack.git. *** WARNING: tag 4.9.2.0-shapeblue2 was deleted! *** was b24948b VR: use a different delimiter and force stdout from get_template_version This change permanently discards the following revisions: discard b24948b VR: use a different delimiter and force stdout from get_template_version discard 044ae8a CLOUDSTACK-9363: Fix HVM VM restart bug in XenServer
[cloudstack] tag 4.9.1.0-vr-perf-shapeblue1 deleted (was 93c108f)
This is an automated email from the ASF dual-hosted git repository. rafael pushed a change to tag 4.9.1.0-vr-perf-shapeblue1 in repository https://gitbox.apache.org/repos/asf/cloudstack.git. *** WARNING: tag 4.9.1.0-vr-perf-shapeblue1 was deleted! *** was 93c108f CLOUDSTACK-9583: VR: In CsDhcp.py preseed both hostaname and localhost to resolve to 127.0.0.1 This change permanently discards the following revisions: discard 93c108f CLOUDSTACK-9583: VR: In CsDhcp.py preseed both hostaname and localhost to resolve to 127.0.0.1 discard 06a0144 CLOUDSTACK-9503: Increased the VR script timeout. Most of the changes are about converting int/long time values to joda Duration.
[cloudstack] annotated tag 4.5.2.1-shapeblue4-xenserver-local-storage deleted (was 7051c34)
This is an automated email from the ASF dual-hosted git repository. rafael pushed a change to annotated tag 4.5.2.1-shapeblue4-xenserver-local-storage in repository https://gitbox.apache.org/repos/asf/cloudstack.git. *** WARNING: tag 4.5.2.1-shapeblue4-xenserver-local-storage was deleted! *** tag was 7051c34 This change permanently discards the following revisions: discard 3ae1a9b CLOUDSTACK-9586: Marvin test to check if the templates are downloaded to the primary store successfully discard 6861433 CLOUDSTACK-9586: When using shared storage with Xenserver prepareTemplate does not work when there are more than 1 hosts discard c8e53b7 CLOUDSTACK-9544: Check access on account trying to generate user API keys
[cloudstack] tag 4.9.0.0-vr-perfm-shapeblue1 deleted (was 0281541)
This is an automated email from the ASF dual-hosted git repository. rafael pushed a change to tag 4.9.0.0-vr-perfm-shapeblue1 in repository https://gitbox.apache.org/repos/asf/cloudstack.git. *** WARNING: tag 4.9.0.0-vr-perfm-shapeblue1 was deleted! *** was 0281541 CLOUDSTACK-9583: VR: In CsDhcp.py preseed both hostaname and localhost to resolve to 127.0.0.1 This change permanently discards the following revisions: discard 0281541 CLOUDSTACK-9583: VR: In CsDhcp.py preseed both hostaname and localhost to resolve to 127.0.0.1 discard 41c9e77 CLOUDSTACK-9503: Increased the VR script timeout. Most of the changes are about converting int/long time values to joda Duration. discard 71318f4 CLOUDSTACK-9463: Fix dynamic-roles migrate script for old format discard c809058 CLOUDSTACK-9459: the try's catch block was shortening the preparedstatement life resulting in bad resultset when used outside of try catch.
[cloudstack] branch master updated: VMTemplateZone needs some love (#1730)
This is an automated email from the ASF dual-hosted git repository.
rafael pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/cloudstack.git
The following commit(s) were added to refs/heads/master by this push:
new cea8036 VMTemplateZone needs some love (#1730)
cea8036 is described below
commit cea8036732426d41209184bfb94c9d061b07f229
Author: Marc-Aurèle Brothier
AuthorDate: Thu Jan 10 11:55:09 2019 +0100
VMTemplateZone needs some love (#1730)
It's incorrect to use the findIncludingRemovedBy and
listIncludingRemovedBy for the common list and find operation.
Signed-off-by: Marc-Aurèle Brothier
---
.../src/main/java/com/cloud/storage/dao/VMTemplateZoneDaoImpl.java | 7 +++
1 file changed, 3 insertions(+), 4 deletions(-)
diff --git
a/engine/schema/src/main/java/com/cloud/storage/dao/VMTemplateZoneDaoImpl.java
b/engine/schema/src/main/java/com/cloud/storage/dao/VMTemplateZoneDaoImpl.java
index bffe209..21b3150 100644
---
a/engine/schema/src/main/java/com/cloud/storage/dao/VMTemplateZoneDaoImpl.java
+++
b/engine/schema/src/main/java/com/cloud/storage/dao/VMTemplateZoneDaoImpl.java
@@ -55,14 +55,14 @@ public class VMTemplateZoneDaoImpl extends
GenericDaoBase listByZoneId(long id) {
SearchCriteria sc = ZoneSearch.create();
sc.setParameters("zone_id", id);
-return listIncludingRemovedBy(sc);
+return listBy(sc);
}
@Override
public List listByTemplateId(long templateId) {
SearchCriteria sc = TemplateSearch.create();
sc.setParameters("template_id", templateId);
-return listIncludingRemovedBy(sc);
+return listBy(sc);
}
@Override
@@ -70,7 +70,7 @@ public class VMTemplateZoneDaoImpl extends
GenericDaoBase sc = ZoneTemplateSearch.create();
sc.setParameters("zone_id", zoneId);
sc.setParameters("template_id", templateId);
-return findOneIncludingRemovedBy(sc);
+return findOneBy(sc);
}
@Override
@@ -91,7 +91,6 @@ public class VMTemplateZoneDaoImpl extends
GenericDaoBase
[cloudstack] branch master updated: Remove unsused "umount" method (#1499)
This is an automated email from the ASF dual-hosted git repository.
rafael pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/cloudstack.git
The following commit(s) were added to refs/heads/master by this push:
new 3013305 Remove unsused "umount" method (#1499)
3013305 is described below
commit 301330528cfd27beefc94615a94d5d560b26f600
Author: Alexandre de Limas Santana
AuthorDate: Wed Jan 9 19:41:51 2019 -0200
Remove unsused "umount" method (#1499)
---
.../resource/NfsSecondaryStorageResource.java | 23 --
1 file changed, 23 deletions(-)
diff --git
a/services/secondary-storage/server/src/main/java/org/apache/cloudstack/storage/resource/NfsSecondaryStorageResource.java
b/services/secondary-storage/server/src/main/java/org/apache/cloudstack/storage/resource/NfsSecondaryStorageResource.java
index 46fa170..3dc6775 100644
---
a/services/secondary-storage/server/src/main/java/org/apache/cloudstack/storage/resource/NfsSecondaryStorageResource.java
+++
b/services/secondary-storage/server/src/main/java/org/apache/cloudstack/storage/resource/NfsSecondaryStorageResource.java
@@ -2807,29 +2807,6 @@ public class NfsSecondaryStorageResource extends
ServerResourceBase implements S
return dir;
}
-protected void umount(String localRootPath, URI uri) {
-ensureLocalRootPathExists(localRootPath, uri);
-
-if (!mountExists(localRootPath, uri)) {
-return;
-}
-
-Script command = new Script(!_inSystemVM, "mount", _timeout, s_logger);
-command.add(localRootPath);
-String result = command.execute();
-if (result != null) {
-// Fedora Core 12 errors out with any -o option executed from java
-String errMsg = "Unable to umount " + localRootPath + " due to " +
result;
-s_logger.error(errMsg);
-File file = new File(localRootPath);
-if (file.exists()) {
-file.delete();
-}
-throw new CloudRuntimeException(errMsg);
-}
-s_logger.debug("Successfully umounted " + localRootPath);
-}
-
protected void mount(String localRootPath, String remoteDevice, URI uri,
Integer nfsVersion) {
s_logger.debug("mount " + uri.toString() + " on " + localRootPath +
((nfsVersion != null) ? " nfsVersion=" + nfsVersion : ""));
ensureLocalRootPathExists(localRootPath, uri);
[cloudstack-documentation] branch 4.11 updated: Updated the linux password script location (#25)
This is an automated email from the ASF dual-hosted git repository. rafael pushed a commit to branch 4.11 in repository https://gitbox.apache.org/repos/asf/cloudstack-documentation.git The following commit(s) were added to refs/heads/4.11 by this push: new d61d226 Updated the linux password script location (#25) d61d226 is described below commit d61d226220043f2a5c8a1648aab048b40bff930f Author: Glenn Wagner AuthorDate: Wed Jan 9 18:22:11 2019 +0200 Updated the linux password script location (#25) --- source/adminguide/templates/_password.rst | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/source/adminguide/templates/_password.rst b/source/adminguide/templates/_password.rst index dffde52..eab791e 100644 --- a/source/adminguide/templates/_password.rst +++ b/source/adminguide/templates/_password.rst @@ -48,8 +48,8 @@ Use the following steps to begin the Linux OS installation: #. Download the script file cloud-set-guest-password: - - `http://download.cloud.com/templates/4.2/bindir/cloud-set-guest-password.in - <http://download.cloud.com/templates/4.2/bindir/cloud-set-guest-password.in>`_ + - `https://github.com/apache/cloudstack/blob/master/setup/bindir/cloud-set-guest-password.in + <https://github.com/apache/cloudstack/blob/master/setup/bindir/cloud-set-guest-password.in>`_ #. Rename the file:
[cloudstack-documentation] branch master updated: source/developersguide: removed extra http:// (#23)
This is an automated email from the ASF dual-hosted git repository. rafael pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/cloudstack-documentation.git The following commit(s) were added to refs/heads/master by this push: new 99637bf source/developersguide: removed extra http:// (#23) 99637bf is described below commit 99637bfdb62f689679df6511ea1837116790a7d1 Author: James McClune AuthorDate: Wed Jan 9 09:51:53 2019 -0500 source/developersguide: removed extra http:// (#23) In the Signing API Requests example, there are duplicate HTTP protocol definitions together. Signed-off-by: James McClune --- source/developersguide/dev.rst | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/source/developersguide/dev.rst b/source/developersguide/dev.rst index 7c7b31b..6aaef57 100644 --- a/source/developersguide/dev.rst +++ b/source/developersguide/dev.rst @@ -136,7 +136,7 @@ To show how to sign a request, we will re-use the previous example. .. parsed-literal:: - http://http://localhost:8080/client/api?command=deployVirtualMachine&serviceOfferingId=1&diskOfferingId=1&templateId=2&zoneId=4&apiKey=miVr6X7u6bN_sdahOBpjNejPgEsT35eXq-jB8CG20YI3yaxXcgpyuaIRmFI_EJTVwZ0nUkkJbPmY3y2bciKwFQ&signature=Lxx1DM40AjcXU%2FcaiK8RAP0O1hU%3D + http://localhost:8080/client/api?command=deployVirtualMachine&serviceOfferingId=1&diskOfferingId=1&templateId=2&zoneId=4&apiKey=miVr6X7u6bN_sdahOBpjNejPgEsT35eXq-jB8CG20YI3yaxXcgpyuaIRmFI_EJTVwZ0nUkkJbPmY3y2bciKwFQ&signature=Lxx1DM40AjcXU%2FcaiK8RAP0O1hU%3D Breaking this down, we have several distinct parts to this URL.
[cloudstack] branch master updated: Allow KVM VM live migration with ROOT volume on file storage type (#2997)
This is an automated email from the ASF dual-hosted git repository.
rafael pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/cloudstack.git
The following commit(s) were added to refs/heads/master by this push:
new bf20940 Allow KVM VM live migration with ROOT volume on file storage
type (#2997)
bf20940 is described below
commit bf209405e7d60b6a5abf87677d368c429359d98a
Author: Gabriel Beims Bräscher
AuthorDate: Fri Dec 14 09:01:28 2018 -0200
Allow KVM VM live migration with ROOT volume on file storage type (#2997)
* Allow KVM VM live migration with ROOT volume on file
* Allow KVM VM live migration with ROOT volume on file
- Add JUnit tests
* Address reviewers and change some variable names to ease future
implementation (developers can easily guess the name and use
autocomplete)
---
.../com/cloud/agent/api/to/VirtualMachineTO.java | 9 +
api/src/main/java/com/cloud/vm/DiskProfile.java| 1 +
.../java/com/cloud/agent/api/MigrateCommand.java | 20 ++
.../KvmNonManagedStorageDataMotionStrategy.java| 143
.../motion/StorageSystemDataMotionStrategy.java| 122 +++---
...g-engine-storage-datamotion-storage-context.xml | 2 +
.../KvmNonManagedStorageSystemDataMotionTest.java | 256 +
.../StorageSystemDataMotionStrategyTest.java | 181 ---
.../hypervisor/kvm/resource/MigrateKVMAsync.java | 41 +++-
.../wrapper/LibvirtCreateCommandWrapper.java | 2 +-
.../wrapper/LibvirtMigrateCommandWrapper.java | 56 -
.../kvm/storage/IscsiAdmStorageAdaptor.java| 3 +-
.../kvm/storage/KVMStoragePoolManager.java | 27 ++-
.../kvm/resource/LibvirtComputingResourceTest.java | 3 +-
.../wrapper/LibvirtMigrateCommandWrapperTest.java | 132 ++-
.../CloudStackPrimaryDataStoreDriverImpl.java | 4 +-
.../com/cloud/hypervisor/HypervisorGuruBase.java | 1 +
17 files changed, 899 insertions(+), 104 deletions(-)
diff --git a/api/src/main/java/com/cloud/agent/api/to/VirtualMachineTO.java
b/api/src/main/java/com/cloud/agent/api/to/VirtualMachineTO.java
index f977a1c..e5623ac 100644
--- a/api/src/main/java/com/cloud/agent/api/to/VirtualMachineTO.java
+++ b/api/src/main/java/com/cloud/agent/api/to/VirtualMachineTO.java
@@ -28,6 +28,7 @@ public class VirtualMachineTO {
private long id;
private String name;
private BootloaderType bootloader;
+private VirtualMachine.State state;
Type type;
int cpus;
@@ -147,6 +148,14 @@ public class VirtualMachineTO {
this.bootloader = bootloader;
}
+public VirtualMachine.State getState() {
+return state;
+}
+
+public void setState(VirtualMachine.State state) {
+this.state = state;
+}
+
public int getCpus() {
return cpus;
}
diff --git a/api/src/main/java/com/cloud/vm/DiskProfile.java
b/api/src/main/java/com/cloud/vm/DiskProfile.java
index a1e5faa..2b76c68 100644
--- a/api/src/main/java/com/cloud/vm/DiskProfile.java
+++ b/api/src/main/java/com/cloud/vm/DiskProfile.java
@@ -72,6 +72,7 @@ public class DiskProfile {
offering.isCustomized(),
null);
this.hyperType = hyperType;
+this.provisioningType = offering.getProvisioningType();
}
public DiskProfile(DiskProfile dp) {
diff --git a/core/src/main/java/com/cloud/agent/api/MigrateCommand.java
b/core/src/main/java/com/cloud/agent/api/MigrateCommand.java
index 3e7dfc1..e31287c 100644
--- a/core/src/main/java/com/cloud/agent/api/MigrateCommand.java
+++ b/core/src/main/java/com/cloud/agent/api/MigrateCommand.java
@@ -19,7 +19,9 @@
package com.cloud.agent.api;
+import java.util.ArrayList;
import java.util.HashMap;
+import java.util.List;
import java.util.Map;
import com.cloud.agent.api.to.VirtualMachineTO;
@@ -33,6 +35,7 @@ public class MigrateCommand extends Command {
private boolean isWindows;
private VirtualMachineTO vmTO;
private boolean executeInSequence = false;
+private List migrateDiskInfoList = new ArrayList<>();
protected MigrateCommand() {
}
@@ -90,6 +93,14 @@ public class MigrateCommand extends Command {
return executeInSequence;
}
+public List getMigrateDiskInfoList() {
+return migrateDiskInfoList;
+}
+
+public void setMigrateDiskInfoList(List
migrateDiskInfoList) {
+this.migrateDiskInfoList = migrateDiskInfoList;
+}
+
public static class MigrateDiskInfo {
public enum DiskType {
FILE, BLOCK;
@@ -123,6 +134,7 @@ public class MigrateCommand extends Command {
private final DriverType driverType;
private final Source source;
private final String sourceText;
+private boolean isSourceDiskOnStorageFileSystem;
public MigrateDiskInfo(final String serialNumber, final DiskType
diskType, final DriverType driverType, final Source
[cloudstack-documentation] branch master updated: Update Quick Installation Guide (#13)
This is an automated email from the ASF dual-hosted git repository. rafael pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/cloudstack-documentation.git The following commit(s) were added to refs/heads/master by this push: new 10903b7 Update Quick Installation Guide (#13) 10903b7 is described below commit 10903b74105ea4f8f15a995f6b19dacd2445b8bf Author: AlexBeez <44407345+alexb...@users.noreply.github.com> AuthorDate: Fri Nov 23 12:16:21 2018 -0500 Update Quick Installation Guide (#13) * Update qig.rst Updated to CentOS7, fixed networking to reflect required configuration * Updates to the cloubr0 configuration * Added instructions to disable firewall * Fixing ethernet device configuration segment * Simplify default ethernet device configuration. * fix systemvm version to 4.11.1 --- source/quickinstallationguide/qig.rst | 186 +- 1 file changed, 95 insertions(+), 91 deletions(-) diff --git a/source/quickinstallationguide/qig.rst b/source/quickinstallationguide/qig.rst index c527a60..5307c18 100644 --- a/source/quickinstallationguide/qig.rst +++ b/source/quickinstallationguide/qig.rst @@ -1,6 +1,6 @@ .. 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# + 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 @@ -34,7 +34,7 @@ High level overview of the process ~~ This runbook will focus on building a CloudStack cloud using KVM on CentOS -6.8 with NFS storage on a flat layer-2 network utilizing layer-3 network +7.5 with NFS storage on a flat layer-2 network utilizing layer-3 network isolation (aka Security Groups), and doing it all on a single piece of hardware. @@ -53,8 +53,8 @@ To complete this runbook you'll need the following items: #. At least one computer which supports and has enabled hardware virtualization. -#. The `CentOS 6.8 x86_64 minimal install CD - <http://mirrors.kernel.org/centos/6/isos/x86_64/>`_ +#. An `CentOS 7.5 x86_64 install ISO, on bootable media + <http://mirrors.kernel.org/centos/7/isos/x86_64/>`_ #. A /24 network with the gateway being at xxx.xxx.xxx.1, no DHCP should be on this network and none of the computers running CloudStack will have a @@ -71,14 +71,23 @@ CloudStack. We will go over the steps to prepare now. Operating System -Using the CentOS 6.8 x86_64 minimal install ISO, you'll need to install CentOS 6 +Using the CentOS 7.5 x86_64 install ISO, you'll need to install CentOS 7 on your hardware. The defaults will generally be acceptable for this -installation. +installation. You may want to configure network configuration during +setup - either using the guidelines below, or using a standard access +configuration which we will modify later. -Once this installation is complete, you'll want to connect to your freshly -installed machine via SSH as the root user. Note that you should not allow -root logins in a production environment, so be sure to turn off remote logins -once you have finished the installation and configuration. +Once this installation is complete, you'll want to gain access to your +server - through SSH (if network is configured) or connected peripherals. +Note that you should not allow remote root logins in a production +environment, so be sure to turn off this feature once the installation +and configuration is complete. + +If your network interface was configured to grant the server internet +access, it is always wise to update the system before starting: + +.. parsed-literal:: + # yum -y upgrade .. _conf-network: @@ -86,76 +95,76 @@ once you have finished the installation and configuration. Configuring the network ^^^ -By default the network will not come up on your hardware and you will need to -configure it to work in your environment. Since we specified that there will -be no DHCP server in this environment we will be manually configuring your -network interface. We will assume, for the purposes of this exercise, that -eth0 is the only network interface that will be connected and used. - -Connecting via the console you should login as root. Check the file -/etc/sysconfig/network-scripts/ifcfg-eth0, it will look like this by default: +Unless you have configured it during install, which will not be covered by +this guide, the network interface will not come up on your hardware and you +will need to configure it to work in your environment. Since we specified +that there will be no DHCP server in this environment we
[cloudstack] branch master updated: Fix delete domain button in the UI to update only after job finishes (#2905)
This is an automated email from the ASF dual-hosted git repository.
rafael pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/cloudstack.git
The following commit(s) were added to refs/heads/master by this push:
new 63094b2 Fix delete domain button in the UI to update only after job
finishes (#2905)
63094b2 is described below
commit 63094b2fbf7a8ee7e6f4d109c9d33a155358eaa7
Author: Rafael Weingärtner
AuthorDate: Sun Nov 11 18:41:37 2018 -0200
Fix delete domain button in the UI to update only after job finishes (#2905)
When the “deleteDomain” command is sent via UI, the HTML is already updated
assuming that the “deleteDomain” command will actually delete it. However,
there are cases (domain with allocated resources) that will not allow ACS to
remove the command; as a consequence, the UI will not be in sync with ACS
state, which can lead to misunderstandings.
---
ui/scripts/domains.js | 12
1 file changed, 12 insertions(+)
diff --git a/ui/scripts/domains.js b/ui/scripts/domains.js
index 1f65ff4..9e96f49 100644
--- a/ui/scripts/domains.js
+++ b/ui/scripts/domains.js
@@ -69,11 +69,23 @@
async: false,
success: function(json) {
var jid = json.deletedomainresponse.jobid;
+var wasDomainDeletedWithSuccess = false;
+$.ajax({
+url:
createURL("queryAsyncJobResult&jobId=" + jid),
+dataType: "json",
+async: false,
+success: function(json) {
+wasDomainDeletedWithSuccess =
json.queryasyncjobresultresponse.jobresultcode == 0;
+}
+});
args.response.success({
_custom: {
jobId: jid
}
});
+if(!wasDomainDeletedWithSuccess){
+return;
+}
// Quick fix for proper UI reaction to
delete domain
var $item =
$('.name.selected').closest('li');
[cloudstack-documentation] branch master updated: updated jasypt version for change db password (#19)
This is an automated email from the ASF dual-hosted git repository. rafael pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/cloudstack-documentation.git The following commit(s) were added to refs/heads/master by this push: new 849727c updated jasypt version for change db password (#19) 849727c is described below commit 849727cc589f6f411155ef668465eae46273fe42 Author: James McClune AuthorDate: Fri Nov 9 05:59:24 2018 -0500 updated jasypt version for change db password (#19) In later versions of CloudStack (i.e. 4.11), the jasypt .jar in /usr/share/cloudstack-common/lib is version 1.9.2. Signed-off-by: James McClune --- source/adminguide/management.rst | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/source/adminguide/management.rst b/source/adminguide/management.rst index d45def1..c395542 100644 --- a/source/adminguide/management.rst +++ b/source/adminguide/management.rst @@ -150,7 +150,7 @@ add the encrypted password to .. code:: bash - # java -classpath /usr/share/cloudstack-common/lib/jasypt-1.9.0.jar \ org.jasypt.intf.cli.JasyptPBEStringEncryptionCLI encrypt.sh \ input="newpassword123" password="`cat /etc/cloudstack/management/key`" \ verbose=false + # java -classpath /usr/share/cloudstack-common/lib/jasypt-1.9.2.jar \ org.jasypt.intf.cli.JasyptPBEStringEncryptionCLI encrypt.sh \ input="newpassword123" password="`cat /etc/cloudstack/management/key`" \ verbose=false File encryption type
[cloudstack] branch master updated: add exitcode / distribution detection and remove export CGROUP_DAEMON for RHEL7/CentOS7 (#2896)
This is an automated email from the ASF dual-hosted git repository.
rafael pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/cloudstack.git
The following commit(s) were added to refs/heads/master by this push:
new e44fc4a add exitcode / distribution detection and remove export
CGROUP_DAEMON for RHEL7/CentOS7 (#2896)
e44fc4a is described below
commit e44fc4af68c6df56398c854121c892208733bc6e
Author: Sven Vogel <5433844+svenvo...@users.noreply.github.com>
AuthorDate: Wed Nov 7 21:22:20 2018 +0100
add exitcode / distribution detection and remove export CGROUP_DAEMON for
RHEL7/CentOS7 (#2896)
* task/add distribution detection, remove export CGROUP_DAEMON='cpu:/virt'
* taks/add exit values
* change exit codes
* split redhat and centos / change ubuntu to /etc/lsb-release file
* turn around centos and rhel, we need first check for centos then rhel
* set variable distro to None
---
python/lib/cloudutils/serviceConfig.py | 29 -
1 file changed, 28 insertions(+), 1 deletion(-)
diff --git a/python/lib/cloudutils/serviceConfig.py
b/python/lib/cloudutils/serviceConfig.py
index 2b27868..994c822 100755
--- a/python/lib/cloudutils/serviceConfig.py
+++ b/python/lib/cloudutils/serviceConfig.py
@@ -23,6 +23,32 @@ from configFileOps import configFileOps
import os
import shutil
+# exit() error constants
+Unknown = 0
+CentOS6 = 1
+CentOS7 = 2
+Ubuntu = 3
+RHEL6 = 4
+RHEL7 = 5
+distro = None
+
+#=== DISTRIBUTION DETECTION =
+if os.path.exists("/etc/centos-release"):
+version = file("/etc/centos-release").readline()
+if version.find("CentOS release 6") != -1:
+ distro = CentOS6
+elif version.find("CentOS Linux release 7") != -1:
+ distro = CentOS7
+elif os.path.exists("/etc/redhat-release"):
+version = file("/etc/redhat-release").readline()
+if version.find("Red Hat Enterprise Linux Server release 6") != -1:
+ distro = RHEL6
+elif version.find("Red Hat Enterprise Linux Server 7") != -1:
+ distro = RHEL7
+elif os.path.exists("/etc/lsb-release") and "Ubuntu" in
file("/etc/lsb-release").read(-1): distro = Ubuntu
+else: distro = Unknown
+#=== DISTRIBUTION DETECTION =
+
class serviceCfgBase(object):
def __init__(self, syscfg):
self.status = None
@@ -498,7 +524,8 @@ class libvirtConfigRedhat(serviceCfgBase):
configureLibvirtConfig(self.syscfg.env.secure, self)
cfo = configFileOps("/etc/sysconfig/libvirtd", self)
-cfo.addEntry("export CGROUP_DAEMON", "'cpu:/virt'")
+if distro in (CentOS6,RHEL6):
+cfo.addEntry("export CGROUP_DAEMON", "'cpu:/virt'")
cfo.addEntry("LIBVIRTD_ARGS", "-l")
cfo.save()
[cloudstack-documentation] branch master updated (0269661 -> 72c1183)
This is an automated email from the ASF dual-hosted git repository. rafael pushed a change to branch master in repository https://gitbox.apache.org/repos/asf/cloudstack-documentation.git. from 0269661 Forwardmerge #12 -- bridge section was missing add b44f390 "yes" for KVM network throtling support (#11) new 72c1183 Forwardmerge #11 -- "yes" for KVM network throttling 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: source/conceptsandterminology/choosing_deployment_architecture.rst | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
[cloudstack-documentation] 01/01: Forwardmerge #11 -- "yes" for KVM network throttling
This is an automated email from the ASF dual-hosted git repository. rafael pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/cloudstack-documentation.git commit 72c1183bb28e72e06fcbfa89a01d44c7cd642a2b Merge: 0269661 b44f390 Author: Rafael Weingärtner AuthorDate: Wed Nov 7 11:07:18 2018 -0200 Forwardmerge #11 -- "yes" for KVM network throttling source/conceptsandterminology/choosing_deployment_architecture.rst | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
[cloudstack-documentation] branch 4.11 updated (cfc18df -> b44f390)
This is an automated email from the ASF dual-hosted git repository. rafael pushed a change to branch 4.11 in repository https://gitbox.apache.org/repos/asf/cloudstack-documentation.git. from cfc18df bridge section was missing (#12) add b44f390 "yes" for KVM network throtling support (#11) No new revisions were added by this update. Summary of changes: source/conceptsandterminology/choosing_deployment_architecture.rst | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
[cloudstack-documentation] branch master updated (a96d7d6 -> 0269661)
This is an automated email from the ASF dual-hosted git repository. rafael pushed a change to branch master in repository https://gitbox.apache.org/repos/asf/cloudstack-documentation.git. from a96d7d6 CLOUDSTACK-10399: Added section regarding MySQL server-id (#17) add ddc2485 Formating fix to show code add 2b7f8e9 Merge pull request #9 from andrijapanic/patch-1 add cfc18df bridge section was missing (#12) new 0269661 Forwardmerge #12 -- bridge section was missing 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: source/installguide/optional_installation.rst | 2 +- source/quickinstallationguide/qig.rst | 26 +- 2 files changed, 22 insertions(+), 6 deletions(-)
[cloudstack-documentation] 01/01: Forwardmerge #12 -- bridge section was missing
This is an automated email from the ASF dual-hosted git repository. rafael pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/cloudstack-documentation.git commit 02696614e5b2a763de7f60ef8863b035104299c8 Merge: a96d7d6 cfc18df Author: Rafael Weingärtner AuthorDate: Wed Nov 7 11:04:16 2018 -0200 Forwardmerge #12 -- bridge section was missing source/installguide/optional_installation.rst | 2 +- source/quickinstallationguide/qig.rst | 26 +- 2 files changed, 22 insertions(+), 6 deletions(-)
[cloudstack-documentation] branch 4.11 updated (2b7f8e9 -> cfc18df)
This is an automated email from the ASF dual-hosted git repository. rafael pushed a change to branch 4.11 in repository https://gitbox.apache.org/repos/asf/cloudstack-documentation.git. from 2b7f8e9 Merge pull request #9 from andrijapanic/patch-1 add cfc18df bridge section was missing (#12) No new revisions were added by this update. Summary of changes: source/quickinstallationguide/qig.rst | 26 +- 1 file changed, 21 insertions(+), 5 deletions(-)
[cloudstack-documentation] branch master updated: CLOUDSTACK-10399: Added section regarding MySQL server-id (#17)
This is an automated email from the ASF dual-hosted git repository. rafael pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/cloudstack-documentation.git The following commit(s) were added to refs/heads/master by this push: new a96d7d6 CLOUDSTACK-10399: Added section regarding MySQL server-id (#17) a96d7d6 is described below commit a96d7d6db68791d72d0d30b2180ddb616d72a299 Author: James McClune AuthorDate: Wed Nov 7 07:57:58 2018 -0500 CLOUDSTACK-10399: Added section regarding MySQL server-id (#17) Fixes CLOUDSTACK-10399: Specify MySQL server-id for later versions of CloudStack Signed-off-by: James McClune --- source/installguide/management-server/_database.rst | 12 source/quickinstallationguide/qig.rst | 14 +- 2 files changed, 25 insertions(+), 1 deletion(-) diff --git a/source/installguide/management-server/_database.rst b/source/installguide/management-server/_database.rst index 9ec6600..46a9f13 100644 --- a/source/installguide/management-server/_database.rst +++ b/source/installguide/management-server/_database.rst @@ -62,6 +62,18 @@ MySQL. See :ref:`install-database-on-separate-node`. max_connections=350 log-bin=mysql-bin binlog-format = 'ROW' + + .. note:: + For Ubuntu 16.04 and later, make sure you specify a ``server-id`` in your ``.cnf`` file for binary logging. Set the ``server-id`` according to your database setup. + + .. parsed-literal:: + + server-id=master-01 + innodb_rollback_on_timeout=1 + innodb_lock_wait_timeout=600 + max_connections=350 + log-bin=mysql-bin + binlog-format = 'ROW' .. note:: You can also create a file ``/etc/mysql/conf.d/cloudstack.cnf`` diff --git a/source/quickinstallationguide/qig.rst b/source/quickinstallationguide/qig.rst index 0c52592..66141c3 100644 --- a/source/quickinstallationguide/qig.rst +++ b/source/quickinstallationguide/qig.rst @@ -369,7 +369,19 @@ section: innodb_lock_wait_timeout=600 max_connections=350 log-bin=mysql-bin - binlog-format = 'ROW' + binlog-format = 'ROW' + +.. note:: +For Ubuntu 16.04 and later, make sure you specify a ``server-id`` in your ``.cnf`` file for binary logging. Set the ``server-id`` according to your database setup. + +:: + + server-id=master-01 + innodb_rollback_on_timeout=1 + innodb_lock_wait_timeout=600 + max_connections=350 + log-bin=mysql-bin + binlog-format = 'ROW' Now that MySQL is properly configured we can start it and configure it to start on boot as follows:
[cloudstack-documentation] branch master updated: Fix cloud-set-guest-password download link (#18)
This is an automated email from the ASF dual-hosted git repository. rafael pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/cloudstack-documentation.git The following commit(s) were added to refs/heads/master by this push: new 2b96f26 Fix cloud-set-guest-password download link (#18) 2b96f26 is described below commit 2b96f265fcdbc7828ccb454cba8b724d83926e8f Author: dredknight AuthorDate: Wed Nov 7 14:56:56 2018 +0200 Fix cloud-set-guest-password download link (#18) Download link for cloud-set-guest-password was pointing towards a non existing page so I changed it to the github page of the script. --- source/adminguide/templates/_password.rst | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/source/adminguide/templates/_password.rst b/source/adminguide/templates/_password.rst index dffde52..a09c127 100644 --- a/source/adminguide/templates/_password.rst +++ b/source/adminguide/templates/_password.rst @@ -46,10 +46,10 @@ Linux OS Installation Use the following steps to begin the Linux OS installation: -#. Download the script file cloud-set-guest-password: +#. Download the latest version of the cloud-set-guest-password script from the repository: - - `http://download.cloud.com/templates/4.2/bindir/cloud-set-guest-password.in - <http://download.cloud.com/templates/4.2/bindir/cloud-set-guest-password.in>`_ + - `https://github.com/apache/cloudstack/blob/master/setup/bindir/cloud-set-guest-password.in + <https://github.com/apache/cloudstack/blob/master/setup/bindir/cloud-set-guest-password.in>`_ #. Rename the file:
[cloudstack-documentation] branch master updated: Documentation for KVM live storage migration (#14)
This is an automated email from the ASF dual-hosted git repository. rafael pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/cloudstack-documentation.git The following commit(s) were added to refs/heads/master by this push: new 13d692c Documentation for KVM live storage migration (#14) 13d692c is described below commit 13d692c57c42f304f41a902f02a55bfd453f5f25 Author: Nicolas Vazquez AuthorDate: Wed Nov 7 09:56:34 2018 -0300 Documentation for KVM live storage migration (#14) --- source/adminguide/virtual_machines.rst | 7 +++ 1 file changed, 7 insertions(+) diff --git a/source/adminguide/virtual_machines.rst b/source/adminguide/virtual_machines.rst index eda2b7c..61b5d10 100644 --- a/source/adminguide/virtual_machines.rst +++ b/source/adminguide/virtual_machines.rst @@ -809,6 +809,13 @@ To manually live migrate a virtual machine #. Click OK. +.. note:: + (KVM) If the VM's storage has to be migrated along with the VM, from a mounted NFS storage pool to a cluster-wide mounted NFS storage pool, then the 'migrateVirtualMachineWithVolume' API has to be used. There is no UI integration for this feature. + + (CloudMonkey) > migrate virtualmachinewithvolume virtualmachineid= hostid= migrateto[i].volume= migrateto[i].pool= + + where i in [0,..,N] and N = number of volumes of the virtual machine + Deleting VMs
[cloudstack-documentation] 01/01: Merge pull request #16 from GabrielBrascher/updateTemplateFrom4.6To4.11
This is an automated email from the ASF dual-hosted git repository. rafael pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/cloudstack-documentation.git commit 5c39daf2d42e4c37f786ec221bb54c5101a5 Merge: 74aa4d7 5bc29f5 Author: Rafael Weingärtner AuthorDate: Wed Nov 7 10:53:37 2018 -0200 Merge pull request #16 from GabrielBrascher/updateTemplateFrom4.6To4.11 Change systemvm template from 4.6 to 4.11 source/quickinstallationguide/qig.rst | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
[cloudstack-documentation] branch master updated (74aa4d7 -> 5c39daf)
This is an automated email from the ASF dual-hosted git repository. rafael pushed a change to branch master in repository https://gitbox.apache.org/repos/asf/cloudstack-documentation.git. from 74aa4d7 Merge pull request #8 from nvazquez/dpdkimprovments add 5bc29f5 Change systemvm template from 4.6 to 4.11 new 5c39daf Merge pull request #16 from GabrielBrascher/updateTemplateFrom4.6To4.11 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: source/quickinstallationguide/qig.rst | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
[cloudstack] branch master updated (4de4eab -> f183268)
This is an automated email from the ASF dual-hosted git repository. rafael pushed a change to branch master in repository https://gitbox.apache.org/repos/asf/cloudstack.git. from 4de4eab Enable DPDK support on KVM (#2839) add 7d8eb37 [4.11] Fix set initial reservation on public IP ranges (#2980) new f183268 Forwardmerge #2980 - Fix set initial reservation on public IP ranges 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: .../java/com/cloud/configuration/ConfigurationManagerImpl.java | 10 ++ ui/scripts/system.js | 6 +- 2 files changed, 11 insertions(+), 5 deletions(-)
[cloudstack] branch 4.11 updated: [4.11] Fix set initial reservation on public IP ranges (#2980)
This is an automated email from the ASF dual-hosted git repository.
rafael pushed a commit to branch 4.11
in repository https://gitbox.apache.org/repos/asf/cloudstack.git
The following commit(s) were added to refs/heads/4.11 by this push:
new 7d8eb37 [4.11] Fix set initial reservation on public IP ranges (#2980)
7d8eb37 is described below
commit 7d8eb379240764a767e972b668be1757c2d274e8
Author: Nicolas Vazquez
AuthorDate: Wed Nov 7 09:48:07 2018 -0300
[4.11] Fix set initial reservation on public IP ranges (#2980)
* Fix initial reservation on public IP ranges
* Do not allow dedicating a system VM IP range
---
.../src/com/cloud/configuration/ConfigurationManagerImpl.java | 10 ++
ui/scripts/system.js | 6 +-
2 files changed, 11 insertions(+), 5 deletions(-)
diff --git a/server/src/com/cloud/configuration/ConfigurationManagerImpl.java
b/server/src/com/cloud/configuration/ConfigurationManagerImpl.java
index 80642f5..9075ee9 100755
--- a/server/src/com/cloud/configuration/ConfigurationManagerImpl.java
+++ b/server/src/com/cloud/configuration/ConfigurationManagerImpl.java
@@ -3569,10 +3569,10 @@ public class ConfigurationManagerImpl extends
ManagerBase implements Configurati
}
// increment resource count for dedicated public ip's
_resourceLimitMgr.incrementResourceCount(vlanOwner.getId(),
ResourceType.public_ip, new Long(ips.size()));
-} else if (domain != null) {
+} else if (domain != null && !forSystemVms) {
// This VLAN is domain-wide, so create a DomainVlanMapVO
entry
-//final DomainVlanMapVO domainVlanMapVO = new
DomainVlanMapVO(domain.getId(), vlan.getId());
-//_domainVlanMapDao.persist(domainVlanMapVO);
+final DomainVlanMapVO domainVlanMapVO = new
DomainVlanMapVO(domain.getId(), vlan.getId());
+_domainVlanMapDao.persist(domainVlanMapVO);
} else if (podId != null) {
// This VLAN is pod-wide, so create a PodVlanMapVO entry
final PodVlanMapVO podVlanMapVO = new PodVlanMapVO(podId,
vlan.getId());
@@ -3754,8 +3754,10 @@ public class ConfigurationManagerImpl extends
ManagerBase implements Configurati
// Check if any of the Public IP addresses is allocated to another
// account
+boolean forSystemVms = false;
final List ips =
_publicIpAddressDao.listByVlanId(vlanDbId);
for (final IPAddressVO ip : ips) {
+forSystemVms = ip.isForSystemVms();
final Long allocatedToAccountId = ip.getAllocatedToAccountId();
if (allocatedToAccountId != null) {
final Account accountAllocatedTo =
_accountMgr.getActiveAccountById(allocatedToAccountId);
@@ -3779,7 +3781,7 @@ public class ConfigurationManagerImpl extends ManagerBase
implements Configurati
UsageEventUtils.publishUsageEvent(EventTypes.EVENT_NET_IP_ASSIGN,
vlanOwner.getId(), ip.getDataCenterId(), ip.getId(),
ip.getAddress().toString(), ip.isSourceNat(),
vlan.getVlanType().toString(), ip.getSystem(),
ip.getClass().getName(), ip.getUuid());
}
-} else if (domain != null) {
+} else if (domain != null && !forSystemVms) {
// Create an DomainVlanMapVO entry
DomainVlanMapVO domainVlanMapVO = new
DomainVlanMapVO(domain.getId(), vlan.getId());
_domainVlanMapDao.persist(domainVlanMapVO);
diff --git a/ui/scripts/system.js b/ui/scripts/system.js
index b568d49..284dad4 100755
--- a/ui/scripts/system.js
+++ b/ui/scripts/system.js
@@ -126,13 +126,16 @@
var $systemvmsCb =
$systemvms.find('input[type=checkbox]');
var $account =
args.$form.find('.form-item[rel=account]');
var $accountTxt =
args.$form.find('input[name=account]');
+var $domainid =
args.$form.find('select[name=domainid]');
$systemvmsCb.change(function() {
if ($systemvmsCb.is(':checked')) {
$accountTxt.val('');
$accountTxt.attr('disabled', true);
+$domainid.attr('disabled', true);
}
else {
$accountTxt.attr('disabled', false);
+$domainid.attr('disabled', false);
}
});
}
@@ -524,7
[cloudstack] branch master updated: make sure no time skew can interfere with comparison (#3003)
This is an automated email from the ASF dual-hosted git repository.
rafael pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/cloudstack.git
The following commit(s) were added to refs/heads/master by this push:
new 604d2d1 make sure no time skew can interfere with comparison (#3003)
604d2d1 is described below
commit 604d2d1bd2f183482ee66731eb0ae8cd6e55cfc8
Author: dahn
AuthorDate: Wed Nov 7 12:04:40 2018 +
make sure no time skew can interfere with comparison (#3003)
* make sure no time skew can interfere with comparison
* import
---
.../test/java/com/cloud/utils/DateUtilTest.java| 28 +-
1 file changed, 17 insertions(+), 11 deletions(-)
diff --git a/utils/src/test/java/com/cloud/utils/DateUtilTest.java
b/utils/src/test/java/com/cloud/utils/DateUtilTest.java
index 428666f..98b4d11 100644
--- a/utils/src/test/java/com/cloud/utils/DateUtilTest.java
+++ b/utils/src/test/java/com/cloud/utils/DateUtilTest.java
@@ -21,13 +21,14 @@ package com.cloud.utils;
import java.text.DateFormat;
import java.text.ParseException;
import java.text.SimpleDateFormat;
+import java.time.Instant;
+import java.time.ZoneId;
import java.util.Calendar;
import java.util.Date;
import java.util.TimeZone;
import java.time.format.DateTimeFormatter;
import java.time.OffsetDateTime;
-import java.time.ZoneOffset;
import com.cloud.utils.DateUtil.IntervalType;
@@ -74,8 +75,9 @@ public class DateUtilTest {
@Test
public void zonedTimeFormatIsoOffsetDateTime() throws ParseException {
-Date time = new Date();
-String str =
OffsetDateTime.now().format(DateTimeFormatter.ISO_OFFSET_DATE_TIME);
+Instant moment = Instant.now();
+Date time = Date.from(moment);
+String str = OffsetDateTime.ofInstant(moment,
ZoneId.systemDefault()).format(DateTimeFormatter.ISO_OFFSET_DATE_TIME);
Date dtParsed = DateUtil.parseTZDateString(str);
@@ -84,8 +86,9 @@ public class DateUtilTest {
@Test
public void zonedTimeFormatIsoInstant() throws ParseException {
-Date time = new Date();
-String str =
OffsetDateTime.now().format(DateTimeFormatter.ISO_INSTANT);
+Instant moment = Instant.now();
+Date time = Date.from(moment);
+String str = OffsetDateTime.ofInstant(moment,
ZoneId.systemDefault()).format(DateTimeFormatter.ISO_INSTANT);
Date dtParsed = DateUtil.parseTZDateString(str);
@@ -94,9 +97,10 @@ public class DateUtilTest {
@Test
public void zonedTimeFormatIsoOffsetDateTimeMs() throws ParseException {
-Date time = new Date();
+Instant moment = Instant.now();
+Date time = Date.from(moment);
DateTimeFormatter formatter =
DateTimeFormatter.ofPattern("-MM-dd'T'HH:mm:ss.SSX");
-String str = OffsetDateTime.now().format(formatter);
+String str = OffsetDateTime.ofInstant(moment,
ZoneId.systemDefault()).format(formatter);
Date dtParsed = DateUtil.parseTZDateString(str);
@@ -105,9 +109,10 @@ public class DateUtilTest {
@Test
public void zonedTimeFormatIsoInstantMs() throws ParseException {
-Date time = new Date();
+Instant moment = Instant.now();
+Date time = Date.from(moment);
DateTimeFormatter formatter =
DateTimeFormatter.ofPattern("-MM-dd'T'HH:mm:ss.SS'Z'");
-String str = OffsetDateTime.now(ZoneOffset.UTC).format(formatter);
+String str = OffsetDateTime.ofInstant(moment,
ZoneId.of("UTC")).format(formatter);
Date dtParsed = DateUtil.parseTZDateString(str);
@@ -116,9 +121,10 @@ public class DateUtilTest {
@Test
public void zonedTimeFormatIsoNoColonZMs() throws ParseException {
-Date time = new Date();
+Instant moment = Instant.now();
+Date time = Date.from(moment);
DateTimeFormatter formatter =
DateTimeFormatter.ofPattern("-MM-dd'T'HH:mm:ss.SSZ");
-String str = OffsetDateTime.now().format(formatter);
+String str = OffsetDateTime.ofInstant(moment,
ZoneId.systemDefault()).format(formatter);
Date dtParsed = DateUtil.parseTZDateString(str);
[cloudstack] branch master updated (e175e93 -> 077e692)
This is an automated email from the ASF dual-hosted git repository. rafael pushed a change to branch master in repository https://gitbox.apache.org/repos/asf/cloudstack.git. from e175e93 Fix set affinity for user overlay problem (Fixes #2986) (#2987) add af0c1e4 Fix DirectNetworkGuru canHandle checks for lowercase isolation methods (#3010) new 077e692 Forward merge Fix DirectNetworkGuru canHandle for lowercase isolation methods 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: .../com/cloud/network/guru/DirectNetworkGuru.java | 13 ++- .../cloud/network/guru/DirectNetworkGuruTest.java | 44 +++--- 2 files changed, 32 insertions(+), 25 deletions(-) copy core/src/test/java/org/apache/cloudstack/api/agent/test/CheckNetworkCommandTest.java => server/test/com/cloud/network/guru/DirectNetworkGuruTest.java (52%)
[cloudstack] 01/01: Forward merge Fix DirectNetworkGuru canHandle for lowercase isolation methods
This is an automated email from the ASF dual-hosted git repository.
rafael pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/cloudstack.git
commit 077e692dbb4abef95ab62f77c0e62e5aa19b32e5
Merge: e175e93 af0c1e4
Author: Rafael Weingärtner
AuthorDate: Wed Nov 7 09:56:05 2018 -0200
Forward merge Fix DirectNetworkGuru canHandle for lowercase isolation
methods
forward merge of #3010 -- Fix DirectNetworkGuru canHandle checks for
lowercase isolation methods
.../com/cloud/network/guru/DirectNetworkGuru.java | 13 +-
.../cloud/network/guru/DirectNetworkGuruTest.java | 53 ++
2 files changed, 64 insertions(+), 2 deletions(-)
diff --cc server/src/main/java/com/cloud/network/guru/DirectNetworkGuru.java
index 6c473c5,000..ee880e6
mode 100644,00..100644
--- a/server/src/main/java/com/cloud/network/guru/DirectNetworkGuru.java
+++ b/server/src/main/java/com/cloud/network/guru/DirectNetworkGuru.java
@@@ -1,413 -1,0 +1,422 @@@
+// 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.
+package com.cloud.network.guru;
+
+import java.util.List;
+
+import javax.inject.Inject;
+
+import com.cloud.offerings.dao.NetworkOfferingServiceMapDao;
+import
org.apache.cloudstack.engine.orchestration.service.NetworkOrchestrationService;
++import org.apache.commons.collections.CollectionUtils;
+import org.apache.log4j.Logger;
+
+import com.cloud.dc.DataCenter;
+import com.cloud.dc.DataCenter.NetworkType;
+import com.cloud.dc.dao.DataCenterDao;
+import com.cloud.dc.dao.VlanDao;
+import com.cloud.deploy.DeployDestination;
+import com.cloud.deploy.DeploymentPlan;
+import com.cloud.exception.ConcurrentOperationException;
+import com.cloud.exception.InsufficientAddressCapacityException;
+import com.cloud.exception.InsufficientCapacityException;
+import com.cloud.exception.InsufficientVirtualNetworkCapacityException;
+import com.cloud.exception.InvalidParameterValueException;
+import com.cloud.network.dao.PhysicalNetworkDao;
+import com.cloud.network.dao.PhysicalNetworkVO;
+import com.cloud.network.IpAddressManager;
+import com.cloud.network.Ipv6AddressManager;
+import com.cloud.network.Network;
+import com.cloud.network.Network.GuestType;
+import com.cloud.network.Network.Service;
+import com.cloud.network.Network.State;
+import com.cloud.network.NetworkModel;
+import com.cloud.network.NetworkProfile;
+import com.cloud.network.NetworkService;
+import com.cloud.network.Networks.BroadcastDomainType;
+import com.cloud.network.Networks.Mode;
+import com.cloud.network.Networks.TrafficType;
+import com.cloud.network.PhysicalNetwork;
+import com.cloud.network.PhysicalNetwork.IsolationMethod;
+import com.cloud.network.dao.IPAddressDao;
+import com.cloud.network.dao.IPAddressVO;
+import com.cloud.network.dao.NetworkVO;
+import com.cloud.network.dao.UserIpv6AddressDao;
+import com.cloud.offering.NetworkOffering;
+import com.cloud.offerings.dao.NetworkOfferingDao;
+import com.cloud.user.Account;
+import com.cloud.utils.component.AdapterBase;
+import com.cloud.utils.db.DB;
+import com.cloud.utils.db.Transaction;
+import com.cloud.utils.db.TransactionCallbackNoReturn;
+import com.cloud.utils.db.TransactionCallbackWithExceptionNoReturn;
+import com.cloud.utils.db.TransactionStatus;
+import com.cloud.utils.exception.CloudRuntimeException;
+import com.cloud.utils.exception.ExceptionUtil;
+import com.cloud.utils.net.NetUtils;
+import com.cloud.vm.Nic;
+import com.cloud.vm.Nic.ReservationStrategy;
+import com.cloud.vm.NicProfile;
+import com.cloud.vm.NicVO;
+import com.cloud.vm.ReservationContext;
+import com.cloud.vm.VirtualMachine;
+import com.cloud.vm.VirtualMachineProfile;
+import com.cloud.vm.dao.NicDao;
+import com.cloud.vm.dao.NicSecondaryIpDao;
+import com.cloud.vm.dao.NicSecondaryIpVO;
+
+
+public class DirectNetworkGuru extends AdapterBase implements NetworkGuru {
+private static final Logger s_logger =
Logger.getLogger(DirectNetworkGuru.class);
+
+@Inject
+DataCenterDao _dcDao;
+@Inject
+VlanDao _vlanDao;
+@Inject
+NetworkModel _networkModel;
+@Inject
+NetworkOrchestratio
[cloudstack] branch 4.11 updated: Fix DirectNetworkGuru canHandle checks for lowercase isolation methods (#3010)
This is an automated email from the ASF dual-hosted git repository.
rafael pushed a commit to branch 4.11
in repository https://gitbox.apache.org/repos/asf/cloudstack.git
The following commit(s) were added to refs/heads/4.11 by this push:
new af0c1e4 Fix DirectNetworkGuru canHandle checks for lowercase
isolation methods (#3010)
af0c1e4 is described below
commit af0c1e48cf26de3fdc73edd6ac8ff4577a113223
Author: Nicolas Vazquez
AuthorDate: Wed Nov 7 08:53:01 2018 -0300
Fix DirectNetworkGuru canHandle checks for lowercase isolation methods
(#3010)
---
.../com/cloud/network/guru/DirectNetworkGuru.java | 13 +-
.../cloud/network/guru/DirectNetworkGuruTest.java | 53 ++
2 files changed, 64 insertions(+), 2 deletions(-)
diff --git a/server/src/com/cloud/network/guru/DirectNetworkGuru.java
b/server/src/com/cloud/network/guru/DirectNetworkGuru.java
index 3edc8d2..c8d3eec 100644
--- a/server/src/com/cloud/network/guru/DirectNetworkGuru.java
+++ b/server/src/com/cloud/network/guru/DirectNetworkGuru.java
@@ -22,6 +22,7 @@ import javax.inject.Inject;
import com.cloud.offerings.dao.NetworkOfferingServiceMapDao;
import
org.apache.cloudstack.engine.orchestration.service.NetworkOrchestrationService;
+import org.apache.commons.collections.CollectionUtils;
import org.apache.log4j.Logger;
import com.cloud.dc.DataCenter;
@@ -119,10 +120,18 @@ public class DirectNetworkGuru extends AdapterBase
implements NetworkGuru {
return false;
}
+/**
+ * Return true if the physical network isolation method contains the
expected isolation method for this guru
+ */
protected boolean isMyIsolationMethod(PhysicalNetwork physicalNetwork) {
for (IsolationMethod m : _isolationMethods) {
-if (physicalNetwork.getIsolationMethods().contains(m.toString())) {
-return true;
+List isolationMethods =
physicalNetwork.getIsolationMethods();
+if (CollectionUtils.isNotEmpty(isolationMethods)) {
+for (String method : isolationMethods) {
+if (method.equalsIgnoreCase(m.toString())) {
+return true;
+}
+}
}
}
return false;
diff --git a/server/test/com/cloud/network/guru/DirectNetworkGuruTest.java
b/server/test/com/cloud/network/guru/DirectNetworkGuruTest.java
new file mode 100644
index 000..98d43f3
--- /dev/null
+++ b/server/test/com/cloud/network/guru/DirectNetworkGuruTest.java
@@ -0,0 +1,53 @@
+// 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.
+package com.cloud.network.guru;
+
+import com.cloud.network.PhysicalNetwork;
+import org.junit.Before;
+import org.junit.Test;
+import org.mockito.Mock;
+import org.mockito.MockitoAnnotations;
+
+import java.util.Arrays;
+
+import static org.junit.Assert.assertTrue;
+import static org.mockito.Mockito.when;
+
+public class DirectNetworkGuruTest {
+
+DirectNetworkGuru guru = new DirectNetworkGuru();
+
+@Mock
+PhysicalNetwork physicalNetwork;
+
+@Before
+public void setup() throws Exception {
+MockitoAnnotations.initMocks(this);
+
when(physicalNetwork.getIsolationMethods()).thenReturn(Arrays.asList("VXLAN",
"VLAN"));
+}
+
+@Test
+public void testIsMyIsolationMethodUppercaseMethods() {
+assertTrue(guru.isMyIsolationMethod(physicalNetwork));
+}
+
+@Test
+public void testIsMyIsolationMethodLowercaseMethods() {
+
when(physicalNetwork.getIsolationMethods()).thenReturn(Arrays.asList("vxlan",
"vlan"));
+assertTrue(guru.isMyIsolationMethod(physicalNetwork));
+}
+}
[cloudstack] branch master updated: Fix set affinity for user overlay problem (Fixes #2986) (#2987)
This is an automated email from the ASF dual-hosted git repository.
rafael pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/cloudstack.git
The following commit(s) were added to refs/heads/master by this push:
new e175e93 Fix set affinity for user overlay problem (Fixes #2986)
(#2987)
e175e93 is described below
commit e175e93281254d7cbe5b2990084e567d0dd7f3ad
Author: Rafael Weingärtner
AuthorDate: Thu Nov 1 10:30:53 2018 -0300
Fix set affinity for user overlay problem (Fixes #2986) (#2987)
This PR fixes #2986
---
ui/scripts/ui-custom/affinity.js | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/ui/scripts/ui-custom/affinity.js b/ui/scripts/ui-custom/affinity.js
index e4a87dd..d074093 100644
--- a/ui/scripts/ui-custom/affinity.js
+++ b/ui/scripts/ui-custom/affinity.js
@@ -136,8 +136,8 @@
});
}
}]
-}).parent('.ui-dialog').overlay();
-
+});
+
cloudStack.applyDefaultZindexAndOverlayOnJqueryDialogAndRemoveCloseButton($dataList);
// Add tier select dialog
if (tierSelect) {
var $toolbar = $dataList.find('.toolbar');
[cloudstack] branch master updated: CLOUDSTACK-9315: Removed unused Classes (#1448)
This is an automated email from the ASF dual-hosted git repository.
rafael pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/cloudstack.git
The following commit(s) were added to refs/heads/master by this push:
new cdc6e6e CLOUDSTACK-9315: Removed unused Classes (#1448)
cdc6e6e is described below
commit cdc6e6e50ae6ec400c2a156d9db7200ccbf1979c
Author: Gabriel Beims Bräscher
AuthorDate: Mon Oct 29 08:27:00 2018 -0300
CLOUDSTACK-9315: Removed unused Classes (#1448)
* Remove some unused Classes
These classes were deleted because they have no references in our code
base. They are not in Spring execution flow nor instantiated with "new":
- com.cloud.agent.api.CheckStateAnswer
- com.cloud.agent.api.StartupVMMAgentCommand
- com.cloud.agent.api.routing.UserDataCommand
- remove from description at
com.cloud.configuration.Config.ExecuteInSequenceNetworkElementCommands
enum
- com.cloud.agent.api.storage.UpgradeDiskCommand
- com.cloud.agent.api.storage.CreatePrivateTemplateCommand
- com.cloud.agent.api.storage.DestroyAnswer
- Note: "FIXME: Should have an DestroyAnswer" at
com.cloud.storage.resource.StoragePoolResource
- com.cloud.agent.api.storage.UpgradeDiskAnswer
- com.cloud.agent.api.storage.ManageVolumeAvailabilityAnswer
- com.cloud.agent.api.storage.ManageVolumeAvailabilityCommand
- com.cloud.exception.UsageServerException
- com.cloud.info.SecStorageVmLoadInfo
- com.cloud.serializer.SerializerHelper
* PR#1448 update description of
'execute.in.sequence.network.element.commands' param
Update description of
'execute.in.sequence.network.element.commands'parameter to reflect an unused
command that has been removed. The removed class command is 'UserDataCommand'.
* Add cloud schema to update SQL
---
.../java/com/cloud/agent/api/CheckStateAnswer.java | 49 --
.../cloud/agent/api/StartupVMMAgentCommand.java| 86 -
.../cloud/agent/api/routing/UserDataCommand.java | 67 ---
.../api/storage/CreatePrivateTemplateCommand.java | 95 --
.../com/cloud/agent/api/storage/DestroyAnswer.java | 34
.../storage/ManageVolumeAvailabilityAnswer.java| 35
.../storage/ManageVolumeAvailabilityCommand.java | 56 --
.../cloud/agent/api/storage/UpgradeDiskAnswer.java | 34
.../agent/api/storage/UpgradeDiskCommand.java | 55 --
.../com/cloud/exception/UsageServerException.java | 37
.../java/com/cloud/info/SecStorageVmLoadInfo.java | 51 --
.../com/cloud/serializer/SerializerHelper.java | 193 -
.../storage/resource/StoragePoolResource.java | 1 -
.../resources/META-INF/db/schema-41120to41200.sql | 5 +-
.../main/java/com/cloud/configuration/Config.java | 14 +-
15 files changed, 11 insertions(+), 801 deletions(-)
diff --git a/core/src/main/java/com/cloud/agent/api/CheckStateAnswer.java
b/core/src/main/java/com/cloud/agent/api/CheckStateAnswer.java
deleted file mode 100644
index 5e3a709..000
--- a/core/src/main/java/com/cloud/agent/api/CheckStateAnswer.java
+++ /dev/null
@@ -1,49 +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.
-//
-
-package com.cloud.agent.api;
-
-import com.cloud.vm.VirtualMachine.State;
-
-/**
- */
-public class CheckStateAnswer extends Answer {
-State state;
-
-public CheckStateAnswer() {
-}
-
-public CheckStateAnswer(CheckStateCommand cmd, State state) {
-this(cmd, state, null);
-}
-
-public CheckStateAnswer(CheckStateCommand cmd, String details) {
-super(cmd, false, details);
-this.state = null;
-}
-
-public CheckStateAnswer(CheckStateCommand cmd, State state, String
details) {
-super(cmd, true, details);
-this.state = state;
-}
-
-public State getState() {
-return state;
-}
-}
diff --git a/core/src/main/java/com/cloud/agent/api/StartupVMMAgentCommand.java
b/core/src/main/java/com/cloud/agent/api/StartupVMMAgentCommand.java
deleted file mode 100644
index 7c9ad1a..000
--- a/core/src/m
[cloudstack] branch master updated (d7ed049 -> d0fbd00)
This is an automated email from the ASF dual-hosted git repository. rafael pushed a change to branch master in repository https://gitbox.apache.org/repos/asf/cloudstack.git. omit d7ed049 Merge remote-tracking branch 'origin/4.11' omit 14d387f Test gitbox force push omit 47c9c1c client: mgmt server listen default to 0.0.0.0 (#2907) omit 5cf163d server: Unify templates/ISOs checksum API output (#2911) This update removed existing revisions from the reference, leaving the reference pointing at a previous point in the repository history. * -- * -- N refs/heads/master (d0fbd00) \ O -- O -- O (d7ed049) Any revisions marked "omit" are not gone; other references still refer to them. Any revisions marked "discard" are gone forever. No new revisions were added by this update. Summary of changes: client/conf/server.properties.in | 3 +-- .../java/org/apache/cloudstack/ServerDaemon.java | 4 +-- .../cloud/api/query/dao/TemplateJoinDaoImpl.java | 5 ++-- teste.file.gitbox.force| 0 .../cloudstack/utils/security/DigestHelper.java| 15 --- .../utils/security/DigestHelperTest.java | 31 +++--- 6 files changed, 8 insertions(+), 50 deletions(-) delete mode 100644 teste.file.gitbox.force
[cloudstack] 01/02: tools: Added '-B' flag for mvn current version cmd (#2910) (#2914)
This is an automated email from the ASF dual-hosted git repository. rafael pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/cloudstack.git commit d0fbd00e9b7841b7861bac9e4df74bde6faa0cdd Author: Abhishek AuthorDate: Mon Oct 22 22:04:42 2018 +0530 tools: Added '-B' flag for mvn current version cmd (#2910) (#2914) maven command for finding current version might need to download packages and without batch mode it will end in variable. Added '-B' to enable batch mode. --- tools/build/setnextversion.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/build/setnextversion.sh b/tools/build/setnextversion.sh index 3b31ea9..8d8037c 100755 --- a/tools/build/setnextversion.sh +++ b/tools/build/setnextversion.sh @@ -124,7 +124,7 @@ echo "checking out correct branch" git checkout $branch echo "determining current POM version" -export currentversion=`mvn org.apache.maven.plugins:maven-help-plugin:2.1.1:evaluate -Dexpression=project.version | grep -v '\['` +export currentversion=`mvn org.apache.maven.plugins:maven-help-plugin:2.1.1:evaluate -Dexpression=project.version -B | grep -v '\['` echo "found $currentversion" echo "setting new version numbers"
[cloudstack] branch master updated (f5d5242 -> 14d387f)
This is an automated email from the ASF dual-hosted git repository. rafael pushed a change to branch master in repository https://gitbox.apache.org/repos/asf/cloudstack.git. from f5d5242 kvm: Remove libvirt-bin check for Debian (#2909) (#2912) new d0fbd00 tools: Added '-B' flag for mvn current version cmd (#2910) (#2914) new 14d387f Test gitbox force push 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: .../development-installation/README.md => teste.file.gitbox.force | 0 tools/build/setnextversion.sh | 2 +- 2 files changed, 1 insertion(+), 1 deletion(-) copy tools/devcloud4/common/development-installation/README.md => teste.file.gitbox.force (100%)
[cloudstack] 02/02: Test gitbox force push
This is an automated email from the ASF dual-hosted git repository. rafael pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/cloudstack.git commit 14d387f76db3432ca9aa98e8f00c4d8c22c2b279 Author: Rafael Weingärtner AuthorDate: Mon Oct 22 15:16:25 2018 -0300 Test gitbox force push --- teste.file.gitbox.force | 0 1 file changed, 0 insertions(+), 0 deletions(-) diff --git a/teste.file.gitbox.force b/teste.file.gitbox.force new file mode 100644 index 000..e69de29
[cloudstack] branch master updated: kvm: Remove libvirt-bin check for Debian (#2909) (#2912)
This is an automated email from the ASF dual-hosted git repository.
rafael pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/cloudstack.git
The following commit(s) were added to refs/heads/master by this push:
new f5d5242 kvm: Remove libvirt-bin check for Debian (#2909) (#2912)
f5d5242 is described below
commit f5d52421b9efdd6b40d56aaad3e90b46f175
Author: Abhishek
AuthorDate: Mon Oct 22 17:48:11 2018 +0530
kvm: Remove libvirt-bin check for Debian (#2909) (#2912)
Debian does not have libvirt-bin package. Therefore, only for Ubuntu host
distro process name libvirt-bin is used, otherwise libvirtd will be used
---
.../resource/wrapper/LibvirtPostCertificateRenewalCommandWrapper.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git
a/plugins/hypervisors/kvm/src/main/java/com/cloud/hypervisor/kvm/resource/wrapper/LibvirtPostCertificateRenewalCommandWrapper.java
b/plugins/hypervisors/kvm/src/main/java/com/cloud/hypervisor/kvm/resource/wrapper/LibvirtPostCertificateRenewalCommandWrapper.java
index df89d24..2802d42 100644
---
a/plugins/hypervisors/kvm/src/main/java/com/cloud/hypervisor/kvm/resource/wrapper/LibvirtPostCertificateRenewalCommandWrapper.java
+++
b/plugins/hypervisors/kvm/src/main/java/com/cloud/hypervisor/kvm/resource/wrapper/LibvirtPostCertificateRenewalCommandWrapper.java
@@ -38,7 +38,7 @@ public final class
LibvirtPostCertificateRenewalCommandWrapper extends CommandWr
if (command != null) {
final int timeout = 3;
Script script = new Script(true, "service", timeout, s_logger);
-if ("Ubuntu".equals(serverResource.getHostDistro()) ||
"Debian".equals(serverResource.getHostDistro())) {
+if ("Ubuntu".equals(serverResource.getHostDistro())) {
script.add("libvirt-bin");
} else {
script.add("libvirtd");
[cloudstack] branch master updated: Allow enable the Java remote Debug for CloudStack Agent (#2897)
This is an automated email from the ASF dual-hosted git repository.
rafael pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/cloudstack.git
The following commit(s) were added to refs/heads/master by this push:
new 143fe53 Allow enable the Java remote Debug for CloudStack Agent
(#2897)
143fe53 is described below
commit 143fe5375cdacdef18e02b1ade1254c72e790d9a
Author: Gabriel Beims Bräscher
AuthorDate: Tue Oct 16 15:57:13 2018 -0300
Allow enable the Java remote Debug for CloudStack Agent (#2897)
The idea is to create a property in /etc/defaults/cloudstack-agent that
can be enabled/disabled (uncommented/commented) to control the enabling
of Java remote debug in CloudStack's JVM.
---
packaging/systemd/cloudstack-agent.default | 4
packaging/systemd/cloudstack-agent.service | 2 +-
2 files changed, 5 insertions(+), 1 deletion(-)
diff --git a/packaging/systemd/cloudstack-agent.default
b/packaging/systemd/cloudstack-agent.default
index 41fa85b..519f44a 100644
--- a/packaging/systemd/cloudstack-agent.default
+++ b/packaging/systemd/cloudstack-agent.default
@@ -20,3 +20,7 @@ JAVA_HEAP_INITIAL=256m
JAVA_HEAP_MAX=2048m
JAVA_CLASS=com.cloud.agent.AgentShell
JAVA_TMPDIR=/usr/share/cloudstack-agent/tmp
+
+#You can uncomment this if you want to enable Java remote debugging.
+#Feel free to change the parameters at your will. The 'address' field defines
the port to be used.
+#JAVA_DEBUG="-agentlib:jdwp=transport=dt_socket,address=8000,server=y,suspend=n"
diff --git a/packaging/systemd/cloudstack-agent.service
b/packaging/systemd/cloudstack-agent.service
index 9cde22d..8acab59 100644
--- a/packaging/systemd/cloudstack-agent.service
+++ b/packaging/systemd/cloudstack-agent.service
@@ -28,7 +28,7 @@ ExecStart=/bin/sh -ec '\
export ACP=`ls /usr/share/cloudstack-agent/lib/*.jar
/usr/share/cloudstack-agent/plugins/*.jar 2>/dev/null|tr "\\n" ":"`; \
export
CLASSPATH="$ACP:/etc/cloudstack/agent:/usr/share/cloudstack-common/scripts"; \
mkdir -m 0755 -p ${JAVA_TMPDIR}; \
-${JAVA} -Djava.io.tmpdir="${JAVA_TMPDIR}" -Xms${JAVA_HEAP_INITIAL}
-Xmx${JAVA_HEAP_MAX} -cp "$CLASSPATH" $JAVA_CLASS'
+${JAVA} -Djava.io.tmpdir="${JAVA_TMPDIR}" -Xms${JAVA_HEAP_INITIAL}
-Xmx${JAVA_HEAP_MAX} $JAVA_DEBUG -cp "$CLASSPATH" $JAVA_CLASS'
Restart=always
RestartSec=10s
[cloudstack] branch master updated (58b4e71 -> 92f8cda)
This is an automated email from the ASF dual-hosted git repository. rafael pushed a change to branch master in repository https://gitbox.apache.org/repos/asf/cloudstack.git. from 58b4e71 params: allow signatureversion and expires without logging add 9003c7b Add checksum sanity validation on template registration (#2902) new 92f8cda Merge forward #2902 (Add checksum sanity validation on template registration) 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: .../cloud/template/HypervisorTemplateAdapter.java | 3 +++ .../cloudstack/utils/security/DigestHelper.java| 27 +-- .../utils/security/DigestHelperTest.java | 30 ++ 3 files changed, 58 insertions(+), 2 deletions(-)
[cloudstack] 01/01: Merge forward #2902 (Add checksum sanity validation on template registration)
This is an automated email from the ASF dual-hosted git repository. rafael pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/cloudstack.git commit 92f8cda64a65d85911a2850b6e7061aaa2505017 Merge: 58b4e71 9003c7b Author: Rafael Weingärtner AuthorDate: Tue Oct 16 10:25:50 2018 -0300 Merge forward #2902 (Add checksum sanity validation on template registration) .../cloud/template/HypervisorTemplateAdapter.java | 3 +++ .../cloudstack/utils/security/DigestHelper.java| 27 +-- .../utils/security/DigestHelperTest.java | 30 ++ 3 files changed, 58 insertions(+), 2 deletions(-)
[cloudstack] branch 4.11 updated: Add checksum sanity validation on template registration (#2902)
This is an automated email from the ASF dual-hosted git repository.
rafael pushed a commit to branch 4.11
in repository https://gitbox.apache.org/repos/asf/cloudstack.git
The following commit(s) were added to refs/heads/4.11 by this push:
new 9003c7b Add checksum sanity validation on template registration
(#2902)
9003c7b is described below
commit 9003c7bfdce9586aaeef19b1aea372b4fcfdb9b4
Author: Nicolas Vazquez
AuthorDate: Tue Oct 16 10:21:20 2018 -0300
Add checksum sanity validation on template registration (#2902)
* Add checksum sanity validation on template registration
* Refactor
* Rename checksum sanity method
---
.../cloud/template/HypervisorTemplateAdapter.java | 3 +++
.../cloudstack/utils/security/DigestHelper.java| 27 +--
.../utils/security/DigestHelperTest.java | 30 ++
3 files changed, 58 insertions(+), 2 deletions(-)
diff --git a/server/src/com/cloud/template/HypervisorTemplateAdapter.java
b/server/src/com/cloud/template/HypervisorTemplateAdapter.java
index bfa73af..8aa2166 100644
--- a/server/src/com/cloud/template/HypervisorTemplateAdapter.java
+++ b/server/src/com/cloud/template/HypervisorTemplateAdapter.java
@@ -39,6 +39,7 @@ import
org.apache.cloudstack.api.command.user.template.GetUploadParamsForTemplat
import org.apache.cloudstack.engine.subsystem.api.storage.DataObject;
import org.apache.cloudstack.engine.subsystem.api.storage.EndPoint;
import org.apache.cloudstack.storage.command.TemplateOrVolumePostUploadCommand;
+import org.apache.cloudstack.utils.security.DigestHelper;
import org.apache.log4j.Logger;
import org.apache.cloudstack.storage.datastore.db.TemplateDataStoreDao;
import org.apache.cloudstack.api.command.user.iso.DeleteIsoCmd;
@@ -155,6 +156,7 @@ public class HypervisorTemplateAdapter extends
TemplateAdapterBase {
String url = profile.getUrl();
UriUtils.validateUrl(ImageFormat.ISO.getFileExtension(), url);
if (cmd.isDirectDownload()) {
+DigestHelper.validateChecksumString(cmd.getChecksum());
Long templateSize = performDirectDownloadUrlValidation(url);
profile.setSize(templateSize);
}
@@ -170,6 +172,7 @@ public class HypervisorTemplateAdapter extends
TemplateAdapterBase {
String url = profile.getUrl();
UriUtils.validateUrl(cmd.getFormat(), url);
if (cmd.isDirectDownload()) {
+DigestHelper.validateChecksumString(cmd.getChecksum());
Long templateSize = performDirectDownloadUrlValidation(url);
profile.setSize(templateSize);
}
diff --git
a/utils/src/main/java/org/apache/cloudstack/utils/security/DigestHelper.java
b/utils/src/main/java/org/apache/cloudstack/utils/security/DigestHelper.java
index 67adf74..40b0c1c 100644
--- a/utils/src/main/java/org/apache/cloudstack/utils/security/DigestHelper.java
+++ b/utils/src/main/java/org/apache/cloudstack/utils/security/DigestHelper.java
@@ -16,6 +16,8 @@
// under the License.
package org.apache.cloudstack.utils.security;
+import org.apache.commons.lang.StringUtils;
+
import java.io.IOException;
import java.io.InputStream;
import java.math.BigInteger;
@@ -70,9 +72,9 @@ public class DigestHelper {
return checksum;
}
-static final Map paddingLengths = creatPaddingLengths();
+static final Map paddingLengths = getChecksumLengthsMap();
-private static final Map creatPaddingLengths() {
+private static final Map getChecksumLengthsMap() {
Map map = new HashMap<>();
map.put("MD5", 32);
map.put("SHA-1", 40);
@@ -93,4 +95,25 @@ public class DigestHelper {
}
return true;
}
+
+/**
+ * Checksum sanity for not empty checksum. Expected format: {ALG}HASH
+ * If ALG is missing, MD5 is assumed as default
+ * Hash length is verified, depending on the algorithm.
+ * IllegalArgumentException is thrown in case of malformed checksums
+ */
+public static void validateChecksumString(String checksum) {
+if(StringUtils.isNotEmpty(checksum)) {
+ChecksumValue checksumValue = new ChecksumValue(checksum);
+String digest = checksumValue.getChecksum();
+Map map = getChecksumLengthsMap();
+if (!map.containsKey(checksumValue.getAlgorithm())) {
+throw new IllegalArgumentException("Algorithm " +
checksumValue.getAlgorithm() + " was provided but it is not one of the
supported algorithms");
+}
+Integer expectedLength = map.get(checksumValue.getAlgorithm());
+if (digest.length() != expectedLength) {
+throw new IllegalArgumentException("Checksum digest length
should be " + expectedLength + " instead of " + digest.length());
+}
+}
+}
}
diff --git
a/utils/src/test/java/org/apache/cloudstack/utils
[cloudstack] branch master updated (ebc6b2f -> 272167c)
This is an automated email from the ASF dual-hosted git repository. rafael pushed a change to branch master in repository https://gitbox.apache.org/repos/asf/cloudstack.git. from ebc6b2f Remove push force test file add 63f4d85 PULL_REQUEST_TEMPLATE: simplify and remove unpopular sections (#2876) new 272167c merge forward #2876 -- PULL_REQUEST_TEMPLATE simplification 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: PULL_REQUEST_TEMPLATE.md | 24 +--- 1 file changed, 5 insertions(+), 19 deletions(-)
[cloudstack] 01/01: merge forward #2876 -- PULL_REQUEST_TEMPLATE simplification
This is an automated email from the ASF dual-hosted git repository. rafael pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/cloudstack.git commit 272167c3b3d486a97bda43c5af204f5432d645bf Merge: ebc6b2f 63f4d85 Author: Rafael Weingärtner AuthorDate: Mon Oct 15 15:33:13 2018 -0300 merge forward #2876 -- PULL_REQUEST_TEMPLATE simplification PULL_REQUEST_TEMPLATE.md | 24 +--- 1 file changed, 5 insertions(+), 19 deletions(-) diff --cc PULL_REQUEST_TEMPLATE.md index cf1f6a2,a7c739d..c56bc98 --- a/PULL_REQUEST_TEMPLATE.md +++ b/PULL_REQUEST_TEMPLATE.md @@@ -15,27 -19,9 +19,9 @@@ ## Screenshots (if appropriate): ## How Has This Been Tested? -- - ## Checklist: - - - - [ ] I have read the [CONTRIBUTING](https://github.com/apache/cloudstack/blob/master/CONTRIBUTING.md) document. - - [ ] My code follows the code style of this project. - - [ ] My change requires a change to the documentation. - - [ ] I have updated the documentation accordingly. - Testing - - [ ] I have added tests to cover my changes. - - [ ] All relevant new and existing integration tests have passed. - - [ ] A full integration testsuite with all test that can run on my environment has passed. + +
[cloudstack] branch 4.11 updated: PULL_REQUEST_TEMPLATE: simplify and remove unpopular sections (#2876)
This is an automated email from the ASF dual-hosted git repository. rafael pushed a commit to branch 4.11 in repository https://gitbox.apache.org/repos/asf/cloudstack.git The following commit(s) were added to refs/heads/4.11 by this push: new 63f4d85 PULL_REQUEST_TEMPLATE: simplify and remove unpopular sections (#2876) 63f4d85 is described below commit 63f4d852d5649842aaaeac2335481b7cc404453f Author: Rohit Yadav AuthorDate: Mon Oct 15 23:51:13 2018 +0530 PULL_REQUEST_TEMPLATE: simplify and remove unpopular sections (#2876) This removes the section from the pull request template that is not very popular or filled by the PR author. Signed-off-by: Rohit Yadav --- PULL_REQUEST_TEMPLATE.md | 22 +- 1 file changed, 5 insertions(+), 17 deletions(-) diff --git a/PULL_REQUEST_TEMPLATE.md b/PULL_REQUEST_TEMPLATE.md index 17adfe6..a7c739d 100644 --- a/PULL_REQUEST_TEMPLATE.md +++ b/PULL_REQUEST_TEMPLATE.md @@ -4,6 +4,10 @@ + + + + ## Types of changes - [ ] Breaking change (fix or feature that would cause existing functionality to change) @@ -12,13 +16,6 @@ - [ ] Enhancement (improves an existing feature and functionality) - [ ] Cleanup (Code refactoring and cleanup, that may add test cases) -## GitHub Issue/PRs - - - - - - ## Screenshots (if appropriate): ## How Has This Been Tested? @@ -27,13 +24,4 @@ -## Checklist: - - -- [ ] I have read the [CONTRIBUTING](https://github.com/apache/cloudstack/blob/master/CONTRIBUTING.md) document. -- [ ] My code follows the code style of this project. -- [ ] My change requires a change to the documentation. -- [ ] I have updated the documentation accordingly. -- [ ] I have added tests to cover my changes. -- [ ] All new and existing tests passed. - +
