Skip to content

Commit 77fadf5

Browse files
committed
Revert 61a414f
don't dynamically inject premium stuff
1 parent d73d12b commit 77fadf5

5 files changed

Lines changed: 0 additions & 83 deletions

File tree

cloud.spec

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -597,7 +597,6 @@ fi
597597
%{_sysconfdir}/%{name}/management/components-premium.xml
598598
%{_datadir}/%{name}/setup/create-database-premium.sql
599599
%{_datadir}/%{name}/setup/create-schema-premium.sql
600-
%{_libdir}/%{name}/agent/vms/premium-systemvm.zip
601600

602601
%files usage
603602
%defattr(0644,root,root,0775)

debian/cloud-premium.install

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,4 +6,3 @@
66
/usr/share/cloud/setup/create-database-premium.sql
77
/usr/share/cloud/setup/create-schema-premium.sql
88
/usr/lib/cloud/agent/premium-scripts/*
9-
/usr/lib/cloud/agent/vms/premium-systemvm.zip

scripts/vm/systemvm/inject_premium_stuff.sh

Lines changed: 0 additions & 54 deletions
This file was deleted.

server/src/com/cloud/server/ConfigurationServerImpl.java

Lines changed: 0 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -123,29 +123,6 @@ public ConfigurationServerImpl() {
123123
_ipAddressDao = locator.getDao(IPAddressDao.class);
124124
}
125125

126-
private void updatePremiumStuff() {
127-
if (!_configDao.isPremium()) {
128-
return;
129-
}
130-
131-
String injectScript = "scripts/vm/systemvm/inject_premium_stuff.sh";
132-
String scriptPath = Script.findScript("", injectScript);
133-
if (scriptPath == null) {
134-
throw new CloudRuntimeException("Unable to find key inject script "
135-
+ injectScript);
136-
}
137-
138-
final Script command = new Script(scriptPath, s_logger);
139-
final String result = command.execute();
140-
if (result != null) {
141-
s_logger.warn("Failed to inject premium stuff into systemvm iso "
142-
+ result);
143-
throw new CloudRuntimeException(
144-
"Failed to inject premium stuff into systemvm iso "
145-
+ result);
146-
}
147-
}
148-
149126
@Override @DB
150127
public void persistDefaultValues() throws InvalidParameterValueException, InternalErrorException {
151128

@@ -266,8 +243,6 @@ public void persistDefaultValues() throws InvalidParameterValueException, Intern
266243
}
267244
}
268245

269-
updatePremiumStuff();
270-
271246
// store the public and private keys in the database
272247
updateKeyPairs();
273248

wscript_build

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -158,8 +158,6 @@ def build_systemvm_patch ():
158158
bld.install_files ("${AGENTLIBDIR}/vms", "%s/systemvm.zip" % distdir)
159159
# ISO creation
160160
bld.install_as("${AGENTLIBDIR}/vms/systemvm.iso", "%s/systemvm.iso" % distdir)
161-
if buildpremium:
162-
bld.install_as("${AGENTLIBDIR}/vms/premium-systemvm.zip", "%s/premium-systemvm.zip" % distdir)
163161

164162
def build_systemvm_iso ():
165163
if buildpremium:

0 commit comments

Comments
 (0)