Skip to content

Commit 41d25d5

Browse files
yadvryadvr
committed
Merge remote-tracking branch 'origin/4.16'
2 parents 208ae84 + 6495bc1 commit 41d25d5

File tree

9 files changed

+152
-0
lines changed

9 files changed

+152
-0
lines changed

‎debian/cloudstack-agent.postinst‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -53,6 +53,13 @@ case "$1" in
5353
fi
5454
cp -a /usr/share/cloudstack-agent/lib/libvirtqemuhook /etc/libvirt/hooks/qemu
5555

56+
# Print help message
57+
if [ -f "/usr/share/cloudstack-common/scripts/installer/cloudstack-help-text" ];then
58+
acs_version=$(dpkg -l |grep cloudstack-agent |head -n1 |awk '{print $3}')
59+
sed -i "s,^ACS_VERSION=.*,ACS_VERSION=$acs_version,g" /usr/share/cloudstack-common/scripts/installer/cloudstack-help-text
60+
/usr/share/cloudstack-common/scripts/installer/cloudstack-help-text agent
61+
fi
62+
5663
;;
5764
esac
5865

‎debian/cloudstack-management.postinst‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -71,6 +71,13 @@ if [ "$1" = configure ]; then
7171
grep -s -q "^db.usage.slaves=" ${CONFDIR}/${DBPROPS} && sed -i "s/^db.usage.slaves=/db.usage.replicas=/g" ${CONFDIR}/${DBPROPS}
7272
grep -s -q "^db.usage.secondsBeforeRetryMaster=" ${CONFDIR}/${DBPROPS} && sed -i "s/^db.usage.secondsBeforeRetryMaster=/db.usage.secondsBeforeRetrySource=/g" ${CONFDIR}/${DBPROPS}
7373
grep -s -q "^db.usage.queriesBeforeRetryMaster=" ${CONFDIR}/${DBPROPS} && sed -i "s/^db.usage.queriesBeforeRetryMaster=/db.usage.queriesBeforeRetrySource=/g" ${CONFDIR}/${DBPROPS}
74+
75+
# Print help message
76+
if [ -f "/usr/share/cloudstack-common/scripts/installer/cloudstack-help-text" ];then
77+
acs_version=$(dpkg -l |grep cloudstack-management |head -n1 |awk '{print $3}')
78+
sed -i "s,^ACS_VERSION=.*,ACS_VERSION=$acs_version,g" /usr/share/cloudstack-common/scripts/installer/cloudstack-help-text
79+
/usr/share/cloudstack-common/scripts/installer/cloudstack-help-text management
80+
fi
7481
fi
7582

7683
#DEBHELPER#

‎debian/cloudstack-usage.postinst‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -40,6 +40,13 @@ case "$1" in
4040
rm -f /etc/cloudstack/usage/key
4141
ln -s /etc/cloudstack/management/key /etc/cloudstack/usage/key
4242
fi
43+
44+
# Print help message
45+
if [ -f "/usr/share/cloudstack-common/scripts/installer/cloudstack-help-text" ];then
46+
acs_version=$(dpkg -l |grep cloudstack-usage |head -n1 |awk '{print $3}')
47+
sed -i "s,^ACS_VERSION=.*,ACS_VERSION=$acs_version,g" /usr/share/cloudstack-common/scripts/installer/cloudstack-help-text
48+
/usr/share/cloudstack-common/scripts/installer/cloudstack-help-text usage
49+
fi
4350
;;
4451
esac
4552

‎packaging/centos7/cloud.spec‎

Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -458,6 +458,13 @@ chown -R cloud:cloud /var/log/cloudstack/management
458458

459459
systemctl daemon-reload
460460

461+
%posttrans management
462+
# Print help message
463+
if [ -f "/usr/share/cloudstack-common/scripts/installer/cloudstack-help-text" ];then
464+
sed -i "s,^ACS_VERSION=.*,ACS_VERSION=%{_maventag},g" /usr/share/cloudstack-common/scripts/installer/cloudstack-help-text
465+
/usr/share/cloudstack-common/scripts/installer/cloudstack-help-text management
466+
fi
467+
461468
%preun agent
462469
/sbin/service cloudstack-agent stop || true
463470
if [ "$1" == "0" ] ; then
@@ -496,6 +503,13 @@ fi
496503

497504
systemctl daemon-reload
498505

506+
%posttrans agent
507+
# Print help message
508+
if [ -f "/usr/share/cloudstack-common/scripts/installer/cloudstack-help-text" ];then
509+
sed -i "s,^ACS_VERSION=.*,ACS_VERSION=%{_maventag},g" /usr/share/cloudstack-common/scripts/installer/cloudstack-help-text
510+
/usr/share/cloudstack-common/scripts/installer/cloudstack-help-text agent
511+
fi
512+
499513
%pre usage
500514
id cloud > /dev/null 2>&1 || /usr/sbin/useradd -M -U -c "CloudStack unprivileged user" \
501515
-r -s /bin/sh -d %{_localstatedir}/cloudstack/management cloud|| true
@@ -524,6 +538,13 @@ if [ ! -f "%{_sysconfdir}/%{name}/usage/key" ]; then
524538
ln -s %{_sysconfdir}/%{name}/management/key %{_sysconfdir}/%{name}/usage/key
525539
fi
526540

541+
%posttrans usage
542+
# Print help message
543+
if [ -f "/usr/share/cloudstack-common/scripts/installer/cloudstack-help-text" ];then
544+
sed -i "s,^ACS_VERSION=.*,ACS_VERSION=%{_maventag},g" /usr/share/cloudstack-common/scripts/installer/cloudstack-help-text
545+
/usr/share/cloudstack-common/scripts/installer/cloudstack-help-text usage
546+
fi
547+
527548
%post marvin
528549
pip install --upgrade https://files.pythonhosted.org/packages/ca/ea/1e2553b088bad2f9fa8120c2624f797b2d7450d3b61bb492d29c72e3d3c2/mysql_connector_python-8.0.20-cp27-cp27mu-manylinux1_x86_64.whl
529550
pip install --upgrade /usr/share/cloudstack-marvin/Marvin-*.tar.gz

‎packaging/centos8/cloud.spec‎

Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -449,6 +449,13 @@ chown -R cloud:cloud /var/log/cloudstack/management
449449

450450
systemctl daemon-reload
451451

452+
%posttrans management
453+
# Print help message
454+
if [ -f "/usr/share/cloudstack-common/scripts/installer/cloudstack-help-text" ];then
455+
sed -i "s,^ACS_VERSION=.*,ACS_VERSION=%{_maventag},g" /usr/share/cloudstack-common/scripts/installer/cloudstack-help-text
456+
/usr/share/cloudstack-common/scripts/installer/cloudstack-help-text management
457+
fi
458+
452459
%preun agent
453460
/sbin/service cloudstack-agent stop || true
454461
if [ "$1" == "0" ] ; then
@@ -487,6 +494,13 @@ fi
487494

488495
systemctl daemon-reload
489496

497+
%posttrans agent
498+
# Print help message
499+
if [ -f "/usr/share/cloudstack-common/scripts/installer/cloudstack-help-text" ];then
500+
sed -i "s,^ACS_VERSION=.*,ACS_VERSION=%{_maventag},g" /usr/share/cloudstack-common/scripts/installer/cloudstack-help-text
501+
/usr/share/cloudstack-common/scripts/installer/cloudstack-help-text agent
502+
fi
503+
490504
%pre usage
491505
id cloud > /dev/null 2>&1 || /usr/sbin/useradd -M -U -c "CloudStack unprivileged user" \
492506
-r -s /bin/sh -d %{_localstatedir}/cloudstack/management cloud|| true
@@ -515,6 +529,13 @@ if [ ! -f "%{_sysconfdir}/%{name}/usage/key" ]; then
515529
ln -s %{_sysconfdir}/%{name}/management/key %{_sysconfdir}/%{name}/usage/key
516530
fi
517531

532+
%posttrans usage
533+
# Print help message
534+
if [ -f "/usr/share/cloudstack-common/scripts/installer/cloudstack-help-text" ];then
535+
sed -i "s,^ACS_VERSION=.*,ACS_VERSION=%{_maventag},g" /usr/share/cloudstack-common/scripts/installer/cloudstack-help-text
536+
/usr/share/cloudstack-common/scripts/installer/cloudstack-help-text usage
537+
fi
538+
518539
%post marvin
519540
pip install --upgrade https://files.pythonhosted.org/packages/ca/ea/1e2553b088bad2f9fa8120c2624f797b2d7450d3b61bb492d29c72e3d3c2/mysql_connector_python-8.0.20-cp27-cp27mu-manylinux1_x86_64.whl
520541
pip install --upgrade /usr/share/cloudstack-marvin/Marvin-*.tar.gz

‎packaging/suse15/cloud.spec‎

Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -443,6 +443,13 @@ chown -R cloud:cloud /var/log/cloudstack/management
443443

444444
systemctl daemon-reload
445445

446+
%posttrans management
447+
# Print help message
448+
if [ -f "/usr/share/cloudstack-common/scripts/installer/cloudstack-help-text" ];then
449+
sed -i "s,^ACS_VERSION=.*,ACS_VERSION=%{_maventag},g" /usr/share/cloudstack-common/scripts/installer/cloudstack-help-text
450+
/usr/share/cloudstack-common/scripts/installer/cloudstack-help-text management
451+
fi
452+
446453
%preun agent
447454
/sbin/service cloudstack-agent stop || true
448455
if [ "$1" == "0" ] ; then
@@ -481,6 +488,13 @@ fi
481488

482489
systemctl daemon-reload
483490

491+
%posttrans agent
492+
# Print help message
493+
if [ -f "/usr/share/cloudstack-common/scripts/installer/cloudstack-help-text" ];then
494+
sed -i "s,^ACS_VERSION=.*,ACS_VERSION=%{_maventag},g" /usr/share/cloudstack-common/scripts/installer/cloudstack-help-text
495+
/usr/share/cloudstack-common/scripts/installer/cloudstack-help-text agent
496+
fi
497+
484498
%pre usage
485499
id cloud > /dev/null 2>&1 || /usr/sbin/useradd -M -U -c "CloudStack unprivileged user" \
486500
-r -s /bin/sh -d %{_localstatedir}/cloudstack/management cloud|| true
@@ -509,6 +523,13 @@ if [ ! -f "%{_sysconfdir}/%{name}/usage/key" ]; then
509523
ln -s %{_sysconfdir}/%{name}/management/key %{_sysconfdir}/%{name}/usage/key
510524
fi
511525

526+
%posttrans usage
527+
# Print help message
528+
if [ -f "/usr/share/cloudstack-common/scripts/installer/cloudstack-help-text" ];then
529+
sed -i "s,^ACS_VERSION=.*,ACS_VERSION=%{_maventag},g" /usr/share/cloudstack-common/scripts/installer/cloudstack-help-text
530+
/usr/share/cloudstack-common/scripts/installer/cloudstack-help-text usage
531+
fi
532+
512533
%post marvin
513534
pip install --upgrade https://files.pythonhosted.org/packages/ca/ea/1e2553b088bad2f9fa8120c2624f797b2d7450d3b61bb492d29c72e3d3c2/mysql_connector_python-8.0.20-cp27-cp27mu-manylinux1_x86_64.whl
514535
pip install --upgrade /usr/share/cloudstack-marvin/Marvin-*.tar.gz

‎scripts/installer/cloudstack-help-text‎

Lines changed: 43 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,43 @@
1+
#!/bin/sh
2+
# Licensed to the Apache Software Foundation (ASF) under one
3+
# or more contributor license agreements. See the NOTICE file
4+
# distributed with this work for additional information
5+
# regarding copyright ownership. The ASF licenses this file
6+
# to you under the Apache License, Version 2.0 (the
7+
# "License"); you may not use this file except in compliance
8+
# with the License. You may obtain a copy of the License at
9+
#
10+
# http://www.apache.org/licenses/LICENSE-2.0
11+
#
12+
# Unless required by applicable law or agreed to in writing,
13+
# software distributed under the License is distributed on an
14+
# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
15+
# KIND, either express or implied. See the License for the
16+
# specific language governing permissions and limitations
17+
# under the License.
18+
19+
ACS_VERSION=
20+
ACL_MINOR_VERSION=$(echo $ACS_VERSION | cut -d'-' -f1)
21+
22+
case $1 in
23+
management)
24+
PACKAGE="Managment Server"
25+
;;
26+
usage)
27+
PACKAGE="Usage Server"
28+
;;
29+
agent)
30+
PACKAGE="Agent"
31+
;;
32+
esac
33+
34+
printf "\n"
35+
printf "Thank you for installing Apache CloudStack ${PACKAGE} ${ACS_VERSION} !\n"
36+
printf "\n"
37+
printf " * Project website: https://cloudstack.apache.org/\n"
38+
printf " * Documentation: https://docs.cloudstack.apache.org/en/${ACL_MINOR_VERSION:-latest}/\n"
39+
printf " * Release notes: https://docs.cloudstack.apache.org/en/${ACL_MINOR_VERSION:-latest}/releasenotes/\n"
40+
printf " * Join mailing lists: https://cloudstack.apache.org/mailing-lists.html\n"
41+
printf " * Take the survey: https://cloudstack.apache.org/survey.html\n"
42+
printf " * Report issues: https://github.com/apache/cloudstack/issues/new\n"
43+
printf "\n"

‎ui/public/locales/en.json‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3035,6 +3035,13 @@
30353035
"message.host.dedication.released": "Host dedication released",
30363036
"message.info.cloudian.console": "Cloudian Management Console should open in another window",
30373037
"message.installwizard.click.retry": "Click the button to retry launch.",
3038+
"message.installwizard.cloudstack.helptext.header": "\nFind more information on pages below.\n",
3039+
"message.installwizard.cloudstack.helptext.website": " * Project website:\t ",
3040+
"message.installwizard.cloudstack.helptext.document": " * Documentation:\t ",
3041+
"message.installwizard.cloudstack.helptext.releasenotes": " * Release notes:\t ",
3042+
"message.installwizard.cloudstack.helptext.mailinglists": " * Join mailing lists:\t ",
3043+
"message.installwizard.cloudstack.helptext.survey": " * Take the survey:\t ",
3044+
"message.installwizard.cloudstack.helptext.issues": " * Report issues:\t ",
30383045
"message.installwizard.copy.whatisacluster": "A cluster provides a way to group hosts. The hosts in a cluster all have identical hardware, run the same hypervisor, are on the same subnet, and access the same shared storage. Virtual machine instances (VMs) can be live-migrated from one host to another within the same cluster, without interrupting service to the user. A cluster is the third-largest organizational unit within a CloudStack™; deployment. Clusters are contained within pods, and pods are contained within zones.<br/><br/>CloudStack™; allows multiple clusters in a cloud deployment, but for a Basic Installation, we only need one cluster.",
30393046
"message.installwizard.copy.whatisahost": "A host is a single computer. Hosts provide the computing resources that run the guest virtual machines. Each host has hypervisor software installed on it to manage the guest VMs (except for bare metal hosts, which are a special case discussed in the Advanced Installation Guide). For example, a Linux KVM-enabled server, a Citrix XenServer server, and an ESXi server are hosts. In a Basic Installation, we use a single host running XenServer or KVM.<br/><br/>The host is the smallest organizational unit within a CloudStack™; deployment. Hosts are contained within clusters, clusters are contained within pods, and pods are contained within zones.",
30403047
"message.installwizard.copy.whatisapod": "A pod often represents a single rack. Hosts in the same pod are in the same subnet.<br/><br/>A pod is the second-largest organizational unit within a CloudStack™; deployment. Pods are contained within zones. Each zone can contain one or more pods; in the Basic Installation, you will have just one pod in your zone.",

‎ui/src/views/dashboard/OnboardingDashboard.vue‎

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,15 @@
2727
<div class="subtitle">{{ $t('label.introduction.to.cloudstack') }}</div>
2828
<p>{{ $t('message.installwizard.copy.whatiscloudstack') }}</p>
2929
<img class="center" src="assets/bg-what-is-cloudstack.png">
30+
<pre>{{ $t('message.installwizard.cloudstack.helptext.header') }}</pre>
31+
<pre>{{ $t('message.installwizard.cloudstack.helptext.website') }}<a href="https://cloudstack.apache.org" target="_blank">https://cloudstack.apache.org</a></pre>
32+
<pre>{{ $t('message.installwizard.cloudstack.helptext.document') }}<a :href="'https://docs.cloudstack.apache.org/en/' + cloudstackminorversion" target="_blank">https://docs.cloudstack.apache.org/en/{{ cloudstackminorversion }}</a></pre>
33+
<pre>{{ $t('message.installwizard.cloudstack.helptext.releasenotes') }}<a :href="'https://docs.cloudstack.apache.org/en/' + cloudstackminorversion + '/releasenotes/'" target="_blank">https://docs.cloudstack.apache.org/en/{{ cloudstackminorversion }}/releasenotes/</a></pre>
34+
35+
<pre>{{ $t('message.installwizard.cloudstack.helptext.mailinglists') }}<a href="https://cloudstack.apache.org/mailing-lists.html" target="_blank">https://cloudstack.apache.org/mailing-lists.html</a></pre>
36+
<pre>{{ $t('message.installwizard.cloudstack.helptext.survey') }}<a href="https://cloudstack.apache.org/survey.html" target="_blank">https://cloudstack.apache.org/survey.html</a></pre>
37+
<pre>{{ $t('message.installwizard.cloudstack.helptext.issues') }}<a href="https://github.com/apache/cloudstack/issues/new" target="_blank">https://github.com/apache/cloudstack/issues/new</a></pre>
38+
3039
<a-button @click="() => { this.step = 1 }" type="primary">
3140
{{ $t('label.continue.install') }}
3241
<a-icon type="double-right"/>
@@ -77,6 +86,7 @@ export default {
7786
data () {
7887
return {
7988
step: 0,
89+
cloudstackminorversion: this.$store.getters.features.cloudstackversion.split('-')[0],
8090
resource: {
8191
id: this.$store.getters.userInfo.id,
8292
username: this.$store.getters.userInfo.username
@@ -137,6 +147,14 @@ p {
137147
white-space: pre-line;
138148
}
139149
150+
pre {
151+
font-family: sans-serif;
152+
text-align: justify;
153+
font-size: 15px;
154+
white-space: pre-wrap;
155+
margin: 0px 0px;
156+
}
157+
140158
.center {
141159
display: block;
142160
margin-left: auto;

0 commit comments

Comments
 (0)