Skip to content

Commit f1d63c0

Browse files
committed
revert copy to /etc/cloudstack
1 parent 500d649 commit f1d63c0

File tree

3 files changed

+2
-6
lines changed

3 files changed

+2
-6
lines changed

client/pom.xml

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -779,10 +779,6 @@
779779
</copy>
780780
<!-- CLOUDSTACK-1304 -->
781781
<chmod perm="755" file="${project.build.directory}/common/scripts/**" type="both" />
782-
<copy todir="/etc/cloudstack/extensions/ext">
783-
<fileset dir="${basedir}/../scripts/vm/hypervisor/external/simpleExternalProvisioner/extensions" />
784-
</copy>
785-
<chmod perm="755" file="/etc/cloudstack/extensions/ext**" type="both" />
786782
<copy todir="${project.build.directory}/classes/META-INF/webapp/WEB-INF/">
787783
<fileset dir="${basedir}/src/main/webapp/WEB-INF/">
788784
<include name="web.xml" />

packaging/el8/cloud.spec

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -315,7 +315,7 @@ rm -rf ${RPM_BUILD_ROOT}%{_datadir}/%{name}-management/templates/systemvm/md5sum
315315

316316
# Sample Extensions
317317
mkdir -p ${RPM_BUILD_ROOT}%{_sysconfdir}/%{name}/extensions
318-
cp -r client/target/common/scripts/vm/hypervisor/extensions/external/simpleExternalProvisioner/extensions/ ${RPM_BUILD_ROOT}%{_sysconfdir}/%{name}/extensions/
318+
cp -r client/target/common/scripts/vm/hypervisor/external/simpleExternalProvisioner/extensions/ ${RPM_BUILD_ROOT}%{_sysconfdir}/%{name}/extensions/
319319
ln -sf %{_sysconfdir}/%{name}/extensions ${RPM_BUILD_ROOT}%{_datadir}/%{name}-management/extensions
320320

321321
# UI

plugins/hypervisors/external/src/main/java/org/apache/cloudstack/hypervisor/external/provisioner/simpleprovisioner/SimpleExternalProvisioner.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -114,7 +114,7 @@ public String getDescription() {
114114
return "Simple external provisioner";
115115
}
116116

117-
private String defaultExtensionsDirectory = "/etc/cloudstack/extensions";
117+
private String defaultExtensionsDirectory = "/usr/share/cloudstack-management/extensions";
118118
private String extensionsDirectory;
119119

120120
protected Map<String, Object> loadAccessDetails(Map<String, Object> externalDetails, VirtualMachineTO virtualMachineTO) {

0 commit comments

Comments
 (0)