Skip to content

Commit c11e9b9

Browse files
weizhouapacheweizhouapache
committed
packaging: display First Install and Onboarding Message
1 parent 4916f3c commit c11e9b9

9 files changed

Lines changed: 107 additions & 0 deletions

File tree

‎debian/cloudstack-agent.postinst‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -53,6 +53,11 @@ 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+
/usr/share/cloudstack-common/scripts/installer/cloudstack-help-text
59+
fi
60+
5661
;;
5762
esac
5863

‎debian/cloudstack-management.postinst‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -71,6 +71,11 @@ 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+
/usr/share/cloudstack-common/scripts/installer/cloudstack-help-text
78+
fi
7479
fi
7580

7681
#DEBHELPER#

‎debian/cloudstack-usage.postinst‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -40,6 +40,11 @@ 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+
/usr/share/cloudstack-common/scripts/installer/cloudstack-help-text
47+
fi
4348
;;
4449
esac
4550

‎packaging/centos7/cloud.spec‎

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -458,6 +458,12 @@ 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+
/usr/share/cloudstack-common/scripts/installer/cloudstack-help-text
465+
fi
466+
461467
%preun agent
462468
/sbin/service cloudstack-agent stop || true
463469
if [ "$1" == "0" ] ; then
@@ -496,6 +502,12 @@ fi
496502

497503
systemctl daemon-reload
498504

505+
%posttrans agent
506+
# Print help message
507+
if [ -f "/usr/share/cloudstack-common/scripts/installer/cloudstack-help-text" ];then
508+
/usr/share/cloudstack-common/scripts/installer/cloudstack-help-text
509+
fi
510+
499511
%pre usage
500512
id cloud > /dev/null 2>&1 || /usr/sbin/useradd -M -U -c "CloudStack unprivileged user" \
501513
-r -s /bin/sh -d %{_localstatedir}/cloudstack/management cloud|| true
@@ -524,6 +536,12 @@ if [ ! -f "%{_sysconfdir}/%{name}/usage/key" ]; then
524536
ln -s %{_sysconfdir}/%{name}/management/key %{_sysconfdir}/%{name}/usage/key
525537
fi
526538

539+
%posttrans usage
540+
# Print help message
541+
if [ -f "/usr/share/cloudstack-common/scripts/installer/cloudstack-help-text" ];then
542+
/usr/share/cloudstack-common/scripts/installer/cloudstack-help-text
543+
fi
544+
527545
%post marvin
528546
pip install --upgrade https://files.pythonhosted.org/packages/ca/ea/1e2553b088bad2f9fa8120c2624f797b2d7450d3b61bb492d29c72e3d3c2/mysql_connector_python-8.0.20-cp27-cp27mu-manylinux1_x86_64.whl
529547
pip install --upgrade /usr/share/cloudstack-marvin/Marvin-*.tar.gz

‎packaging/centos8/cloud.spec‎

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -449,6 +449,12 @@ 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+
/usr/share/cloudstack-common/scripts/installer/cloudstack-help-text
456+
fi
457+
452458
%preun agent
453459
/sbin/service cloudstack-agent stop || true
454460
if [ "$1" == "0" ] ; then
@@ -487,6 +493,12 @@ fi
487493

488494
systemctl daemon-reload
489495

496+
%posttrans agent
497+
# Print help message
498+
if [ -f "/usr/share/cloudstack-common/scripts/installer/cloudstack-help-text" ];then
499+
/usr/share/cloudstack-common/scripts/installer/cloudstack-help-text
500+
fi
501+
490502
%pre usage
491503
id cloud > /dev/null 2>&1 || /usr/sbin/useradd -M -U -c "CloudStack unprivileged user" \
492504
-r -s /bin/sh -d %{_localstatedir}/cloudstack/management cloud|| true
@@ -515,6 +527,12 @@ if [ ! -f "%{_sysconfdir}/%{name}/usage/key" ]; then
515527
ln -s %{_sysconfdir}/%{name}/management/key %{_sysconfdir}/%{name}/usage/key
516528
fi
517529

530+
%posttrans usage
531+
# Print help message
532+
if [ -f "/usr/share/cloudstack-common/scripts/installer/cloudstack-help-text" ];then
533+
/usr/share/cloudstack-common/scripts/installer/cloudstack-help-text
534+
fi
535+
518536
%post marvin
519537
pip install --upgrade https://files.pythonhosted.org/packages/ca/ea/1e2553b088bad2f9fa8120c2624f797b2d7450d3b61bb492d29c72e3d3c2/mysql_connector_python-8.0.20-cp27-cp27mu-manylinux1_x86_64.whl
520538
pip install --upgrade /usr/share/cloudstack-marvin/Marvin-*.tar.gz

‎packaging/suse15/cloud.spec‎

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -443,6 +443,12 @@ 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+
/usr/share/cloudstack-common/scripts/installer/cloudstack-help-text
450+
fi
451+
446452
%preun agent
447453
/sbin/service cloudstack-agent stop || true
448454
if [ "$1" == "0" ] ; then
@@ -481,6 +487,12 @@ fi
481487

482488
systemctl daemon-reload
483489

490+
%posttrans agent
491+
# Print help message
492+
if [ -f "/usr/share/cloudstack-common/scripts/installer/cloudstack-help-text" ];then
493+
/usr/share/cloudstack-common/scripts/installer/cloudstack-help-text
494+
fi
495+
484496
%pre usage
485497
id cloud > /dev/null 2>&1 || /usr/sbin/useradd -M -U -c "CloudStack unprivileged user" \
486498
-r -s /bin/sh -d %{_localstatedir}/cloudstack/management cloud|| true
@@ -509,6 +521,12 @@ if [ ! -f "%{_sysconfdir}/%{name}/usage/key" ]; then
509521
ln -s %{_sysconfdir}/%{name}/management/key %{_sysconfdir}/%{name}/usage/key
510522
fi
511523

524+
%posttrans usage
525+
# Print help message
526+
if [ -f "/usr/share/cloudstack-common/scripts/installer/cloudstack-help-text" ];then
527+
/usr/share/cloudstack-common/scripts/installer/cloudstack-help-text
528+
fi
529+
512530
%post marvin
513531
pip install --upgrade https://files.pythonhosted.org/packages/ca/ea/1e2553b088bad2f9fa8120c2624f797b2d7450d3b61bb492d29c72e3d3c2/mysql_connector_python-8.0.20-cp27-cp27mu-manylinux1_x86_64.whl
514532
pip install --upgrade /usr/share/cloudstack-marvin/Marvin-*.tar.gz

‎scripts/installer/cloudstack-help-text‎

Lines changed: 28 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,28 @@
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+
printf "\n"
20+
printf "Thank you for installing Apache CloudStack !\n"
21+
printf "\n"
22+
printf " * Project: https://cloudstack.apache.org/\n"
23+
printf " * Documentation: https://docs.cloudstack.apache.org/\n"
24+
printf " * Join us: https://cloudstack.apache.org/mailing-lists.html\n"
25+
printf " * Your feedback: https://cloudstack.apache.org/survey.html\n"
26+
printf " * Report issues: https://github.com/apache/cloudstack/issues\n"
27+
printf " * Latest releases: https://github.com/apache/cloudstack/releases\n"
28+
printf "\n"

‎ui/public/locales/en.json‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3015,6 +3015,7 @@
30153015
"message.host.dedication.released": "Host dedication released",
30163016
"message.info.cloudian.console": "Cloudian Management Console should open in another window",
30173017
"message.installwizard.click.retry": "Click the button to retry launch.",
3018+
"message.installwizard.cloudstack.helptext": "\nFind more information on pages below.\n * Project: https://cloudstack.apache.org/\n * Documentation: https://docs.cloudstack.apache.org/\n * Join us: https://cloudstack.apache.org/mailing-lists.html\n * Your feedback: https://cloudstack.apache.org/survey.html\n * Report issues: https://github.com/apache/cloudstack/issues\n * Latest releases: https://github.com/apache/cloudstack/releases\n",
30183019
"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.",
30193020
"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.",
30203021
"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: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,7 @@
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') }}</pre>
3031
<a-button @click="() => { this.step = 1 }" type="primary">
3132
{{ $t('label.continue.install') }}
3233
<a-icon type="double-right"/>
@@ -137,6 +138,14 @@ p {
137138
white-space: pre-line;
138139
}
139140
141+
pre {
142+
font-family: sans-serif;
143+
text-align: justify;
144+
font-size: 15px;
145+
line-height: 23px;
146+
white-space: pre-wrap;
147+
}
148+
140149
.center {
141150
display: block;
142151
margin-left: auto;

0 commit comments

Comments
 (0)