Skip to content

Commit 04a7fed

Browse files
widowido
committed
CLOUDSTACK-1935: Rename tools from cloud-* to cloudstack-*
1 parent f09d981 commit 04a7fed

4 files changed

Lines changed: 18 additions & 18 deletions

File tree

‎debian/cloudstack-agent.install‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,9 +5,9 @@
55
# to you under the Apache License, Version 2.0 (the
66
# "License"); you may not use this file except in compliance
77
# with the License. You may obtain a copy of the License at
8-
#
8+
#
99
# http://www.apache.org/licenses/LICENSE-2.0
10-
#
10+
#
1111
# Unless required by applicable law or agreed to in writing,
1212
# software distributed under the License is distributed on an
1313
# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
@@ -20,7 +20,7 @@
2020
/etc/cloudstack/agent/log4j-cloud.xml
2121
/etc/init.d/cloudstack-agent
2222
/usr/bin/cloudstack-setup-agent
23-
/usr/bin/cloud-ssh
23+
/usr/bin/cloudstack-ssh
2424
/var/log/cloudstack/agent
2525
/usr/share/cloudstack-agent/lib/*
2626
/usr/share/cloudstack-agent/plugins

‎debian/cloudstack-common.install‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -5,9 +5,9 @@
55
# to you under the Apache License, Version 2.0 (the
66
# "License"); you may not use this file except in compliance
77
# with the License. You may obtain a copy of the License at
8-
#
8+
#
99
# http://www.apache.org/licenses/LICENSE-2.0
10-
#
10+
#
1111
# Unless required by applicable law or agreed to in writing,
1212
# software distributed under the License is distributed on an
1313
# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
@@ -27,6 +27,6 @@
2727
/usr/share/cloudstack-common/scripts/vm/hypervisor/versions.sh
2828
/usr/share/cloudstack-common/scripts/vm/hypervisor/xenserver/*
2929
/usr/share/cloudstack-common/lib/*
30-
/usr/bin/cloud-set-guest-password
31-
/usr/bin/cloud-set-guest-sshkey
30+
/usr/bin/cloudstack-set-guest-password
31+
/usr/bin/cloudstack-set-guest-sshkey
3232
/usr/lib/python2.?/*-packages/*

‎debian/cloudstack-management.install‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -25,8 +25,8 @@
2525
/var/log/cloudstack/management
2626
/var/lib/cloudstack/mnt
2727
/var/lib/cloudstack/management
28-
/usr/bin/cloud-update-xenserver-licenses
29-
/usr/bin/cloud-setup-management
30-
/usr/bin/cloud-setup-databases
31-
/usr/bin/cloud-migrate-databases
28+
/usr/bin/cloudstack-update-xenserver-licenses
29+
/usr/bin/cloudstack-setup-management
30+
/usr/bin/cloudstack-setup-databases
31+
/usr/bin/cloudstack-migrate-databases
3232
/usr/share/cloudstack-management/*

‎debian/rules‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -69,7 +69,7 @@ install:
6969
install -D plugins/hypervisors/kvm/target/dependencies/* $(DESTDIR)/usr/share/$(PACKAGE)-agent/lib/
7070
install -D packaging/debian/init/cloud-agent $(DESTDIR)/$(SYSCONFDIR)/init.d/$(PACKAGE)-agent
7171
install -D agent/bindir/cloud-setup-agent.in $(DESTDIR)/usr/bin/cloudstack-setup-agent
72-
install -D agent/bindir/cloud-ssh.in $(DESTDIR)/usr/bin/cloud-ssh
72+
install -D agent/bindir/cloud-ssh.in $(DESTDIR)/usr/bin/cloudstack-ssh
7373
install -D agent/target/transformed/* $(DESTDIR)/$(SYSCONFDIR)/$(PACKAGE)/agent
7474

7575
# cloudstack-management
@@ -100,7 +100,7 @@ install:
100100
ln -s tomcat6-nonssl.conf $(DESTDIR)/$(SYSCONFDIR)/$(PACKAGE)/management/tomcat6.conf
101101
ln -s server-nonssl.xml $(DESTDIR)/$(SYSCONFDIR)/$(PACKAGE)/management/server.xml
102102
install -D packaging/debian/init/cloud-management $(DESTDIR)/$(SYSCONFDIR)/init.d/$(PACKAGE)-management
103-
install -D client/bindir/cloud-update-xenserver-licenses.in $(DESTDIR)/usr/bin/cloud-update-xenserver-licenses
103+
install -D client/bindir/cloud-update-xenserver-licenses.in $(DESTDIR)/usr/bin/cloudstack-update-xenserver-licenses
104104
ln -s /usr/share/tomcat6/bin $(DESTDIR)/usr/share/$(PACKAGE)-management/bin
105105
# Remove configuration in /ur/share/cloudstack-management/webapps/client/WEB-INF
106106
# This should all be in /etc/cloudstack/management
@@ -121,11 +121,11 @@ install:
121121
cp -r scripts/storage $(DESTDIR)/usr/share/$(PACKAGE)-common/scripts
122122
cp -r scripts/util $(DESTDIR)/usr/share/$(PACKAGE)-common/scripts
123123
cp -r scripts/vm $(DESTDIR)/usr/share/$(PACKAGE)-common/scripts
124-
install -D client/target/utilities/bin/cloud-migrate-databases $(DESTDIR)/usr/bin
125-
install -D client/target/utilities/bin/cloud-set-guest-password $(DESTDIR)/usr/bin
126-
install -D client/target/utilities/bin/cloud-set-guest-sshkey $(DESTDIR)/usr/bin
127-
install -D client/target/utilities/bin/cloud-setup-databases $(DESTDIR)/usr/bin
128-
install -D client/target/utilities/bin/cloud-setup-management $(DESTDIR)/usr/bin
124+
install -D client/target/utilities/bin/cloud-migrate-databases $(DESTDIR)/usr/bin/cloudstack-migrate-databases
125+
install -D client/target/utilities/bin/cloud-set-guest-password $(DESTDIR)/usr/bin/cloudstack-set-guest-password
126+
install -D client/target/utilities/bin/cloud-set-guest-sshkey $(DESTDIR)/usr/bin/cloudstack-set-guest-sshkey
127+
install -D client/target/utilities/bin/cloud-setup-databases $(DESTDIR)/usr/bin/cloudstack-setup-databases
128+
install -D client/target/utilities/bin/cloud-setup-management $(DESTDIR)/usr/bin/cloudstack-setup-management
129129
install -D services/console-proxy/server/dist/systemvm.iso $(DESTDIR)/usr/share/$(PACKAGE)-common/vms/systemvm.iso
130130
# We need jasypt for cloud-install-sys-tmplt, so this is a nasty hack to get it into the right place
131131
install -D agent/target/dependencies/jasypt-1.9.0.jar $(DESTDIR)/usr/share/$(PACKAGE)-common/lib

0 commit comments

Comments
 (0)