You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cloudstack.apache.org by ro...@apache.org on 2021/03/24 07:16:53 UTC
[cloudstack] branch master updated (64f792b -> 9f730ea)
This is an automated email from the ASF dual-hosted git repository.
rohit pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/cloudstack.git.
from 64f792b Merge release branch 4.15 to master
add 40d93af vpc: dnsmasq is not started if use.external.dns is true (#4806)
add dab7d29 systemvm: Load modules to support NAT traversal in VR (#4777)
add 61de237 ui: Disable login button until redirected (#4857)
add 96dd728 plugins: Add 'break' at RedifshClient request re-try loop (#4846)
add 546bf3d server: Update vm_template table to set template as removed on deletion (#4748)
new 9f730ea Merge remote-tracking branch 'origin/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:
.../java/com/cloud/storage/dao/VMTemplateDao.java | 2 ++
.../com/cloud/storage/dao/VMTemplateDaoImpl.java | 13 +++++++++++++
.../cloud/network/router/CommandSetupHelper.java | 13 +++++++++++--
.../java/com/cloud/storage/StorageManagerImpl.java | 9 +++++++++
.../cloud/template/HypervisorTemplateAdapter.java | 17 ++++++++++++++++-
systemvm/debian/opt/cloud/bin/setup/router.sh | 3 +++
systemvm/debian/opt/cloud/bin/setup/vpcrouter.sh | 3 +++
test/integration/smoke/test_templates.py | 5 ++---
ui/.env.local | 1 +
ui/src/views/auth/Login.vue | 4 ++--
.../cloudstack/utils/redfish/RedfishClient.java | 3 ++-
.../utils/redfish/RedfishClientTest.java | 22 ++++++++++++++++++++++
12 files changed, 86 insertions(+), 9 deletions(-)
create mode 100644 ui/.env.local
[cloudstack] 01/01: Merge remote-tracking branch 'origin/4.15'
Posted by ro...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
rohit pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/cloudstack.git
commit 9f730eabfa76e42773114eaf94d57cd33aae6ae0
Merge: 64f792b 546bf3d
Author: Rohit Yadav <ro...@shapeblue.com>
AuthorDate: Wed Mar 24 12:46:24 2021 +0530
Merge remote-tracking branch 'origin/4.15'
.../java/com/cloud/storage/dao/VMTemplateDao.java | 2 ++
.../com/cloud/storage/dao/VMTemplateDaoImpl.java | 13 +++++++++++++
.../cloud/network/router/CommandSetupHelper.java | 13 +++++++++++--
.../java/com/cloud/storage/StorageManagerImpl.java | 9 +++++++++
.../cloud/template/HypervisorTemplateAdapter.java | 17 ++++++++++++++++-
systemvm/debian/opt/cloud/bin/setup/router.sh | 3 +++
systemvm/debian/opt/cloud/bin/setup/vpcrouter.sh | 3 +++
test/integration/smoke/test_templates.py | 5 ++---
ui/.env.local | 1 +
ui/src/views/auth/Login.vue | 4 ++--
.../cloudstack/utils/redfish/RedfishClient.java | 3 ++-
.../utils/redfish/RedfishClientTest.java | 22 ++++++++++++++++++++++
12 files changed, 86 insertions(+), 9 deletions(-)
diff --cc server/src/main/java/com/cloud/template/HypervisorTemplateAdapter.java
index 30fb6a1,3bf1d7e..aed1d87
--- a/server/src/main/java/com/cloud/template/HypervisorTemplateAdapter.java
+++ b/server/src/main/java/com/cloud/template/HypervisorTemplateAdapter.java
@@@ -16,8 -16,8 +16,9 @@@
// under the License.
package com.cloud.template;
+import java.util.ArrayList;
import java.util.Collections;
+ import java.util.Date;
import java.util.HashSet;
import java.util.LinkedList;
import java.util.List;
@@@ -607,16 -604,9 +621,17 @@@ public class HypervisorTemplateAdapter
// find all eligible image stores for this template
List<DataStore> iStores = templateMgr.getImageStoreByTemplate(template.getId(), null);
if (iStores == null || iStores.size() == 0) {
+ // remove any references from template_zone_ref
+ List<VMTemplateZoneVO> templateZones = templateZoneDao.listByTemplateId(template.getId());
+ if (templateZones != null) {
+ for (VMTemplateZoneVO templateZone : templateZones) {
+ templateZoneDao.remove(templateZone.getId());
+ }
+ }
+
// Mark template as Inactive.
template.setState(VirtualMachineTemplate.State.Inactive);
+ _tmpltDao.remove(template.getId());
_tmpltDao.update(template.getId(), template);
// Decrement the number of templates and total secondary storage