From c11e9b92d157223cc9775c5e2ab6dc626f161602 Mon Sep 17 00:00:00 2001 From: Wei Zhou Date: Tue, 11 Jan 2022 11:16:12 +0100 Subject: [PATCH 1/5] packaging: display First Install and Onboarding Message --- debian/cloudstack-agent.postinst | 5 ++++ debian/cloudstack-management.postinst | 5 ++++ debian/cloudstack-usage.postinst | 5 ++++ packaging/centos7/cloud.spec | 18 ++++++++++++ packaging/centos8/cloud.spec | 18 ++++++++++++ packaging/suse15/cloud.spec | 18 ++++++++++++ scripts/installer/cloudstack-help-text | 28 +++++++++++++++++++ ui/public/locales/en.json | 1 + .../views/dashboard/OnboardingDashboard.vue | 9 ++++++ 9 files changed, 107 insertions(+) create mode 100755 scripts/installer/cloudstack-help-text diff --git a/debian/cloudstack-agent.postinst b/debian/cloudstack-agent.postinst index 0942047a3403..d260f4497cf6 100755 --- a/debian/cloudstack-agent.postinst +++ b/debian/cloudstack-agent.postinst @@ -53,6 +53,11 @@ case "$1" in fi cp -a /usr/share/cloudstack-agent/lib/libvirtqemuhook /etc/libvirt/hooks/qemu + # Print help message + if [ -f "/usr/share/cloudstack-common/scripts/installer/cloudstack-help-text" ];then + /usr/share/cloudstack-common/scripts/installer/cloudstack-help-text + fi + ;; esac diff --git a/debian/cloudstack-management.postinst b/debian/cloudstack-management.postinst index e3dd52821a59..be218408634d 100755 --- a/debian/cloudstack-management.postinst +++ b/debian/cloudstack-management.postinst @@ -71,6 +71,11 @@ if [ "$1" = configure ]; then grep -s -q "^db.usage.slaves=" ${CONFDIR}/${DBPROPS} && sed -i "s/^db.usage.slaves=/db.usage.replicas=/g" ${CONFDIR}/${DBPROPS} grep -s -q "^db.usage.secondsBeforeRetryMaster=" ${CONFDIR}/${DBPROPS} && sed -i "s/^db.usage.secondsBeforeRetryMaster=/db.usage.secondsBeforeRetrySource=/g" ${CONFDIR}/${DBPROPS} grep -s -q "^db.usage.queriesBeforeRetryMaster=" ${CONFDIR}/${DBPROPS} && sed -i "s/^db.usage.queriesBeforeRetryMaster=/db.usage.queriesBeforeRetrySource=/g" ${CONFDIR}/${DBPROPS} + + # Print help message + if [ -f "/usr/share/cloudstack-common/scripts/installer/cloudstack-help-text" ];then + /usr/share/cloudstack-common/scripts/installer/cloudstack-help-text + fi fi #DEBHELPER# diff --git a/debian/cloudstack-usage.postinst b/debian/cloudstack-usage.postinst index 61fac8338053..88efe885d456 100755 --- a/debian/cloudstack-usage.postinst +++ b/debian/cloudstack-usage.postinst @@ -40,6 +40,11 @@ case "$1" in rm -f /etc/cloudstack/usage/key ln -s /etc/cloudstack/management/key /etc/cloudstack/usage/key fi + + # Print help message + if [ -f "/usr/share/cloudstack-common/scripts/installer/cloudstack-help-text" ];then + /usr/share/cloudstack-common/scripts/installer/cloudstack-help-text + fi ;; esac diff --git a/packaging/centos7/cloud.spec b/packaging/centos7/cloud.spec index 0728f589829b..b6e38016e71c 100644 --- a/packaging/centos7/cloud.spec +++ b/packaging/centos7/cloud.spec @@ -458,6 +458,12 @@ chown -R cloud:cloud /var/log/cloudstack/management systemctl daemon-reload +%posttrans management +# Print help message +if [ -f "/usr/share/cloudstack-common/scripts/installer/cloudstack-help-text" ];then + /usr/share/cloudstack-common/scripts/installer/cloudstack-help-text +fi + %preun agent /sbin/service cloudstack-agent stop || true if [ "$1" == "0" ] ; then @@ -496,6 +502,12 @@ fi systemctl daemon-reload +%posttrans agent +# Print help message +if [ -f "/usr/share/cloudstack-common/scripts/installer/cloudstack-help-text" ];then + /usr/share/cloudstack-common/scripts/installer/cloudstack-help-text +fi + %pre usage id cloud > /dev/null 2>&1 || /usr/sbin/useradd -M -U -c "CloudStack unprivileged user" \ -r -s /bin/sh -d %{_localstatedir}/cloudstack/management cloud|| true @@ -524,6 +536,12 @@ if [ ! -f "%{_sysconfdir}/%{name}/usage/key" ]; then ln -s %{_sysconfdir}/%{name}/management/key %{_sysconfdir}/%{name}/usage/key fi +%posttrans usage +# Print help message +if [ -f "/usr/share/cloudstack-common/scripts/installer/cloudstack-help-text" ];then + /usr/share/cloudstack-common/scripts/installer/cloudstack-help-text +fi + %post marvin pip install --upgrade https://files.pythonhosted.org/packages/ca/ea/1e2553b088bad2f9fa8120c2624f797b2d7450d3b61bb492d29c72e3d3c2/mysql_connector_python-8.0.20-cp27-cp27mu-manylinux1_x86_64.whl pip install --upgrade /usr/share/cloudstack-marvin/Marvin-*.tar.gz diff --git a/packaging/centos8/cloud.spec b/packaging/centos8/cloud.spec index 31d85dda0806..a3909eb87fca 100644 --- a/packaging/centos8/cloud.spec +++ b/packaging/centos8/cloud.spec @@ -449,6 +449,12 @@ chown -R cloud:cloud /var/log/cloudstack/management systemctl daemon-reload +%posttrans management +# Print help message +if [ -f "/usr/share/cloudstack-common/scripts/installer/cloudstack-help-text" ];then + /usr/share/cloudstack-common/scripts/installer/cloudstack-help-text +fi + %preun agent /sbin/service cloudstack-agent stop || true if [ "$1" == "0" ] ; then @@ -487,6 +493,12 @@ fi systemctl daemon-reload +%posttrans agent +# Print help message +if [ -f "/usr/share/cloudstack-common/scripts/installer/cloudstack-help-text" ];then + /usr/share/cloudstack-common/scripts/installer/cloudstack-help-text +fi + %pre usage id cloud > /dev/null 2>&1 || /usr/sbin/useradd -M -U -c "CloudStack unprivileged user" \ -r -s /bin/sh -d %{_localstatedir}/cloudstack/management cloud|| true @@ -515,6 +527,12 @@ if [ ! -f "%{_sysconfdir}/%{name}/usage/key" ]; then ln -s %{_sysconfdir}/%{name}/management/key %{_sysconfdir}/%{name}/usage/key fi +%posttrans usage +# Print help message +if [ -f "/usr/share/cloudstack-common/scripts/installer/cloudstack-help-text" ];then + /usr/share/cloudstack-common/scripts/installer/cloudstack-help-text +fi + %post marvin pip install --upgrade https://files.pythonhosted.org/packages/ca/ea/1e2553b088bad2f9fa8120c2624f797b2d7450d3b61bb492d29c72e3d3c2/mysql_connector_python-8.0.20-cp27-cp27mu-manylinux1_x86_64.whl pip install --upgrade /usr/share/cloudstack-marvin/Marvin-*.tar.gz diff --git a/packaging/suse15/cloud.spec b/packaging/suse15/cloud.spec index 30300c6be471..909f4d9bff72 100644 --- a/packaging/suse15/cloud.spec +++ b/packaging/suse15/cloud.spec @@ -443,6 +443,12 @@ chown -R cloud:cloud /var/log/cloudstack/management systemctl daemon-reload +%posttrans management +# Print help message +if [ -f "/usr/share/cloudstack-common/scripts/installer/cloudstack-help-text" ];then + /usr/share/cloudstack-common/scripts/installer/cloudstack-help-text +fi + %preun agent /sbin/service cloudstack-agent stop || true if [ "$1" == "0" ] ; then @@ -481,6 +487,12 @@ fi systemctl daemon-reload +%posttrans agent +# Print help message +if [ -f "/usr/share/cloudstack-common/scripts/installer/cloudstack-help-text" ];then + /usr/share/cloudstack-common/scripts/installer/cloudstack-help-text +fi + %pre usage id cloud > /dev/null 2>&1 || /usr/sbin/useradd -M -U -c "CloudStack unprivileged user" \ -r -s /bin/sh -d %{_localstatedir}/cloudstack/management cloud|| true @@ -509,6 +521,12 @@ if [ ! -f "%{_sysconfdir}/%{name}/usage/key" ]; then ln -s %{_sysconfdir}/%{name}/management/key %{_sysconfdir}/%{name}/usage/key fi +%posttrans usage +# Print help message +if [ -f "/usr/share/cloudstack-common/scripts/installer/cloudstack-help-text" ];then + /usr/share/cloudstack-common/scripts/installer/cloudstack-help-text +fi + %post marvin pip install --upgrade https://files.pythonhosted.org/packages/ca/ea/1e2553b088bad2f9fa8120c2624f797b2d7450d3b61bb492d29c72e3d3c2/mysql_connector_python-8.0.20-cp27-cp27mu-manylinux1_x86_64.whl pip install --upgrade /usr/share/cloudstack-marvin/Marvin-*.tar.gz diff --git a/scripts/installer/cloudstack-help-text b/scripts/installer/cloudstack-help-text new file mode 100755 index 000000000000..6757b0de35de --- /dev/null +++ b/scripts/installer/cloudstack-help-text @@ -0,0 +1,28 @@ +#!/bin/sh +# Licensed to the Apache Software Foundation (ASF) under one +# or more contributor license agreements. See the NOTICE file +# distributed with this work for additional information +# regarding copyright ownership. The ASF licenses this file +# to you under the Apache License, Version 2.0 (the +# "License"); you may not use this file except in compliance +# with the License. You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, +# software distributed under the License is distributed on an +# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +# KIND, either express or implied. See the License for the +# specific language governing permissions and limitations +# under the License. + +printf "\n" +printf "Thank you for installing Apache CloudStack !\n" +printf "\n" +printf " * Project: https://cloudstack.apache.org/\n" +printf " * Documentation: https://docs.cloudstack.apache.org/\n" +printf " * Join us: https://cloudstack.apache.org/mailing-lists.html\n" +printf " * Your feedback: https://cloudstack.apache.org/survey.html\n" +printf " * Report issues: https://github.com/apache/cloudstack/issues\n" +printf " * Latest releases: https://github.com/apache/cloudstack/releases\n" +printf "\n" diff --git a/ui/public/locales/en.json b/ui/public/locales/en.json index ad0173452211..1abfc781220b 100644 --- a/ui/public/locales/en.json +++ b/ui/public/locales/en.json @@ -3015,6 +3015,7 @@ "message.host.dedication.released": "Host dedication released", "message.info.cloudian.console": "Cloudian Management Console should open in another window", "message.installwizard.click.retry": "Click the button to retry launch.", +"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", "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.

CloudStack™; allows multiple clusters in a cloud deployment, but for a Basic Installation, we only need one cluster.", "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.

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.", "message.installwizard.copy.whatisapod": "A pod often represents a single rack. Hosts in the same pod are in the same subnet.

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.", diff --git a/ui/src/views/dashboard/OnboardingDashboard.vue b/ui/src/views/dashboard/OnboardingDashboard.vue index 9b8fd3647839..16e8e06c4f7f 100644 --- a/ui/src/views/dashboard/OnboardingDashboard.vue +++ b/ui/src/views/dashboard/OnboardingDashboard.vue @@ -27,6 +27,7 @@
{{ $t('label.introduction.to.cloudstack') }}

{{ $t('message.installwizard.copy.whatiscloudstack') }}

+ 
{{ $t('message.installwizard.cloudstack.helptext') }}
{{ $t('label.continue.install') }} @@ -137,6 +138,14 @@ p { white-space: pre-line; } +pre { + font-family: sans-serif; + text-align: justify; + font-size: 15px; + line-height: 23px; + white-space: pre-wrap; +} + .center { display: block; margin-left: auto; From c71cb86c3ee00e5843942947dd340bbac5dbbaa2 Mon Sep 17 00:00:00 2001 From: Wei Zhou Date: Wed, 12 Jan 2022 08:29:31 +0100 Subject: [PATCH 2/5] Update #5851: Update as per Rohit's comments --- debian/cloudstack-agent.postinst | 2 ++ debian/cloudstack-management.postinst | 2 ++ debian/cloudstack-usage.postinst | 2 ++ packaging/centos7/cloud.spec | 3 +++ packaging/centos8/cloud.spec | 3 +++ packaging/suse15/cloud.spec | 3 +++ scripts/installer/cloudstack-help-text | 12 +++++++----- ui/public/locales/en.json | 2 +- 8 files changed, 23 insertions(+), 6 deletions(-) diff --git a/debian/cloudstack-agent.postinst b/debian/cloudstack-agent.postinst index d260f4497cf6..2ca2fc4f2dd4 100755 --- a/debian/cloudstack-agent.postinst +++ b/debian/cloudstack-agent.postinst @@ -55,6 +55,8 @@ case "$1" in # Print help message if [ -f "/usr/share/cloudstack-common/scripts/installer/cloudstack-help-text" ];then + acs_version=$(dpkg -l |grep cloudstack-agent |head -n1 |awk '{print $3}') + sed -i "s,^ACS_VERSION=.*,ACS_VERSION=$acs_version,g" /usr/share/cloudstack-common/scripts/installer/cloudstack-help-text /usr/share/cloudstack-common/scripts/installer/cloudstack-help-text fi diff --git a/debian/cloudstack-management.postinst b/debian/cloudstack-management.postinst index be218408634d..d41d86ab38f4 100755 --- a/debian/cloudstack-management.postinst +++ b/debian/cloudstack-management.postinst @@ -74,6 +74,8 @@ if [ "$1" = configure ]; then # Print help message if [ -f "/usr/share/cloudstack-common/scripts/installer/cloudstack-help-text" ];then + acs_version=$(dpkg -l |grep cloudstack-management |head -n1 |awk '{print $3}') + sed -i "s,^ACS_VERSION=.*,ACS_VERSION=$acs_version,g" /usr/share/cloudstack-common/scripts/installer/cloudstack-help-text /usr/share/cloudstack-common/scripts/installer/cloudstack-help-text fi fi diff --git a/debian/cloudstack-usage.postinst b/debian/cloudstack-usage.postinst index 88efe885d456..99e51e4c019f 100755 --- a/debian/cloudstack-usage.postinst +++ b/debian/cloudstack-usage.postinst @@ -43,6 +43,8 @@ case "$1" in # Print help message if [ -f "/usr/share/cloudstack-common/scripts/installer/cloudstack-help-text" ];then + acs_version=$(dpkg -l |grep cloudstack-usage |head -n1 |awk '{print $3}') + sed -i "s,^ACS_VERSION=.*,ACS_VERSION=$acs_version,g" /usr/share/cloudstack-common/scripts/installer/cloudstack-help-text /usr/share/cloudstack-common/scripts/installer/cloudstack-help-text fi ;; diff --git a/packaging/centos7/cloud.spec b/packaging/centos7/cloud.spec index b6e38016e71c..8d36f892e8c0 100644 --- a/packaging/centos7/cloud.spec +++ b/packaging/centos7/cloud.spec @@ -461,6 +461,7 @@ systemctl daemon-reload %posttrans management # Print help message if [ -f "/usr/share/cloudstack-common/scripts/installer/cloudstack-help-text" ];then + sed -i "s,^ACS_VERSION=.*,ACS_VERSION=%{_maventag},g" /usr/share/cloudstack-common/scripts/installer/cloudstack-help-text /usr/share/cloudstack-common/scripts/installer/cloudstack-help-text fi @@ -505,6 +506,7 @@ systemctl daemon-reload %posttrans agent # Print help message if [ -f "/usr/share/cloudstack-common/scripts/installer/cloudstack-help-text" ];then + sed -i "s,^ACS_VERSION=.*,ACS_VERSION=%{_maventag},g" /usr/share/cloudstack-common/scripts/installer/cloudstack-help-text /usr/share/cloudstack-common/scripts/installer/cloudstack-help-text fi @@ -539,6 +541,7 @@ fi %posttrans usage # Print help message if [ -f "/usr/share/cloudstack-common/scripts/installer/cloudstack-help-text" ];then + sed -i "s,^ACS_VERSION=.*,ACS_VERSION=%{_maventag},g" /usr/share/cloudstack-common/scripts/installer/cloudstack-help-text /usr/share/cloudstack-common/scripts/installer/cloudstack-help-text fi diff --git a/packaging/centos8/cloud.spec b/packaging/centos8/cloud.spec index a3909eb87fca..212fd8b3ed43 100644 --- a/packaging/centos8/cloud.spec +++ b/packaging/centos8/cloud.spec @@ -452,6 +452,7 @@ systemctl daemon-reload %posttrans management # Print help message if [ -f "/usr/share/cloudstack-common/scripts/installer/cloudstack-help-text" ];then + sed -i "s,^ACS_VERSION=.*,ACS_VERSION=%{_maventag},g" /usr/share/cloudstack-common/scripts/installer/cloudstack-help-text /usr/share/cloudstack-common/scripts/installer/cloudstack-help-text fi @@ -496,6 +497,7 @@ systemctl daemon-reload %posttrans agent # Print help message if [ -f "/usr/share/cloudstack-common/scripts/installer/cloudstack-help-text" ];then + sed -i "s,^ACS_VERSION=.*,ACS_VERSION=%{_maventag},g" /usr/share/cloudstack-common/scripts/installer/cloudstack-help-text /usr/share/cloudstack-common/scripts/installer/cloudstack-help-text fi @@ -530,6 +532,7 @@ fi %posttrans usage # Print help message if [ -f "/usr/share/cloudstack-common/scripts/installer/cloudstack-help-text" ];then + sed -i "s,^ACS_VERSION=.*,ACS_VERSION=%{_maventag},g" /usr/share/cloudstack-common/scripts/installer/cloudstack-help-text /usr/share/cloudstack-common/scripts/installer/cloudstack-help-text fi diff --git a/packaging/suse15/cloud.spec b/packaging/suse15/cloud.spec index 909f4d9bff72..f33ac0685089 100644 --- a/packaging/suse15/cloud.spec +++ b/packaging/suse15/cloud.spec @@ -446,6 +446,7 @@ systemctl daemon-reload %posttrans management # Print help message if [ -f "/usr/share/cloudstack-common/scripts/installer/cloudstack-help-text" ];then + sed -i "s,^ACS_VERSION=.*,ACS_VERSION=%{_maventag},g" /usr/share/cloudstack-common/scripts/installer/cloudstack-help-text /usr/share/cloudstack-common/scripts/installer/cloudstack-help-text fi @@ -490,6 +491,7 @@ systemctl daemon-reload %posttrans agent # Print help message if [ -f "/usr/share/cloudstack-common/scripts/installer/cloudstack-help-text" ];then + sed -i "s,^ACS_VERSION=.*,ACS_VERSION=%{_maventag},g" /usr/share/cloudstack-common/scripts/installer/cloudstack-help-text /usr/share/cloudstack-common/scripts/installer/cloudstack-help-text fi @@ -524,6 +526,7 @@ fi %posttrans usage # Print help message if [ -f "/usr/share/cloudstack-common/scripts/installer/cloudstack-help-text" ];then + sed -i "s,^ACS_VERSION=.*,ACS_VERSION=%{_maventag},g" /usr/share/cloudstack-common/scripts/installer/cloudstack-help-text /usr/share/cloudstack-common/scripts/installer/cloudstack-help-text fi diff --git a/scripts/installer/cloudstack-help-text b/scripts/installer/cloudstack-help-text index 6757b0de35de..754dc35f98ba 100755 --- a/scripts/installer/cloudstack-help-text +++ b/scripts/installer/cloudstack-help-text @@ -16,13 +16,15 @@ # specific language governing permissions and limitations # under the License. +ACS_VERSION= +ACL_MINOR_VERSION=$(echo $ACS_VERSION | cut -d'-' -f1) printf "\n" -printf "Thank you for installing Apache CloudStack !\n" +printf "Thank you for installing Apache CloudStack ${ACS_VERSION:-} !\n" printf "\n" -printf " * Project: https://cloudstack.apache.org/\n" -printf " * Documentation: https://docs.cloudstack.apache.org/\n" +printf " * Project website: https://cloudstack.apache.org/\n" +printf " * Documentation: https://docs.cloudstack.apache.org/en/${ACL_MINOR_VERSION:-latest}/\n" +printf " * Release notes: https://docs.cloudstack.apache.org/en/${ACL_MINOR_VERSION:-latest}/releasenotes/\n" printf " * Join us: https://cloudstack.apache.org/mailing-lists.html\n" -printf " * Your feedback: https://cloudstack.apache.org/survey.html\n" +printf " * Take the survey: https://cloudstack.apache.org/survey.html\n" printf " * Report issues: https://github.com/apache/cloudstack/issues\n" -printf " * Latest releases: https://github.com/apache/cloudstack/releases\n" printf "\n" diff --git a/ui/public/locales/en.json b/ui/public/locales/en.json index 1abfc781220b..f473c2c74c8e 100644 --- a/ui/public/locales/en.json +++ b/ui/public/locales/en.json @@ -3015,7 +3015,7 @@ "message.host.dedication.released": "Host dedication released", "message.info.cloudian.console": "Cloudian Management Console should open in another window", "message.installwizard.click.retry": "Click the button to retry launch.", -"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", +"message.installwizard.cloudstack.helptext": "\nFind more information on pages below.\n * Project website: \t https://cloudstack.apache.org/\n * Documentation: \t https://docs.cloudstack.apache.org/\n * Release notes: \t https://docs.cloudstack.apache.org/en/latest/releasenotes/\n * Join us: \t\t https://cloudstack.apache.org/mailing-lists.html\n * Take the survey: \t https://cloudstack.apache.org/survey.html\n * Report issues: \t https://github.com/apache/cloudstack/issues\n", "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.

CloudStack™; allows multiple clusters in a cloud deployment, but for a Basic Installation, we only need one cluster.", "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.

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.", "message.installwizard.copy.whatisapod": "A pod often represents a single rack. Hosts in the same pod are in the same subnet.

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.", From 5372aa18fac7d72e03dcb528b46e46a0072523f5 Mon Sep 17 00:00:00 2001 From: Wei Zhou Date: Thu, 13 Jan 2022 09:06:37 +0100 Subject: [PATCH 3/5] Update #5851: display package name in help message --- debian/cloudstack-agent.postinst | 2 +- debian/cloudstack-management.postinst | 2 +- debian/cloudstack-usage.postinst | 2 +- packaging/centos7/cloud.spec | 6 +++--- packaging/centos8/cloud.spec | 6 +++--- packaging/suse15/cloud.spec | 6 +++--- scripts/installer/cloudstack-help-text | 15 ++++++++++++++- 7 files changed, 26 insertions(+), 13 deletions(-) diff --git a/debian/cloudstack-agent.postinst b/debian/cloudstack-agent.postinst index 2ca2fc4f2dd4..758af6e068ff 100755 --- a/debian/cloudstack-agent.postinst +++ b/debian/cloudstack-agent.postinst @@ -57,7 +57,7 @@ case "$1" in if [ -f "/usr/share/cloudstack-common/scripts/installer/cloudstack-help-text" ];then acs_version=$(dpkg -l |grep cloudstack-agent |head -n1 |awk '{print $3}') sed -i "s,^ACS_VERSION=.*,ACS_VERSION=$acs_version,g" /usr/share/cloudstack-common/scripts/installer/cloudstack-help-text - /usr/share/cloudstack-common/scripts/installer/cloudstack-help-text + /usr/share/cloudstack-common/scripts/installer/cloudstack-help-text agent fi ;; diff --git a/debian/cloudstack-management.postinst b/debian/cloudstack-management.postinst index d41d86ab38f4..4527cbe068c5 100755 --- a/debian/cloudstack-management.postinst +++ b/debian/cloudstack-management.postinst @@ -76,7 +76,7 @@ if [ "$1" = configure ]; then if [ -f "/usr/share/cloudstack-common/scripts/installer/cloudstack-help-text" ];then acs_version=$(dpkg -l |grep cloudstack-management |head -n1 |awk '{print $3}') sed -i "s,^ACS_VERSION=.*,ACS_VERSION=$acs_version,g" /usr/share/cloudstack-common/scripts/installer/cloudstack-help-text - /usr/share/cloudstack-common/scripts/installer/cloudstack-help-text + /usr/share/cloudstack-common/scripts/installer/cloudstack-help-text management fi fi diff --git a/debian/cloudstack-usage.postinst b/debian/cloudstack-usage.postinst index 99e51e4c019f..f39725687cbe 100755 --- a/debian/cloudstack-usage.postinst +++ b/debian/cloudstack-usage.postinst @@ -45,7 +45,7 @@ case "$1" in if [ -f "/usr/share/cloudstack-common/scripts/installer/cloudstack-help-text" ];then acs_version=$(dpkg -l |grep cloudstack-usage |head -n1 |awk '{print $3}') sed -i "s,^ACS_VERSION=.*,ACS_VERSION=$acs_version,g" /usr/share/cloudstack-common/scripts/installer/cloudstack-help-text - /usr/share/cloudstack-common/scripts/installer/cloudstack-help-text + /usr/share/cloudstack-common/scripts/installer/cloudstack-help-text usage fi ;; esac diff --git a/packaging/centos7/cloud.spec b/packaging/centos7/cloud.spec index 8d36f892e8c0..c067f011b9f6 100644 --- a/packaging/centos7/cloud.spec +++ b/packaging/centos7/cloud.spec @@ -462,7 +462,7 @@ systemctl daemon-reload # Print help message if [ -f "/usr/share/cloudstack-common/scripts/installer/cloudstack-help-text" ];then sed -i "s,^ACS_VERSION=.*,ACS_VERSION=%{_maventag},g" /usr/share/cloudstack-common/scripts/installer/cloudstack-help-text - /usr/share/cloudstack-common/scripts/installer/cloudstack-help-text + /usr/share/cloudstack-common/scripts/installer/cloudstack-help-text management fi %preun agent @@ -507,7 +507,7 @@ systemctl daemon-reload # Print help message if [ -f "/usr/share/cloudstack-common/scripts/installer/cloudstack-help-text" ];then sed -i "s,^ACS_VERSION=.*,ACS_VERSION=%{_maventag},g" /usr/share/cloudstack-common/scripts/installer/cloudstack-help-text - /usr/share/cloudstack-common/scripts/installer/cloudstack-help-text + /usr/share/cloudstack-common/scripts/installer/cloudstack-help-text agent fi %pre usage @@ -542,7 +542,7 @@ fi # Print help message if [ -f "/usr/share/cloudstack-common/scripts/installer/cloudstack-help-text" ];then sed -i "s,^ACS_VERSION=.*,ACS_VERSION=%{_maventag},g" /usr/share/cloudstack-common/scripts/installer/cloudstack-help-text - /usr/share/cloudstack-common/scripts/installer/cloudstack-help-text + /usr/share/cloudstack-common/scripts/installer/cloudstack-help-text usage fi %post marvin diff --git a/packaging/centos8/cloud.spec b/packaging/centos8/cloud.spec index 212fd8b3ed43..666f2d8191c3 100644 --- a/packaging/centos8/cloud.spec +++ b/packaging/centos8/cloud.spec @@ -453,7 +453,7 @@ systemctl daemon-reload # Print help message if [ -f "/usr/share/cloudstack-common/scripts/installer/cloudstack-help-text" ];then sed -i "s,^ACS_VERSION=.*,ACS_VERSION=%{_maventag},g" /usr/share/cloudstack-common/scripts/installer/cloudstack-help-text - /usr/share/cloudstack-common/scripts/installer/cloudstack-help-text + /usr/share/cloudstack-common/scripts/installer/cloudstack-help-text management fi %preun agent @@ -498,7 +498,7 @@ systemctl daemon-reload # Print help message if [ -f "/usr/share/cloudstack-common/scripts/installer/cloudstack-help-text" ];then sed -i "s,^ACS_VERSION=.*,ACS_VERSION=%{_maventag},g" /usr/share/cloudstack-common/scripts/installer/cloudstack-help-text - /usr/share/cloudstack-common/scripts/installer/cloudstack-help-text + /usr/share/cloudstack-common/scripts/installer/cloudstack-help-text agent fi %pre usage @@ -533,7 +533,7 @@ fi # Print help message if [ -f "/usr/share/cloudstack-common/scripts/installer/cloudstack-help-text" ];then sed -i "s,^ACS_VERSION=.*,ACS_VERSION=%{_maventag},g" /usr/share/cloudstack-common/scripts/installer/cloudstack-help-text - /usr/share/cloudstack-common/scripts/installer/cloudstack-help-text + /usr/share/cloudstack-common/scripts/installer/cloudstack-help-text usage fi %post marvin diff --git a/packaging/suse15/cloud.spec b/packaging/suse15/cloud.spec index f33ac0685089..8cfa138279d2 100644 --- a/packaging/suse15/cloud.spec +++ b/packaging/suse15/cloud.spec @@ -447,7 +447,7 @@ systemctl daemon-reload # Print help message if [ -f "/usr/share/cloudstack-common/scripts/installer/cloudstack-help-text" ];then sed -i "s,^ACS_VERSION=.*,ACS_VERSION=%{_maventag},g" /usr/share/cloudstack-common/scripts/installer/cloudstack-help-text - /usr/share/cloudstack-common/scripts/installer/cloudstack-help-text + /usr/share/cloudstack-common/scripts/installer/cloudstack-help-text management fi %preun agent @@ -492,7 +492,7 @@ systemctl daemon-reload # Print help message if [ -f "/usr/share/cloudstack-common/scripts/installer/cloudstack-help-text" ];then sed -i "s,^ACS_VERSION=.*,ACS_VERSION=%{_maventag},g" /usr/share/cloudstack-common/scripts/installer/cloudstack-help-text - /usr/share/cloudstack-common/scripts/installer/cloudstack-help-text + /usr/share/cloudstack-common/scripts/installer/cloudstack-help-text agent fi %pre usage @@ -527,7 +527,7 @@ fi # Print help message if [ -f "/usr/share/cloudstack-common/scripts/installer/cloudstack-help-text" ];then sed -i "s,^ACS_VERSION=.*,ACS_VERSION=%{_maventag},g" /usr/share/cloudstack-common/scripts/installer/cloudstack-help-text - /usr/share/cloudstack-common/scripts/installer/cloudstack-help-text + /usr/share/cloudstack-common/scripts/installer/cloudstack-help-text usage fi %post marvin diff --git a/scripts/installer/cloudstack-help-text b/scripts/installer/cloudstack-help-text index 754dc35f98ba..d7b1ad142bbb 100755 --- a/scripts/installer/cloudstack-help-text +++ b/scripts/installer/cloudstack-help-text @@ -18,8 +18,21 @@ ACS_VERSION= ACL_MINOR_VERSION=$(echo $ACS_VERSION | cut -d'-' -f1) + +case $1 in + management) + PACKAGE="Managment Server" + ;; + usage) + PACKAGE="Usage Server" + ;; + agent) + PACKAGE="Agent" + ;; +esac + printf "\n" -printf "Thank you for installing Apache CloudStack ${ACS_VERSION:-} !\n" +printf "Thank you for installing Apache CloudStack ${PACKAGE} ${ACS_VERSION} !\n" printf "\n" printf " * Project website: https://cloudstack.apache.org/\n" printf " * Documentation: https://docs.cloudstack.apache.org/en/${ACL_MINOR_VERSION:-latest}/\n" From 15cd53cbb8d2d9763b224b02ced1f1bc0ee626bb Mon Sep 17 00:00:00 2001 From: Wei Zhou Date: Fri, 21 Jan 2022 09:21:08 +0100 Subject: [PATCH 4/5] Update #5851: display links of installed cloudstack version on UI --- scripts/installer/cloudstack-help-text | 12 ++++++------ ui/public/locales/en.json | 8 +++++++- ui/src/views/dashboard/OnboardingDashboard.vue | 12 ++++++++++-- 3 files changed, 23 insertions(+), 9 deletions(-) diff --git a/scripts/installer/cloudstack-help-text b/scripts/installer/cloudstack-help-text index d7b1ad142bbb..75327cf3f5b9 100755 --- a/scripts/installer/cloudstack-help-text +++ b/scripts/installer/cloudstack-help-text @@ -34,10 +34,10 @@ esac printf "\n" printf "Thank you for installing Apache CloudStack ${PACKAGE} ${ACS_VERSION} !\n" printf "\n" -printf " * Project website: https://cloudstack.apache.org/\n" -printf " * Documentation: https://docs.cloudstack.apache.org/en/${ACL_MINOR_VERSION:-latest}/\n" -printf " * Release notes: https://docs.cloudstack.apache.org/en/${ACL_MINOR_VERSION:-latest}/releasenotes/\n" -printf " * Join us: https://cloudstack.apache.org/mailing-lists.html\n" -printf " * Take the survey: https://cloudstack.apache.org/survey.html\n" -printf " * Report issues: https://github.com/apache/cloudstack/issues\n" +printf " * Project website: https://cloudstack.apache.org/\n" +printf " * Documentation: https://docs.cloudstack.apache.org/en/${ACL_MINOR_VERSION:-latest}/\n" +printf " * Release notes: https://docs.cloudstack.apache.org/en/${ACL_MINOR_VERSION:-latest}/releasenotes/\n" +printf " * Join mailing lists: https://cloudstack.apache.org/mailing-lists.html\n" +printf " * Take the survey: https://cloudstack.apache.org/survey.html\n" +printf " * Report issues: https://github.com/apache/cloudstack/issues/new\n" printf "\n" diff --git a/ui/public/locales/en.json b/ui/public/locales/en.json index f473c2c74c8e..12375ce0edde 100644 --- a/ui/public/locales/en.json +++ b/ui/public/locales/en.json @@ -3015,7 +3015,13 @@ "message.host.dedication.released": "Host dedication released", "message.info.cloudian.console": "Cloudian Management Console should open in another window", "message.installwizard.click.retry": "Click the button to retry launch.", -"message.installwizard.cloudstack.helptext": "\nFind more information on pages below.\n * Project website: \t https://cloudstack.apache.org/\n * Documentation: \t https://docs.cloudstack.apache.org/\n * Release notes: \t https://docs.cloudstack.apache.org/en/latest/releasenotes/\n * Join us: \t\t https://cloudstack.apache.org/mailing-lists.html\n * Take the survey: \t https://cloudstack.apache.org/survey.html\n * Report issues: \t https://github.com/apache/cloudstack/issues\n", +"message.installwizard.cloudstack.helptext.header": "\nFind more information on pages below.\n", +"message.installwizard.cloudstack.helptext.website": " * Project website:\t ", +"message.installwizard.cloudstack.helptext.document": " * Documentation:\t ", +"message.installwizard.cloudstack.helptext.releasenotes": " * Release notes:\t ", +"message.installwizard.cloudstack.helptext.mailinglists": " * Join mailing lists:\t ", +"message.installwizard.cloudstack.helptext.survey": " * Take the survey:\t ", +"message.installwizard.cloudstack.helptext.issues": " * Report issues:\t ", "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.

CloudStack™; allows multiple clusters in a cloud deployment, but for a Basic Installation, we only need one cluster.", "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.

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.", "message.installwizard.copy.whatisapod": "A pod often represents a single rack. Hosts in the same pod are in the same subnet.

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.", diff --git a/ui/src/views/dashboard/OnboardingDashboard.vue b/ui/src/views/dashboard/OnboardingDashboard.vue index 16e8e06c4f7f..d4002dc0be43 100644 --- a/ui/src/views/dashboard/OnboardingDashboard.vue +++ b/ui/src/views/dashboard/OnboardingDashboard.vue @@ -27,7 +27,14 @@
{{ $t('label.introduction.to.cloudstack') }}

{{ $t('message.installwizard.copy.whatiscloudstack') }}

- 
{{ $t('message.installwizard.cloudstack.helptext') }}
+ 
{{ $t('message.installwizard.cloudstack.helptext.header') }}
+ 
{{ $t('message.installwizard.cloudstack.helptext.website') }}https://cloudstack.apache.org
+ 
{{ $t('message.installwizard.cloudstack.helptext.document') }}https://docs.cloudstack.apache.org/en/{{cloudstackminorversion}}
+ 
{{ $t('message.installwizard.cloudstack.helptext.releasenotes') }}https://docs.cloudstack.apache.org/en/{{cloudstackminorversion}}/releasenotes/
+ 
{{ $t('message.installwizard.cloudstack.helptext.mailinglists') }}https://cloudstack.apache.org/mailing-lists.html
+ 
{{ $t('message.installwizard.cloudstack.helptext.survey') }}https://cloudstack.apache.org/survey.html
+ 
{{ $t('message.installwizard.cloudstack.helptext.issues') }}https://github.com/apache/cloudstack/issues/new
+ {{ $t('label.continue.install') }} @@ -78,6 +85,7 @@ export default { data () { return { step: 0, + cloudstackminorversion: this.$store.getters.features.cloudstackversion.split('-')[0], resource: { id: this.$store.getters.userInfo.id, username: this.$store.getters.userInfo.username @@ -142,8 +150,8 @@ pre { font-family: sans-serif; text-align: justify; font-size: 15px; - line-height: 23px; white-space: pre-wrap; + margin: 0px 0px; } .center { From d5f5744d3e85779205959f58cb89631fc9387aad Mon Sep 17 00:00:00 2001 From: Wei Zhou Date: Fri, 21 Jan 2022 09:23:04 +0100 Subject: [PATCH 5/5] Update #5851: fix vue warnings --- ui/src/views/dashboard/OnboardingDashboard.vue | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/ui/src/views/dashboard/OnboardingDashboard.vue b/ui/src/views/dashboard/OnboardingDashboard.vue index d4002dc0be43..a875147174e4 100644 --- a/ui/src/views/dashboard/OnboardingDashboard.vue +++ b/ui/src/views/dashboard/OnboardingDashboard.vue @@ -29,8 +29,9 @@ 
{{ $t('message.installwizard.cloudstack.helptext.header') }}
{{ $t('message.installwizard.cloudstack.helptext.website') }}https://cloudstack.apache.org
- 
{{ $t('message.installwizard.cloudstack.helptext.document') }}https://docs.cloudstack.apache.org/en/{{cloudstackminorversion}}
- 
{{ $t('message.installwizard.cloudstack.helptext.releasenotes') }}https://docs.cloudstack.apache.org/en/{{cloudstackminorversion}}/releasenotes/
+ 
{{ $t('message.installwizard.cloudstack.helptext.document') }}https://docs.cloudstack.apache.org/en/{{ cloudstackminorversion }}
+ 
{{ $t('message.installwizard.cloudstack.helptext.releasenotes') }}https://docs.cloudstack.apache.org/en/{{ cloudstackminorversion }}/releasenotes/
+ 
{{ $t('message.installwizard.cloudstack.helptext.mailinglists') }}https://cloudstack.apache.org/mailing-lists.html
{{ $t('message.installwizard.cloudstack.helptext.survey') }}https://cloudstack.apache.org/survey.html
{{ $t('message.installwizard.cloudstack.helptext.issues') }}https://github.com/apache/cloudstack/issues/new