Merge pull request #7548 from wanyaoqi/automated-cherry-pick-of-#7547-upstream-release-3.3

Automated cherry pick of #7547: support diable usb kbd
Merge pull request #7542 from ioito/automated-cherry-pick-of-#7541-upstream-release-3.3
2026-09-20 16:13:56 +08:00 · 2020-08-11 18:41:28 +08:00 · 2020-08-11 18:39:18 +08:00 · 2020-08-11 15:32:31 +08:00 · 2020-08-11 14:54:31 +08:00 · 2020-08-11 11:16:20 +08:00
2085 changed files with 36093 additions and 198367 deletions
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -38,7 +38,7 @@ jobs:
          command: |
            targets="$(circleci tests glob "cmd/*" | grep -v cmd/host-image | circleci tests split)"
            echo $targets | tr ' ' '\n'
-            make -j2 $targets
+            make -j3 $targets
            ls -lh _output/bin/
      - save_cache:
          key: onecloud-build-cache-{{ checksum "go.mod" }}-{{ checksum "Makefile" }}
--- a/.dockerignore
+++ b/.dockerignore
@@ -0,0 +1,4 @@
+/.git
+/vendor
+/cmd
+/pkg
--- a/.github/pull_request_template.md
+++ b/.github/pull_request_template.md
@@ -11,5 +11,5 @@
 <!--
 如果不需要，填写 "NONE".
 如果需要，就以下面 item 的格式写 release 分支名，并提交对应的 cherry-pick PR:
- release/3.2
+- release/3.1
 -->
--- a/.github/workflows/docker.yml
+++ b/.github/workflows/docker.yml
@@ -17,10 +17,10 @@ jobs:
    runs-on: ubuntu-latest
    steps:

-    - name: Set up Go 1.14
+    - name: Set up Go 1.12
      uses: actions/setup-go@v1
      with:
-        go-version: 1.14
+        go-version: 1.12
      id: go

    - name: Check out code into the Go module directory
@@ -30,8 +30,17 @@ jobs:
      run: |
        sudo apt-get update
        sudo apt-get install librados-dev librbd-dev # baremetal-agent needs this
+        make cmd/apigateway cmd/climc cmd/keystone
+        make cmd/logger cmd/region cmd/scheduler cmd/webconsole
+        make cmd/yunionconf cmd/glance cmd/torrent cmd/s3gateway
+        make cmd/ansibleserver cmd/cloudnet cmd/notify
+        make cmd/host-deployer && ./scripts/bundle_libraries.sh _output/bin/bundles/host-deployer _output/bin/host-deployer
        make cmd/baremetal-agent && ./scripts/bundle_libraries.sh _output/bin/bundles/baremetal-agent _output/bin/baremetal-agent
-        make docker-alpine-build F='-j4 cmd/host cmd/vpcagent cmd/region-dns make cmd/apigateway cmd/climc cmd/keystone make cmd/logger cmd/region cmd/scheduler cmd/webconsole make cmd/yunionconf cmd/glance cmd/torrent cmd/s3gateway make cmd/ansibleserver cmd/cloudnet cmd/notify make cmd/host-deployer make cmd/cloudevent cmd/devtool cmd/cloudid make cmd/*cli make cmd/esxi-agent'
+        make cmd/cloudevent cmd/devtool cmd/cloudid
+        make cmd/*cli
+        make cmd/esxi-agent
+        make docker-alpine-build F='-j4 cmd/host cmd/vpcagent cmd/region-dns'
+
    - name: Image region
      uses: elgohr/Publish-Docker-Github-Action@master
      with:
--- a/.gitignore
+++ b/.gitignore
@@ -37,6 +37,3 @@ GTAGS
 pkg/generated

 *.orig
-
-# gotext extracted
-out.gotext.json
--- a/.travis.yml
+++ b/.travis.yml
@@ -15,7 +15,7 @@ addons:

 language: go
 go:
-  - 1.14.x
+  - 1.12.x
 go_import_path: yunion.io/x/onecloud
 cache:
  directories:
--- a/15
+++ b/15
@@ -199,7 +199,7 @@ mod:
 	go mod vendor -v


-DOCKER_CENTOS_BUILD_IMAGE?=registry.cn-beijing.aliyuncs.com/yunionio/centos-build:1.1-1
+DOCKER_BUILD_IMAGE_VERSION?=1.0-1

 define dockerCentOSBuildCmd
 set -o xtrace
@@ -215,11 +215,11 @@ docker-centos-build: export dockerCentOSBuildCmd:=$(call dockerCentOSBuildCmd,$(
 docker-centos-build:
 	docker rm --force onecloud-ci-build &>/dev/null || true
 	docker run \
-		--name onecloud-docker-centos-build \
+		--name onecloud-ci-build \
 		--rm \
 		--volume $(CURDIR):/root/onecloud \
 		--volume $(CURDIR)/_output/_cache:/root/.cache \
-		$(DOCKER_CENTOS_BUILD_IMAGE) \
+		registry.cn-beijing.aliyuncs.com/yunionio/centos-build:$(DOCKER_BUILD_IMAGE_VERSION) \
 		/bin/bash -c "$$dockerCentOSBuildCmd"
 	chown -R $$(id -u):$$(id -g) _output
 	ls -lh _output/bin
@@ -227,13 +227,11 @@ docker-centos-build:
 # NOTE we need a way to stop and remove the container started by docker-build.
 # No --tty, --stop-signal won't work
 docker-centos-build-stop:
-	docker stop --time 0 onecloud-docker-centos-build || true
+	docker-centos stop --time 0 onecloud-ci-build || true

 .PHONY: docker-centos-build
 .PHONY: docker-centos-build-stop

-DOCKER_ALPINE_BUILD_IMAGE?=registry.cn-beijing.aliyuncs.com/yunionio/alpine-build:1.0-3
-
 define dockerAlpineBuildCmd
 set -o xtrace
 set -o errexit
@@ -252,7 +250,7 @@ docker-alpine-build:
 		-v $(CURDIR):/root/go/src/yunion.io/x/onecloud \
 		-v $(CURDIR)/_output/alpine-build:/root/go/src/yunion.io/x/onecloud/_output \
 		-v $(CURDIR)/_output/alpine-build/_cache:/root/.cache \
-		$(DOCKER_ALPINE_BUILD_IMAGE) \
+		registry.cn-beijing.aliyuncs.com/yunionio/alpine-build:1.0-1 \
 		/bin/sh -c "$$dockerAlpineBuildCmd"
 	ls -lh _output/alpine-build/bin

@@ -314,8 +312,7 @@ VERSION ?= $(shell git describe --exact-match 2> /dev/null || \
                git describe --match=$(git rev-parse --short=8 HEAD) --always --dirty --abbrev=8)

 image:
-	mkdir -p $(ROOT_DIR)/_output
-	DEBUG=$(DEBUG) ARCH=$(ARCH) TAG=$(VERSION) REGISTRY=$(REGISTRY) $(ROOT_DIR)/scripts/docker_push.sh $(filter-out $@,$(MAKECMDGOALS))
+	TAG=$(VERSION) REGISTRY=$(REGISTRY) $(ROOT_DIR)/scripts/docker_push.sh $(filter-out $@,$(MAKECMDGOALS))

 .PHONY: image

--- a/README-CN.md
+++ b/README-CN.md
@@ -41,7 +41,7 @@

 ## 架构

-![architecture](./docs/architecture.svg)
+![architecture](./docs/architecture.png)


 ## 贡献
--- a/README.md
+++ b/README.md
@@ -44,7 +44,7 @@ Please refers to [install & deployment](https://docs.yunion.io/docs/setup/) (cur

 ## Architecture

-![architecture](./docs/architecture.svg)
+![architecture](./docs/architecture.png)

 ## Contribution

--- a/build/build.sh
+++ b/build/build.sh
@@ -13,7 +13,6 @@ SRC_BUILD=$ROOT_DIR/build
 OUTPUT_DIR=$ROOT_DIR/_output/rpms

 PKG=$1
-BIN_PATH=${2:-/opt/yunion/bin}

 if [ -z "$PKG" ]; then
    echo "Usage: $0 <package>"
@@ -91,9 +90,9 @@ $DESCRIPTION
 %build

 %install
-install -D -m 0755 $BIN \$RPM_BUILD_ROOT$BIN_PATH/$PKG
+install -D -m 0755 $BIN \$RPM_BUILD_ROOT/opt/yunion/bin/$PKG
 for bin in $EXTRA_BINS; do
-  install -D -m 0755 $SRC_BIN/\$bin \$RPM_BUILD_ROOT$BIN_PATH/\$bin
+  install -D -m 0755 $SRC_BIN/\$bin \$RPM_BUILD_ROOT/opt/yunion/bin/\$bin
 done
 if [ -d $ROOT/root ]; then
  rsync -a $ROOT/root/ \$RPM_BUILD_ROOT
@@ -125,8 +124,8 @@ getent passwd %{owner} >/dev/null || /usr/sbin/useradd -r -s /sbin/nologin -d %{

 %files
 %doc
-$BIN_PATH/$PKG
-$(for b in $EXTRA_BINS; do echo $BIN_PATH/$b; done)
+/opt/yunion/bin/$PKG
+$(for b in $EXTRA_BINS; do echo /opt/yunion/bin/$b; done)
 " > $SPEC_FILE

 if [ -d $ROOT/root/ ]; then
--- a/build/cloudid/root/opt/yunion/share/saml/sp-metadata/aliyun_role.xml
+++ b/build/cloudid/root/opt/yunion/share/saml/sp-metadata/aliyun_role.xml
@@ -1,47 +0,0 @@
-<?xml version="1.0"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" entityID="urn:alibaba:cloudcomputing">
-    <SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol" WantAssertionsSigned="true">
-        <KeyDescriptor use="signing">
-            <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-                <ds:X509Data>
-                    <ds:X509Certificate>MIIDXjCCAkagAwIBAgIEXHToLjANBgkqhkiG9w0BAQsFADBwMQswCQYDVQQGEwJDTjERMA8GA1UE
-                        CBMISGFuZ3pob3UxKTAnBgNVBAsTIEFsaWJhYmEgQ2xvdWQgQ29tcHV0aW5nIENvLiBMdGQuMSMw
-                        IQYDVQQDExp1cm46YWxpYmFiYTpjbG91ZGNvbXB1dGluZzAgFw0xOTAyMjYwNzE4MDZaGA8yMTE5
-                        MDIwMjA3MTgwNlowcDELMAkGA1UEBhMCQ04xETAPBgNVBAgTCEhhbmd6aG91MSkwJwYDVQQLEyBB
-                        bGliYWJhIENsb3VkIENvbXB1dGluZyBDby4gTHRkLjEjMCEGA1UEAxMadXJuOmFsaWJhYmE6Y2xv
-                        dWRjb21wdXRpbmcwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDDjD53ZENEHoYNXAOf
-                        OIbVBJhj7SCWKmdjnbnxq8WAFWEeZtS6hZLPpWh1z7b0NjJkvCf5oFVqBJYbbW5kEKV+9CpV6VHZ
-                        qOXmsIRlkvZB+Wnc3SduwiiiUR9JojSPxVQvSf4WLT+HDASlrBztuRV2vHj9utLbvy+6bgVBqF8g
-                        emL9Pcif1robDH8HlqUcADXLAt18E4MbToldVoHjpFc6fAKUXujWH5feAL8g0CKlmf/JVlHLEtu4
-                        vKPxBQ8sgkysk6EnrjXl6Q4a4t+vbPG5uczA1ouTkDupMCRlaWHIHaJL/AoDGabn8sVXdaVJUKC5
-                        54FNkRznBhRQll+Nuc2rAgMBAAEwDQYJKoZIhvcNAQELBQADggEBAE8k4S4HvOglthJwF3aMQXGi
-                        LKW6Becs9SljA0/5VtZQDrDf2By/1BIMvWfZ/dFnO+MylDLVdS6XWvWat/DW0fOGxU4s1WNfshX7
-                        DJDGR2G1XgtGoDZEYIDahUp5katAPypCkY57fGZlI0d3nq46/2qT/Zpne+pFE3DI/x8klZMniniw
-                        YjNXbG96y/M4DYi1J7RR8mLIfVvz5o1SMGT4Ta2p/USE2M9F6O7/zc2j62dQgXiYa9OONo31RiXR
-                        TmvGEUNuQoBZhVrFIvOnNjIfFT7Xd3CUowwJKP1floserrx4B5jScRAi9yK3x2a2lhfc+PksXfTs
-                        aqIr5TQL4OorLEE=</ds:X509Certificate>
-                </ds:X509Data>
-            </ds:KeyInfo>
-        </KeyDescriptor>
-        <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
-        <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:persistent</NameIDFormat>
-        <NameIDFormat>urn:oasis:names:tc:SAML:1.1:nameid-format:emailAddress</NameIDFormat>
-        <NameIDFormat>urn:oasis:names:tc:SAML:1.1:nameid-format:unspecified</NameIDFormat>
-        <NameIDFormat>urn:oasis:names:tc:SAML:1.1:nameid-format:X509SubjectName</NameIDFormat>
-        <NameIDFormat>urn:oasis:names:tc:SAML:1.1:nameid-format:WindowsDomainQualifiedName</NameIDFormat>
-        <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:kerberos</NameIDFormat>
-        <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:entity</NameIDFormat>
-        <AssertionConsumerService index="1" isDefault="true" Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://signin.aliyun.com/saml-role/sso"/>
-        <AttributeConsumingService index="1">
-            <ServiceName xml:lang="en">Alibaba Cloud Console Single Sign-On</ServiceName>
-            <RequestedAttribute isRequired="true" Name="https://www.aliyun.com/SAML-Role/Attributes/Role" FriendlyName="RoleEntitlement"/>
-            <RequestedAttribute isRequired="true" Name="https://www.aliyun.com/SAML-Role/Attributes/RoleSessionName" FriendlyName="RoleSessionName"/>
-            <RequestedAttribute isRequired="false" Name="https://www.aliyun.com/SAML-Role/Attributes/SessionDuration" FriendlyName="SessionDuration"/>
-        </AttributeConsumingService>
-    </SPSSODescriptor>
-    <Organization>
-        <OrganizationName xml:lang="en">Alibaba Cloud Computing Co. Ltd.</OrganizationName>
-        <OrganizationDisplayName xml:lang="en">AlibabaCloud</OrganizationDisplayName>
-        <OrganizationURL xml:lang="en">https://www.aliyun.com</OrganizationURL>
-    </Organization>
-</EntityDescriptor>
--- a/build/cloudid/root/opt/yunion/share/saml/sp-metadata/aws.xml
+++ b/build/cloudid/root/opt/yunion/share/saml/sp-metadata/aws.xml
@@ -1,67 +0,0 @@
-<?xml version="1.0"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" entityID="urn:amazon:webservices" validUntil="2021-06-02T00:00:00Z">
-  <SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol" WantAssertionsSigned="true">
-    <KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>MIIDbTCCAlWgAwIBAgIEFWIThjANBgkqhkiG9w0BAQsFADBnMR8wHQYDVQQDExZ1
-cm46YW1hem9uOndlYnNlcnZpY2VzMSIwIAYDVQQKExlBbWF6b24gV2ViIFNlcnZp
-Y2VzLCBJbmMuMRMwEQYDVQQIEwpXYXNoaW5ndG9uMQswCQYDVQQGEwJVUzAeFw0y
-MDA2MDIwMDAwMDBaFw0yMTA2MDIwMDAwMDBaMGcxHzAdBgNVBAMTFnVybjphbWF6
-b246d2Vic2VydmljZXMxIjAgBgNVBAoTGUFtYXpvbiBXZWIgU2VydmljZXMsIElu
-Yy4xEzARBgNVBAgTCldhc2hpbmd0b24xCzAJBgNVBAYTAlVTMIIBIjANBgkqhkiG
-9w0BAQEFAAOCAQ8AMIIBCgKCAQEAwKA4yDh4wAjlkhjJoXARGX9DQWsGTgp9GzoX
-NebntY+DjB8H6hIkYRR3++yEDY90qldbZzOaOKRm2jyL7i+MgNt+ktx6wYGD7HBg
-e8Z0Zh6eHRIwKbvu4/heMLdqqu+hlXkrC15T4N/LqiwT5JhPTrO4V1KG3ljR1ONG
-7aLblVH2aRENV+X9la/AVAPesUpCnoUcTkuCJrcwHrv6hqWmadW8pJy/ISCCM4Fe
-JuOAJD0whxg0qRFvE6xcdnKBTWjR03VHqJnyYQGVUKXOlgj8HiKO0JaJkoUAs5ox
-WCRBZwSQW+qbP1VKSUfFeBtTMx/TSg4nBRYHinego/e8O1mu6wIDAQABoyEwHzAd
-BgNVHQ4EFgQUz1SuekLVxYNvvLpUDRXc/gp2WdAwDQYJKoZIhvcNAQELBQADggEB
-AIkUzM9MXr11vp9gBOOXyqyj7sBgoUQHW3mEfKD3DkEOZWUPW5UI7NM9ZHvhdOwd
-C1noUK/QMjLkTHp0QB2bxCIpgThXSNFDYNRxf1/aUqTfxQ8a+i0q7l/utRiWyY3p
-kLOFx0n81a2bSNz+B0nPS338xNaBtuNjHedXjxN6BjUCUfFHFsQmg/y6ZbBRN/9P
-+i2yy3CjLduh0yeD0Of3vAoIh19MuNgnIy1pMsK/H59E8bAaCFvND9fnsqAfH29W
-ppmt9c8QaiAya5R7akl/C0Rx8khQrba+wMcSultqLU+6YVIAAEKZ/S/ZfN74wn5X
-RXwSXp4MSmOKYqRWshvRegQ=</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
-    <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:persistent</NameIDFormat>
-    <NameIDFormat>urn:oasis:names:tc:SAML:1.1:nameid-format:emailAddress</NameIDFormat>
-    <NameIDFormat>urn:oasis:names:tc:SAML:1.1:nameid-format:unspecified</NameIDFormat>
-    <NameIDFormat>urn:oasis:names:tc:SAML:1.1:nameid-format:X509SubjectName</NameIDFormat>
-    <NameIDFormat>urn:oasis:names:tc:SAML:1.1:nameid-format:WindowsDomainQualifiedName</NameIDFormat>
-    <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:kerberos</NameIDFormat>
-    <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:entity</NameIDFormat>
-    <AssertionConsumerService index="1" isDefault="true" Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://signin.aws.amazon.com/saml"/>
-    <AttributeConsumingService index="1">
-      <ServiceName xml:lang="en">AWS Management Console Single Sign-On</ServiceName>
-      <RequestedAttribute isRequired="true" Name="https://aws.amazon.com/SAML/Attributes/Role" FriendlyName="RoleEntitlement"/>
-      <RequestedAttribute isRequired="true" Name="https://aws.amazon.com/SAML/Attributes/RoleSessionName" FriendlyName="RoleSessionName"/>
-      <RequestedAttribute isRequired="false" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.1" FriendlyName="eduPersonAffiliation"/>
-      <RequestedAttribute isRequired="false" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.2" FriendlyName="eduPersonNickname"/>
-      <RequestedAttribute isRequired="false" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.3" FriendlyName="eduPersonOrgDN"/>
-      <RequestedAttribute isRequired="false" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.4" FriendlyName="eduPersonOrgUnitDN"/>
-      <RequestedAttribute isRequired="false" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.5" FriendlyName="eduPersonPrimaryAffiliation"/>
-      <RequestedAttribute isRequired="false" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.6" FriendlyName="eduPersonPrincipalName"/>
-      <RequestedAttribute isRequired="false" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.7" FriendlyName="eduPersonEntitlement"/>
-      <RequestedAttribute isRequired="false" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.8" FriendlyName="eduPersonPrimaryOrgUnitDN"/>
-      <RequestedAttribute isRequired="false" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.9" FriendlyName="eduPersonScopedAffiliation"/>
-      <RequestedAttribute isRequired="false" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.10" FriendlyName="eduPersonTargetedID"/>
-      <RequestedAttribute isRequired="false" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.11" FriendlyName="eduPersonAssurance"/>
-      <RequestedAttribute isRequired="false" Name="urn:oid:1.3.6.1.4.1.5923.1.2.1.2" FriendlyName="eduOrgHomePageURI"/>
-      <RequestedAttribute isRequired="false" Name="urn:oid:1.3.6.1.4.1.5923.1.2.1.3" FriendlyName="eduOrgIdentityAuthNPolicyURI"/>
-      <RequestedAttribute isRequired="false" Name="urn:oid:1.3.6.1.4.1.5923.1.2.1.4" FriendlyName="eduOrgLegalName"/>
-      <RequestedAttribute isRequired="false" Name="urn:oid:1.3.6.1.4.1.5923.1.2.1.5" FriendlyName="eduOrgSuperiorURI"/>
-      <RequestedAttribute isRequired="false" Name="urn:oid:1.3.6.1.4.1.5923.1.2.1.6" FriendlyName="eduOrgWhitePagesURI"/>
-      <RequestedAttribute isRequired="false" Name="urn:oid:2.5.4.3" FriendlyName="cn"/>
-    </AttributeConsumingService>
-  </SPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">Amazon Web Services, Inc.</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">AWS</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">https://aws.amazon.com</OrganizationURL>
-  </Organization>
-</EntityDescriptor>
-
--- a/build/cloudid/root/opt/yunion/share/saml/sp-metadata/aws_cn.xml
+++ b/build/cloudid/root/opt/yunion/share/saml/sp-metadata/aws_cn.xml
@@ -1,67 +0,0 @@
-<?xml version="1.0"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" entityID="urn:amazon:webservices:cn-north-1" validUntil="2021-05-13T00:00:00Z">
-  <SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol" WantAssertionsSigned="true">
-    <KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>MIIDfzCCAmegAwIBAgIEY1tz5jANBgkqhkiG9w0BAQsFADBwMSgwJgYDVQQDEx91
-cm46YW1hem9uOndlYnNlcnZpY2VzOmNuLW5vcnRoMSIwIAYDVQQKExlBbWF6b24g
-V2ViIFNlcnZpY2VzLCBJbmMuMRMwEQYDVQQIEwpXYXNoaW5ndG9uMQswCQYDVQQG
-EwJVUzAeFw0yMDA1MTMwMDAwMDBaFw0yMTA1MTMwMDAwMDBaMHAxKDAmBgNVBAMT
-H3VybjphbWF6b246d2Vic2VydmljZXM6Y24tbm9ydGgxIjAgBgNVBAoTGUFtYXpv
-biBXZWIgU2VydmljZXMsIEluYy4xEzARBgNVBAgTCldhc2hpbmd0b24xCzAJBgNV
-BAYTAlVTMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAm2HLuzEnEGVT
-C5W215HWuwFLM54v3oHoNy52GGN79VLn7sxm2Z0K+AVijV/rxCbPaNxO6tm/MmN6
-XJkU8g8p7ghT6p+EN/61WG+KgoXIHcl/aZBbkoNTKKPXRvR9EEcyAPdLDBJVJHF5
-lgCkSMHBL3VcCcrpVxFCtUhW+vT3pie2KHLEVb5Ocpq9pO8dNvY2iM7TSIvRu0kL
-IZWUbRF0bP4cpDIVoMEsSJ3gFBCD3yf53UfU2dxjp2mnMjphPucHwml3AcsXN3XT
-Y5j2qksO5xXgFrCZz76l3P7emj5eHIvkxuieU/7u+cYu0HppP+4xszzqvUcoHFRA
-1fC/eFFRAwIDAQABoyEwHzAdBgNVHQ4EFgQUZkQfgy0NWq7kAO8mTQPeSDayJ3Ew
-DQYJKoZIhvcNAQELBQADggEBACmLLD2qBA+KCxv7CiCfznT8XWOLAVf9xP3YMk0N
-WCnugpd30d0YzxtI2PA29cNB2pyuGbaVg+zGqpsfAznaBHvnnEx1fJHNyfXxhAry
-0MdabmbvhMfJPUYRFx/7r6Km8d52e+nv28pP/WrbWs4I0Swm+Rwaj3t32EgCBxQS
-8WWEkG+L00slRgSPkfY8OgOM4QkBThHjGgw0TKFTEvQNVqXOJKQREq0MejyarUSC
-4am+OJeRcWKtPcRo1jUlGWG6eun0ybuw232ZEZHUv33B247aRMuvTgcRTz3s6tUE
-7RoeaMpl3/Y1MKtB2qURiu0Cib27Rl1mckhmfdA+awl3s4s=</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
-    <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:persistent</NameIDFormat>
-    <NameIDFormat>urn:oasis:names:tc:SAML:1.1:nameid-format:emailAddress</NameIDFormat>
-    <NameIDFormat>urn:oasis:names:tc:SAML:1.1:nameid-format:unspecified</NameIDFormat>
-    <NameIDFormat>urn:oasis:names:tc:SAML:1.1:nameid-format:X509SubjectName</NameIDFormat>
-    <NameIDFormat>urn:oasis:names:tc:SAML:1.1:nameid-format:WindowsDomainQualifiedName</NameIDFormat>
-    <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:kerberos</NameIDFormat>
-    <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:entity</NameIDFormat>
-    <AssertionConsumerService index="1" isDefault="true" Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://signin.amazonaws.cn/saml"/>
-    <AttributeConsumingService index="1">
-      <ServiceName xml:lang="en">AWS Management Console Single Sign-On</ServiceName>
-      <RequestedAttribute isRequired="true" Name="https://aws.amazon.com/SAML/Attributes/Role" FriendlyName="RoleEntitlement"/>
-      <RequestedAttribute isRequired="true" Name="https://aws.amazon.com/SAML/Attributes/RoleSessionName" FriendlyName="RoleSessionName"/>
-      <RequestedAttribute isRequired="false" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.1" FriendlyName="eduPersonAffiliation"/>
-      <RequestedAttribute isRequired="false" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.2" FriendlyName="eduPersonNickname"/>
-      <RequestedAttribute isRequired="false" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.3" FriendlyName="eduPersonOrgDN"/>
-      <RequestedAttribute isRequired="false" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.4" FriendlyName="eduPersonOrgUnitDN"/>
-      <RequestedAttribute isRequired="false" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.5" FriendlyName="eduPersonPrimaryAffiliation"/>
-      <RequestedAttribute isRequired="false" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.6" FriendlyName="eduPersonPrincipalName"/>
-      <RequestedAttribute isRequired="false" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.7" FriendlyName="eduPersonEntitlement"/>
-      <RequestedAttribute isRequired="false" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.8" FriendlyName="eduPersonPrimaryOrgUnitDN"/>
-      <RequestedAttribute isRequired="false" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.9" FriendlyName="eduPersonScopedAffiliation"/>
-      <RequestedAttribute isRequired="false" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.10" FriendlyName="eduPersonTargetedID"/>
-      <RequestedAttribute isRequired="false" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.11" FriendlyName="eduPersonAssurance"/>
-      <RequestedAttribute isRequired="false" Name="urn:oid:1.3.6.1.4.1.5923.1.2.1.2" FriendlyName="eduOrgHomePageURI"/>
-      <RequestedAttribute isRequired="false" Name="urn:oid:1.3.6.1.4.1.5923.1.2.1.3" FriendlyName="eduOrgIdentityAuthNPolicyURI"/>
-      <RequestedAttribute isRequired="false" Name="urn:oid:1.3.6.1.4.1.5923.1.2.1.4" FriendlyName="eduOrgLegalName"/>
-      <RequestedAttribute isRequired="false" Name="urn:oid:1.3.6.1.4.1.5923.1.2.1.5" FriendlyName="eduOrgSuperiorURI"/>
-      <RequestedAttribute isRequired="false" Name="urn:oid:1.3.6.1.4.1.5923.1.2.1.6" FriendlyName="eduOrgWhitePagesURI"/>
-      <RequestedAttribute isRequired="false" Name="urn:oid:2.5.4.3" FriendlyName="cn"/>
-    </AttributeConsumingService>
-  </SPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">Amazon Web Services, Inc.</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">AWS</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">https://aws.amazon.com</OrganizationURL>
-  </Organization>
-</EntityDescriptor>
-
--- a/build/cloudid/root/opt/yunion/share/saml/sp-metadata/gcp.xml
+++ b/build/cloudid/root/opt/yunion/share/saml/sp-metadata/gcp.xml
@@ -1,25 +0,0 @@
-<?xml version="1.0"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" entityID="google.com" validUntil="2021-06-02T00:00:00Z">
-  <SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol" WantAssertionsSigned="true">
-    <KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-          </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
-    <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:persistent</NameIDFormat>
-    <NameIDFormat>urn:oasis:names:tc:SAML:1.1:nameid-format:emailAddress</NameIDFormat>
-    <NameIDFormat>urn:oasis:names:tc:SAML:1.1:nameid-format:unspecified</NameIDFormat>
-    <NameIDFormat>urn:oasis:names:tc:SAML:1.1:nameid-format:X509SubjectName</NameIDFormat>
-    <NameIDFormat>urn:oasis:names:tc:SAML:1.1:nameid-format:WindowsDomainQualifiedName</NameIDFormat>
-    <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:kerberos</NameIDFormat>
-    <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:entity</NameIDFormat>
-    <AssertionConsumerService index="1" isDefault="true" Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.google.com/a/yunion-hk.com/acs"/>
-    <AttributeConsumingService index="1">
-      <RequestedAttribute isRequired="false" Name="user.email" FriendlyName="user.email"/>
-    </AttributeConsumingService>
-  </SPSSODescriptor>
-</EntityDescriptor>
--- a/build/cloudid/root/opt/yunion/share/saml/sp-metadata/gcp_domain.xml
+++ b/build/cloudid/root/opt/yunion/share/saml/sp-metadata/gcp_domain.xml
@@ -1,25 +0,0 @@
-<?xml version="1.0"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" entityID="google.com/a/yunion-hk.com" validUntil="2021-06-02T00:00:00Z">
-  <SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol" WantAssertionsSigned="true">
-    <KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-          </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
-    <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:persistent</NameIDFormat>
-    <NameIDFormat>urn:oasis:names:tc:SAML:1.1:nameid-format:emailAddress</NameIDFormat>
-    <NameIDFormat>urn:oasis:names:tc:SAML:1.1:nameid-format:unspecified</NameIDFormat>
-    <NameIDFormat>urn:oasis:names:tc:SAML:1.1:nameid-format:X509SubjectName</NameIDFormat>
-    <NameIDFormat>urn:oasis:names:tc:SAML:1.1:nameid-format:WindowsDomainQualifiedName</NameIDFormat>
-    <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:kerberos</NameIDFormat>
-    <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:entity</NameIDFormat>
-    <AssertionConsumerService index="1" isDefault="true" Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.google.com/a/yunion-hk.com/acs"/>
-    <AttributeConsumingService index="1">
-      <RequestedAttribute isRequired="false" Name="user.email" FriendlyName="user.email"/>
-    </AttributeConsumingService>
-  </SPSSODescriptor>
-</EntityDescriptor>
--- a/build/cloudid/root/opt/yunion/share/saml/sp-metadata/huawei.xml
+++ b/build/cloudid/root/opt/yunion/share/saml/sp-metadata/huawei.xml
@@ -1,79 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?><md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" ID="M349b8f2417d474387360e922ef39baa" entityID="https://auth.huaweicloud.com/"><ds:Signature xmlns:ds="http://www.w3.org/2000/09/xmldsig#"><ds:SignedInfo><ds:CanonicalizationMethod Algorithm="http://www.w3.org/2001/10/xml-exc-c14n#"/><ds:SignatureMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha256"/><ds:Reference URI="#M349b8f2417d474387360e922ef39baa"><ds:Transforms><ds:Transform Algorithm="http://www.w3.org/2000/09/xmldsig#enveloped-signature"/><ds:Transform Algorithm="http://www.w3.org/2001/10/xml-exc-c14n#"/></ds:Transforms><ds:DigestMethod Algorithm="http://www.w3.org/2000/09/xmldsig#sha1"/><ds:DigestValue>diBMwyuN633Q/kBf0M+SQZ4fNCI=</ds:DigestValue></ds:Reference></ds:SignedInfo><ds:SignatureValue>k6+6QX8T5+S5wEIWlxwvd5a48xLWmp4Jd0bcs33vNaQVQ93YiztGcroUUqnLYK8uqAsmk2ZP4NtKFL/MyqoznrStglSi7uycwX6X3fswMwvkHJ9UVhH6Gp2Txl2JQ9/0vXy/tlXjQNFbfqzLhqxKC/K/PmKd684XkPYXlkiEJa6nGibu0gse9rvP2hE0G9bDMfdiyQnanfBvN+oNRte3xyI3DWh2P/jDTAPJMYzGM76JIneS8jLPa4gKDz5KcumG/8JV7GUWTDTZZ4ftujsjEuUFdPzKqwMYogMXOnTt8wbisSF8ZlLSMH/TIj6xAO9aSkEAo8HtlHJbekYlVA5Tz5IamLLzfaPpf7+NghLSuATIwY8/pvBZ8qhY8PVOjzRCeoEZJUrlFOcZ2CvO9zVKYdkEa1JC3mUW7CgeQc7G2/9niub7Vu00eyp9AAd9nkPfLoiWam8/yg2TBPRRJ9VKsv2UMFuITWrcFJayjezlTzY3dI3tI8lfoIMEVRaEP1v1D8XbxnxiaiKZXsGQHtpTSLc1ZL441jeZDLa661raUJDlGA6mBc1QukJklEocGg+Q+FeU33MJCaN/rIZCGvrjIZNng3yKFw1+R7/CqeJJlFWw0hPJQGiy6wfrDYSmhwuXJ2vQn3dTHjlT3kWsniiZtuOUi2TjHbq8gVHqlxmPxSs=</ds:SignatureValue><ds:KeyInfo><ds:X509Data><ds:X509Certificate>MIIF6TCCA9GgAwIBAgIEPHSCijANBgkqhkiG9w0BAQsFADCBpDELMAkGA1UEBhMCQ04xEjAQBgNV
-BAgTCUd1YW5nRG9uZzERMA8GA1UEBxMIU2hlblpoZW4xJTAjBgNVBAoTHEh1YXdlaSBUZWNobm9s
-b2dpZXMgQ28uLCBMdGQxKDAmBgNVBAsTH1NlcnZpY2UgUHJvdmlkZXIgT3BlcmF0aW9uIERlcHQx
-HTAbBgNVBAMTFGF1dGguaHVhd2VpY2xvdWQuY29tMB4XDTE4MDYyMTEzMjUwMFoXDTI4MDYxODEz
-MjUwMFowgaQxCzAJBgNVBAYTAkNOMRIwEAYDVQQIEwlHdWFuZ0RvbmcxETAPBgNVBAcTCFNoZW5a
-aGVuMSUwIwYDVQQKExxIdWF3ZWkgVGVjaG5vbG9naWVzIENvLiwgTHRkMSgwJgYDVQQLEx9TZXJ2
-aWNlIFByb3ZpZGVyIE9wZXJhdGlvbiBEZXB0MR0wGwYDVQQDExRhdXRoLmh1YXdlaWNsb3VkLmNv
-bTCCAiIwDQYJKoZIhvcNAQEBBQADggIPADCCAgoCggIBAJisHObeLOPs2mJ4eJBcruMZl9FjvRQe
-DmofxgOcIcmybt6qlDqAv7275JMMQfQFcEoxH3GqcCTYqvSaSnHPaJB1xljPIKAWtd7p1ymevcSy
-F2HdCZ8gPJKg3Q6+ZjwTipKS/nZr7xmpUQ0WvwRkgZ7zfslAW+y5PCgkDrgmEjG92rLArj8iPhmu
-jajXaTPQKVHuZMxBzS735uo4yjVwYE3+0mE4HTZjK+6n6Ffu+JhLzhcKGulmrT/6qHisMbIXAZyE
-egBDavomb+5zu/CUQwii5IAPrRTwwegYpG4+uYJ2cHfrUdHqw9lSCSbQzu1yW1AS4zB16sjoHZdV
-rxYyktlswNmJ1/MyRH5bO90e2kvVwV4l34Hi5HEFvFFjL8TAsbN4mGvA9fgohXp30x97UdPVV8Ji
-NNAKZjdZSEdG9xqrTRfe4+LQg/hzLNSwsko3nDnH8qhCgtb8qIipQ3s7niCa53AQWYR82lEViols
-/dbWU9qYeldVvGNAgJSqHLB7qLwcQW78+2V1446KhQqzqPeLI4ANGaLFKw8fGzgh85RKOjrIetb4
-wAOZmhrrUJrRg47DYQQjNv3glDg53ijLPFunzRqUoqLphrZ1XpEA4y21OtTP6OMYAM0lSOj1gjvb
-ubTDo8XOQs5YGtTOyHn4CQ4GR8NNo7UrwVEmoZHA+AKbAgMBAAGjITAfMB0GA1UdDgQWBBTt05QW
-9dyXi7eMekKOH0bn4xKrkDANBgkqhkiG9w0BAQsFAAOCAgEACv9zgzUgxxQ8t9ldOXmirxzSOrHx
-MCL8SKsu+c+Y4hoHma5LFjylv6x76NWTAFSE6GgqfuNI/gPj/2AWqObAvsHd8lsPjJ96ZoSaTmS8
-NrtU6HuT1Lc+CmVfeGd3/G+KspQECjg2JeBrfyEw9B8KUAQV20DQukGfAHtKKQPOZmKm0Qm3ExWC
-eXz1TR2KP+Lrhny/yG43g4iVUKq65HFHs5cRzRk0iR0/NLpggl5+Op0rxMxBn+bCrnJBi0n9/PIM
-fWNhkEBl+B++EifPUQxQaOEsnxTgFo1O4ksK9hDFcLbr+1qCDgVIMkyC1xMBBikCgLvIdzy3SXBN
-ndIEUq+QgOORxLlq1WqrfLFO22TxZm8XaB5g36UMk5PGoVHGnjALReAHjC0C5sIiKMJSgQOPd71X
-mQSsw3G9NsMKf/H3xJXkq/b672ls/l1JBslm52DAk2k5UlLkf/1p4I7WHOfm5ZNpDjj1rTP6SiAc
-tWLtqXIU28fLa2sA+zHXA5acDGOm6eIrMme5HpsV/KoUOW1MXGugK59zofeueCFDGRfbyoS2lj0S
-W+CbJVa72CLf3xPh2nWH0cK9de+wyCx8uI0KGPyV4I9/XBLHhvkb3XPaUfnkzYkcrG/39cOaxuPF
-z+haXwI1lvI964zvmTgwdDjdf/0asA09S7EEK2KyzXUREM4=</ds:X509Certificate></ds:X509Data></ds:KeyInfo></ds:Signature><md:SPSSODescriptor AuthnRequestsSigned="true" WantAssertionsSigned="true" protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol"><md:KeyDescriptor use="signing"><ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#"><ds:X509Data><ds:X509Certificate>MIIF6TCCA9GgAwIBAgIEPHSCijANBgkqhkiG9w0BAQsFADCBpDELMAkGA1UEBhMCQ04xEjAQBgNV
-BAgTCUd1YW5nRG9uZzERMA8GA1UEBxMIU2hlblpoZW4xJTAjBgNVBAoTHEh1YXdlaSBUZWNobm9s
-b2dpZXMgQ28uLCBMdGQxKDAmBgNVBAsTH1NlcnZpY2UgUHJvdmlkZXIgT3BlcmF0aW9uIERlcHQx
-HTAbBgNVBAMTFGF1dGguaHVhd2VpY2xvdWQuY29tMB4XDTE4MDYyMTEzMjUwMFoXDTI4MDYxODEz
-MjUwMFowgaQxCzAJBgNVBAYTAkNOMRIwEAYDVQQIEwlHdWFuZ0RvbmcxETAPBgNVBAcTCFNoZW5a
-aGVuMSUwIwYDVQQKExxIdWF3ZWkgVGVjaG5vbG9naWVzIENvLiwgTHRkMSgwJgYDVQQLEx9TZXJ2
-aWNlIFByb3ZpZGVyIE9wZXJhdGlvbiBEZXB0MR0wGwYDVQQDExRhdXRoLmh1YXdlaWNsb3VkLmNv
-bTCCAiIwDQYJKoZIhvcNAQEBBQADggIPADCCAgoCggIBAJisHObeLOPs2mJ4eJBcruMZl9FjvRQe
-DmofxgOcIcmybt6qlDqAv7275JMMQfQFcEoxH3GqcCTYqvSaSnHPaJB1xljPIKAWtd7p1ymevcSy
-F2HdCZ8gPJKg3Q6+ZjwTipKS/nZr7xmpUQ0WvwRkgZ7zfslAW+y5PCgkDrgmEjG92rLArj8iPhmu
-jajXaTPQKVHuZMxBzS735uo4yjVwYE3+0mE4HTZjK+6n6Ffu+JhLzhcKGulmrT/6qHisMbIXAZyE
-egBDavomb+5zu/CUQwii5IAPrRTwwegYpG4+uYJ2cHfrUdHqw9lSCSbQzu1yW1AS4zB16sjoHZdV
-rxYyktlswNmJ1/MyRH5bO90e2kvVwV4l34Hi5HEFvFFjL8TAsbN4mGvA9fgohXp30x97UdPVV8Ji
-NNAKZjdZSEdG9xqrTRfe4+LQg/hzLNSwsko3nDnH8qhCgtb8qIipQ3s7niCa53AQWYR82lEViols
-/dbWU9qYeldVvGNAgJSqHLB7qLwcQW78+2V1446KhQqzqPeLI4ANGaLFKw8fGzgh85RKOjrIetb4
-wAOZmhrrUJrRg47DYQQjNv3glDg53ijLPFunzRqUoqLphrZ1XpEA4y21OtTP6OMYAM0lSOj1gjvb
-ubTDo8XOQs5YGtTOyHn4CQ4GR8NNo7UrwVEmoZHA+AKbAgMBAAGjITAfMB0GA1UdDgQWBBTt05QW
-9dyXi7eMekKOH0bn4xKrkDANBgkqhkiG9w0BAQsFAAOCAgEACv9zgzUgxxQ8t9ldOXmirxzSOrHx
-MCL8SKsu+c+Y4hoHma5LFjylv6x76NWTAFSE6GgqfuNI/gPj/2AWqObAvsHd8lsPjJ96ZoSaTmS8
-NrtU6HuT1Lc+CmVfeGd3/G+KspQECjg2JeBrfyEw9B8KUAQV20DQukGfAHtKKQPOZmKm0Qm3ExWC
-eXz1TR2KP+Lrhny/yG43g4iVUKq65HFHs5cRzRk0iR0/NLpggl5+Op0rxMxBn+bCrnJBi0n9/PIM
-fWNhkEBl+B++EifPUQxQaOEsnxTgFo1O4ksK9hDFcLbr+1qCDgVIMkyC1xMBBikCgLvIdzy3SXBN
-ndIEUq+QgOORxLlq1WqrfLFO22TxZm8XaB5g36UMk5PGoVHGnjALReAHjC0C5sIiKMJSgQOPd71X
-mQSsw3G9NsMKf/H3xJXkq/b672ls/l1JBslm52DAk2k5UlLkf/1p4I7WHOfm5ZNpDjj1rTP6SiAc
-tWLtqXIU28fLa2sA+zHXA5acDGOm6eIrMme5HpsV/KoUOW1MXGugK59zofeueCFDGRfbyoS2lj0S
-W+CbJVa72CLf3xPh2nWH0cK9de+wyCx8uI0KGPyV4I9/XBLHhvkb3XPaUfnkzYkcrG/39cOaxuPF
-z+haXwI1lvI964zvmTgwdDjdf/0asA09S7EEK2KyzXUREM4=</ds:X509Certificate></ds:X509Data></ds:KeyInfo></md:KeyDescriptor><md:KeyDescriptor use="encryption"><ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#"><ds:X509Data><ds:X509Certificate>MIIF6TCCA9GgAwIBAgIEPHSCijANBgkqhkiG9w0BAQsFADCBpDELMAkGA1UEBhMCQ04xEjAQBgNV
-BAgTCUd1YW5nRG9uZzERMA8GA1UEBxMIU2hlblpoZW4xJTAjBgNVBAoTHEh1YXdlaSBUZWNobm9s
-b2dpZXMgQ28uLCBMdGQxKDAmBgNVBAsTH1NlcnZpY2UgUHJvdmlkZXIgT3BlcmF0aW9uIERlcHQx
-HTAbBgNVBAMTFGF1dGguaHVhd2VpY2xvdWQuY29tMB4XDTE4MDYyMTEzMjUwMFoXDTI4MDYxODEz
-MjUwMFowgaQxCzAJBgNVBAYTAkNOMRIwEAYDVQQIEwlHdWFuZ0RvbmcxETAPBgNVBAcTCFNoZW5a
-aGVuMSUwIwYDVQQKExxIdWF3ZWkgVGVjaG5vbG9naWVzIENvLiwgTHRkMSgwJgYDVQQLEx9TZXJ2
-aWNlIFByb3ZpZGVyIE9wZXJhdGlvbiBEZXB0MR0wGwYDVQQDExRhdXRoLmh1YXdlaWNsb3VkLmNv
-bTCCAiIwDQYJKoZIhvcNAQEBBQADggIPADCCAgoCggIBAJisHObeLOPs2mJ4eJBcruMZl9FjvRQe
-DmofxgOcIcmybt6qlDqAv7275JMMQfQFcEoxH3GqcCTYqvSaSnHPaJB1xljPIKAWtd7p1ymevcSy
-F2HdCZ8gPJKg3Q6+ZjwTipKS/nZr7xmpUQ0WvwRkgZ7zfslAW+y5PCgkDrgmEjG92rLArj8iPhmu
-jajXaTPQKVHuZMxBzS735uo4yjVwYE3+0mE4HTZjK+6n6Ffu+JhLzhcKGulmrT/6qHisMbIXAZyE
-egBDavomb+5zu/CUQwii5IAPrRTwwegYpG4+uYJ2cHfrUdHqw9lSCSbQzu1yW1AS4zB16sjoHZdV
-rxYyktlswNmJ1/MyRH5bO90e2kvVwV4l34Hi5HEFvFFjL8TAsbN4mGvA9fgohXp30x97UdPVV8Ji
-NNAKZjdZSEdG9xqrTRfe4+LQg/hzLNSwsko3nDnH8qhCgtb8qIipQ3s7niCa53AQWYR82lEViols
-/dbWU9qYeldVvGNAgJSqHLB7qLwcQW78+2V1446KhQqzqPeLI4ANGaLFKw8fGzgh85RKOjrIetb4
-wAOZmhrrUJrRg47DYQQjNv3glDg53ijLPFunzRqUoqLphrZ1XpEA4y21OtTP6OMYAM0lSOj1gjvb
-ubTDo8XOQs5YGtTOyHn4CQ4GR8NNo7UrwVEmoZHA+AKbAgMBAAGjITAfMB0GA1UdDgQWBBTt05QW
-9dyXi7eMekKOH0bn4xKrkDANBgkqhkiG9w0BAQsFAAOCAgEACv9zgzUgxxQ8t9ldOXmirxzSOrHx
-MCL8SKsu+c+Y4hoHma5LFjylv6x76NWTAFSE6GgqfuNI/gPj/2AWqObAvsHd8lsPjJ96ZoSaTmS8
-NrtU6HuT1Lc+CmVfeGd3/G+KspQECjg2JeBrfyEw9B8KUAQV20DQukGfAHtKKQPOZmKm0Qm3ExWC
-eXz1TR2KP+Lrhny/yG43g4iVUKq65HFHs5cRzRk0iR0/NLpggl5+Op0rxMxBn+bCrnJBi0n9/PIM
-fWNhkEBl+B++EifPUQxQaOEsnxTgFo1O4ksK9hDFcLbr+1qCDgVIMkyC1xMBBikCgLvIdzy3SXBN
-ndIEUq+QgOORxLlq1WqrfLFO22TxZm8XaB5g36UMk5PGoVHGnjALReAHjC0C5sIiKMJSgQOPd71X
-mQSsw3G9NsMKf/H3xJXkq/b672ls/l1JBslm52DAk2k5UlLkf/1p4I7WHOfm5ZNpDjj1rTP6SiAc
-tWLtqXIU28fLa2sA+zHXA5acDGOm6eIrMme5HpsV/KoUOW1MXGugK59zofeueCFDGRfbyoS2lj0S
-W+CbJVa72CLf3xPh2nWH0cK9de+wyCx8uI0KGPyV4I9/XBLHhvkb3XPaUfnkzYkcrG/39cOaxuPF
-z+haXwI1lvI964zvmTgwdDjdf/0asA09S7EEK2KyzXUREM4=</ds:X509Certificate></ds:X509Data></ds:KeyInfo></md:KeyDescriptor><md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://auth.huaweicloud.com/authui/saml/SAMLAssertionConsumer" index="0" isDefault="true" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata"/><md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://auth.huaweicloud.com/authui/saml/LogoutServiceHTTPRedirect" ResponseLocation="https://auth.huaweicloud.com/authui/saml/LogoutServiceHTTPRedirectResponse" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata"/><md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://auth.huaweicloud.com/authui/saml/LogoutServiceHTTPPost" ResponseLocation="https://auth.huaweicloud.com/authui/saml/LogoutServiceHTTPPostResponse" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata"/><md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://auth.huaweicloud.com/authui/saml/ManageNameIDServiceHTTPPost" ResponseLocation="https://auth.huaweicloud.com/authui/saml/ManageNameIDServiceHTTPPostResponse"/><md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://auth.huaweicloud.com/authui/saml/ManageNameIDServiceHTTPRedirect" ResponseLocation="https://auth.huaweicloud.com/authui/saml/ManageNameIDServiceHTTPRedirectResponse"/><md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://auth.huaweicloud.com/authui/saml/ManageNameIDServiceSOAP" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata"/><md:NameIDFormat xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata">urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat><md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://auth.huaweicloud.com/authui/saml/SAMLAssertionConsumer" index="0" isDefault="true" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata"/></md:SPSSODescriptor></md:EntityDescriptor>
--- a/build/cloudid/root/opt/yunion/share/saml/sp-metadata/qcloud.xml
+++ b/build/cloudid/root/opt/yunion/share/saml/sp-metadata/qcloud.xml
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" xmlns:saml="urn:oasis:names:tc:SAML:2.0:AssertionConsumerService" entityID="cloud.tencent.com" validUntil="2059-08-15T06:24:31Z">
-  <SPSSODescriptor WantAssertionsSigned="true" protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
-    <KeyDescriptor use="signing">
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>MIIEWzCCA0OgAwIBAgIJAP2Wa/iz6Zn+MA0GCSqGSIb3DQEBBQUAMIHDMQswCQYDVQQGEwJDTjESMBAGA1UECAwJZ3Vhbmdkb25nMREwDwYDVQQHDAhzaGVuemhlbjE2MDQGA1UECgwtVGVuY2VudCBUZWNobm9sb2d5IChTaGVuemhlbikgQ29tcGFueSBMaW1pdGVkMRYwFAYDVQQLDA1UZW5jZW50IENsb3VkMRowGAYDVQQDDBFjbG91ZC50ZW5jZW50LmNvbTEhMB8GCSqGSIb3DQEJARYScWNsb3VkQHRlbmNlbnQuY29tMB4XDTE4MDgxNTA2MjQzMVoXDTE5MDgxNTA2MjQzMVowgcMxCzAJBgNVBAYTAkNOMRIwEAYDVQQIDAlndWFuZ2RvbmcxETAPBgNVBAcMCHNoZW56aGVuMTYwNAYDVQQKDC1UZW5jZW50IFRlY2hub2xvZ3kgKFNoZW56aGVuKSBDb21wYW55IExpbWl0ZWQxFjAUBgNVBAsMDVRlbmNlbnQgQ2xvdWQxGjAYBgNVBAMMEWNsb3VkLnRlbmNlbnQuY29tMSEwHwYJKoZIhvcNAQkBFhJxY2xvdWRAdGVuY2VudC5jb20wggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQC7z2KMtR6GS4IzwfFYLSULCrKrr6iUVRlxUhn0y/CjpWXGg31nwvXYmJZaCwjUlorTd3pYDmStmd4xoL3xrGFnqX0xqKw7S+vbB9wo5tSHww15vkiYPanjsgeaiXihBBB6jvsV8+4iuVk8JA3x990/0wic/ZuKIhCI4mLCaQYLXbsYopUPQ5p+dwkCY9pYxP+zjOQathA0cjzKyzp9io2pcH2vtj7RzM+j4sLTsTC+OGfh7k9LQO5/fswQTQKr1B4tmtI8Cq7pUP0Fud1YLjMpod/NRVv1/xIF6cJFP8QARfmC45FPjHToORiXVUV8hii8l4EkXw2bAQO+wqodXJaZAgMBAAGjUDBOMB0GA1UdDgQWBBQ6e8nFUT7oKF+LbOYFH200WR5I0zAfBgNVHSMEGDAWgBQ6e8nFUT7oKF+LbOYFH200WR5I0zAMBgNVHRMEBTADAQH/MA0GCSqGSIb3DQEBBQUAA4IBAQBAIaZDjgCLkWq6fFpp/ViwdEBtLbKNNx2K28z91kTZNE+lepYagqWQIPpTGo69GmO9Qdf/mkspY3Y80Q3MpUO09V3gsiqXQBHD5ZfyRHwmqDjDudLA1SGzMjMT+48XuMq4fdonO1o5fyDh/My9w1LuRZzWw5ZE0JEpKgXq1ynQYz0uEip7KrUVUNoAS2n9jT8APfs16M4p5VRpIYlugnBwR9P2bZba+9fR/SPTa7FX4S8sU649wGPR+49uvic2kwc8FP6AXGurJZhd7mZ44j58q0M/LXm/6wiyUslZ/I0uGhxmRav0cTQz4T1dXKdh2pJZBwz8yMv2P6fuxcFlUeR6</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
-    <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:entity</NameIDFormat>
-    <NameIDFormat>urn:oasis:names:tc:SAML:1.1:nameid-format:emailAddress</NameIDFormat>
-    <NameIDFormat>urn:oasis:names:tc:SAML:1.1:nameid-format:unspecified</NameIDFormat>
-    <NameIDFormat>urn:oasis:names:tc:SAML:1.1:nameid-format:WindowsDomainQualifiedName</NameIDFormat>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://cloud.tencent.com/login/saml" index="1" isDefault="true"/>
-    <AttributeConsumingService index="1">
-      <ServiceName xml:lang="en"/>
-      <RequestedAttribute FriendlyName="RoleEntitlement" Name="https://cloud.tencent.com/SAML/Attributes/Role" isRequired="true"/>
-      <RequestedAttribute FriendlyName="RoleSessionName" Name="https://cloud.tencent.com/SAML/Attributes/RoleSessionName" isRequired="true"/>
-    </AttributeConsumingService>
-  </SPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">Tencent Cloud Services, Inc.</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">Tencent Cloud</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">https://cloud.tencent.com</OrganizationURL>
-  </Organization>
-</EntityDescriptor>
--- a/build/docker/Dockerfile.ansibleserver
+++ b/build/docker/Dockerfile.ansibleserver
@@ -1,3 +1,3 @@
-FROM registry.cn-beijing.aliyuncs.com/yunionio/ansibleserver-base:v1.0.2
+FROM registry.cn-beijing.aliyuncs.com/yunionio/ansibleserver-base:1.0.0

 ADD ./_output/alpine-build/bin/ansibleserver /opt/yunion/bin/ansibleserver
--- a/build/docker/Dockerfile.ansibleserver-base
+++ b/build/docker/Dockerfile.ansibleserver-base
@@ -1,4 +1,4 @@
-FROM registry.cn-beijing.aliyuncs.com/yunionio/onecloud-base:v0.2
+FROM alpine:3.11.6

 MAINTAINER "Yousong Zhou <zhouyousong@yunionyun.com>"

--- a/build/docker/Dockerfile.apigateway
+++ b/build/docker/Dockerfile.apigateway
@@ -1,3 +1,3 @@
-FROM registry.cn-beijing.aliyuncs.com/yunionio/onecloud-base:v0.2
+FROM registry.cn-beijing.aliyuncs.com/yunionio/onecloud-base:v0.1

-ADD ./_output/alpine-build/bin/apigateway /opt/yunion/bin/apigateway
+ADD ./_output/bin/apigateway /opt/yunion/bin/apigateway
--- a/build/docker/Dockerfile.baremetal-agent
+++ b/build/docker/Dockerfile.baremetal-agent
@@ -1,4 +1,4 @@
-FROM registry.cn-beijing.aliyuncs.com/yunionio/baremetal-base:v0.2
+FROM registry.cn-beijing.aliyuncs.com/yunionio/baremetal-base:v0.0.1

 MAINTAINER "Zexi Li <lizexi@yunionyun.com>"

--- a/build/docker/Dockerfile.baremetal-base
+++ b/build/docker/Dockerfile.baremetal-base
@@ -5,16 +5,13 @@ MAINTAINER "Yaoqi Wan <wanyaoqi@yunionyun.com>"
 RUN mkdir -p /opt/yunion/bin

 RUN apk update && \
-    apk add --no-cache ipmitool ethtool tzdata ca-certificates cdrkit coreutils && \
+    apk add --no-cache ipmitool ethtool tzdata ca-certificates && \
    rm -rf /var/cache/apk/*

 RUN cp /usr/share/zoneinfo/Asia/Shanghai /etc/localtime

 RUN mkdir -p /opt/cloud/yunion/baremetal

-# udpate latest pci.ids
-RUN wget -O /opt/cloud/yunion/baremetal/pci.ids http://pci-ids.ucw.cz/v2.2/pci.ids
-
 # download baremetal-pxerom-*.x86_64.rpm and unpack rpm in current directory
 COPY ./opt/cloud/yunion/baremetal/bootia32.efi /opt/cloud/yunion/baremetal
 COPY ./opt/cloud/yunion/baremetal/bootx64.efi /opt/cloud/yunion/baremetal
@@ -30,3 +27,13 @@ COPY ./opt/cloud/yunion/baremetal/libutil.c32 /opt/cloud/yunion/baremetal
 COPY ./opt/cloud/yunion/baremetal/lpxelinux.0 /opt/cloud/yunion/baremetal
 COPY ./opt/cloud/yunion/baremetal/menu.c32 /opt/cloud/yunion/baremetal
 COPY ./opt/cloud/yunion/baremetal/pxelinux.0 /opt/cloud/yunion/baremetal
+
+# add mkisofs with bundles libraries
+ADD ./mkisofs /bin/mkisofs
+ADD ./.mkisofs.bin /bin/.mkisofs.bin
+ADD ./bundles/mkisofs /bin/bundles/mkisofs
+# use GNU timeout command replace busybox timeout command
+RUN rm /usr/bin/timeout
+ADD ./timeout /bin/timeout
+ADD ./.timeout.bin /bin/.timeout.bin
+ADD ./bundles/timeout /bin/bundles/timeout
--- a/build/docker/Dockerfile.climc
+++ b/build/docker/Dockerfile.climc
@@ -1,5 +1,5 @@
-FROM registry.cn-beijing.aliyuncs.com/yunionio/climc-base:20200820
+FROM registry.cn-beijing.aliyuncs.com/yunionio/climc-base:v20200308

 ADD ./build/climc/root/opt /opt

-ADD ./_output/alpine-build/bin/climc ./_output/alpine-build/bin/*cli /opt/yunion/bin/
+ADD ./_output/bin/climc ./_output/bin/*cli /opt/yunion/bin/
--- a/build/docker/Dockerfile.climc-base
+++ b/build/docker/Dockerfile.climc-base
@@ -1,4 +1,4 @@
-FROM registry.cn-beijing.aliyuncs.com/yunionio/onecloud-base:v0.2
+FROM frolvlad/alpine-glibc:glibc-2.28

 MAINTAINER "Zexi Li <lizexi@yunionyun.com>"

--- a/build/docker/Dockerfile.cloudevent
+++ b/build/docker/Dockerfile.cloudevent
@@ -1,3 +1,3 @@
-FROM registry.cn-beijing.aliyuncs.com/yunionio/onecloud-base:v0.2
+FROM registry.cn-beijing.aliyuncs.com/yunionio/onecloud-base:v0.1

-ADD ./_output/alpine-build/bin/cloudevent /opt/yunion/bin/cloudevent
+ADD ./_output/bin/cloudevent /opt/yunion/bin/cloudevent
--- a/build/docker/Dockerfile.cloudid
+++ b/build/docker/Dockerfile.cloudid
@@ -1,4 +1,3 @@
-FROM registry.cn-beijing.aliyuncs.com/yunionio/onecloud-base:v0.2
+FROM registry.cn-beijing.aliyuncs.com/yunionio/onecloud-base:v0.1

-COPY ./build/cloudid/root/opt/ /opt/
-ADD ./_output/alpine-build/bin/cloudid /opt/yunion/bin/cloudid
+ADD ./_output/bin/cloudid /opt/yunion/bin/cloudid
--- a/build/docker/Dockerfile.cloudnet
+++ b/build/docker/Dockerfile.cloudnet
@@ -1,3 +1,3 @@
-FROM registry.cn-beijing.aliyuncs.com/yunionio/onecloud-base:v0.2
+FROM registry.cn-beijing.aliyuncs.com/yunionio/onecloud-base:v0.1

-ADD ./_output/alpine-build/bin/cloudnet /opt/yunion/bin/cloudnet
+ADD ./_output/bin/cloudnet /opt/yunion/bin/cloudnet
--- a/build/docker/Dockerfile.devtool
+++ b/build/docker/Dockerfile.devtool
@@ -1,3 +1,3 @@
-FROM registry.cn-beijing.aliyuncs.com/yunionio/onecloud-base:v0.2
+FROM registry.cn-beijing.aliyuncs.com/yunionio/onecloud-base:v0.1

-ADD ./_output/alpine-build/bin/devtool /opt/yunion/bin/devtool
+ADD ./_output/bin/devtool /opt/yunion/bin/devtool
--- a/build/docker/Dockerfile.esxi-agent
+++ b/build/docker/Dockerfile.esxi-agent
@@ -1,5 +1,4 @@
-FROM registry.cn-beijing.aliyuncs.com/yunionio/onecloud-base:v0.2
+FROM registry.cn-beijing.aliyuncs.com/yunionio/onecloud-base:v0.1

 COPY ./build/esxi-agent/root/opt/ /opt/
-
-ADD ./_output/alpine-build/bin/esxi-agent /opt/yunion/bin/esxi-agent
+ADD ./_output/bin/esxi-agent /opt/yunion/bin/esxi-agent
--- a/build/docker/Dockerfile.glance
+++ b/build/docker/Dockerfile.glance
@@ -1,6 +1,6 @@
-FROM registry.cn-beijing.aliyuncs.com/yunionio/torrent:20200820
+FROM registry.cn-beijing.aliyuncs.com/yunionio/glance-base:latest

 MAINTAINER "Zexi Li <lizexi@yunionyun.com>"

 RUN mkdir -p /opt/yunion/bin
-ADD ./_output/alpine-build/bin/glance /opt/yunion/bin/glance
+ADD ./_output/bin/glance /opt/yunion/bin/glance
--- a/build/docker/Dockerfile.glance-base
+++ b/build/docker/Dockerfile.glance-base
@@ -0,0 +1,18 @@
+FROM frolvlad/alpine-glibc:glibc-2.28
+
+MAINTAINER "Yaoqi Wan <wanyaoqi@yunionyun.com>"
+
+RUN apk update && \
+    apk add --no-cache tzdata ca-certificates qemu-img && \
+    rm -rf /var/cache/apk/*
+
+RUN cp /usr/share/zoneinfo/Asia/Shanghai /etc/localtime
+
+ENV TZ Asia/Shanghai
+
+# add executable file torrent
+# make cmd/torrent && ./scripts/bundle-libraries.sh _output/bin/bundles/torrent _output/bin/torrent
+RUN mkdir -p /opt/yunion/bin
+ADD ./_output/bin/torrent /opt/yunion/bin/torrent
+ADD ./_output/bin/.torrent.bin /opt/yunion/bin/.torrent.bin
+ADD ./_output/bin/bundles/torrent /opt/yunion/bin/bundles/torrent
--- a/build/docker/Dockerfile.host
+++ b/build/docker/Dockerfile.host
@@ -1,4 +1,4 @@
-FROM registry.cn-beijing.aliyuncs.com/yunionio/host-base:v0.3
+FROM registry.cn-beijing.aliyuncs.com/yunionio/host-base:v0.2.0

 MAINTAINER "Yaoqi Wan wanyaoqi@yunionyun.com"

--- a/build/docker/Dockerfile.host-deployer
+++ b/build/docker/Dockerfile.host-deployer
@@ -1,4 +1,4 @@
-FROM registry.cn-beijing.aliyuncs.com/yunionio/host-deployer-base:v0.5
+FROM registry.cn-beijing.aliyuncs.com/yunionio/host-deployer-base:v0.0.3

 MAINTAINER "Yaoqi Wan wanyaoqi@yunionyun.com"

@@ -6,4 +6,6 @@ ENV TZ Asia/Shanghai

 RUN mkdir -p /opt/yunion/bin

-ADD ./_output/alpine-build/bin/host-deployer /opt/yunion/bin/host-deployer
+ADD ./_output/bin/host-deployer /opt/yunion/bin/host-deployer
+ADD ./_output/bin/.host-deployer.bin /opt/yunion/bin/.host-deployer.bin
+ADD ./_output/bin/bundles/host-deployer /opt/yunion/bin/bundles/host-deployer
--- a/build/docker/Dockerfile.keystone
+++ b/build/docker/Dockerfile.keystone
@@ -1,3 +1,3 @@
-FROM registry.cn-beijing.aliyuncs.com/yunionio/onecloud-base:v0.2
+FROM registry.cn-beijing.aliyuncs.com/yunionio/onecloud-base:v0.1

-ADD ./_output/alpine-build/bin/keystone /opt/yunion/bin/keystone
+ADD ./_output/bin/keystone /opt/yunion/bin/keystone
--- a/build/docker/Dockerfile.kubectl
+++ b/build/docker/Dockerfile.kubectl
@@ -1,4 +0,0 @@
-FROM alpine:3.11
-
-RUN echo http://dl-cdn.alpinelinux.org/alpine/edge/testing >>/etc/apk/repositories
-RUN apk update && apk add kubectl && rm -rf /var/cache/apk/*
--- a/build/docker/Dockerfile.logger
+++ b/build/docker/Dockerfile.logger
@@ -1,3 +1,4 @@
-FROM registry.cn-beijing.aliyuncs.com/yunionio/onecloud-base:v0.2
+FROM registry.cn-beijing.aliyuncs.com/yunionio/onecloud-base:v0.1
+
+ADD ./_output/bin/logger /opt/yunion/bin/logger

-ADD ./_output/alpine-build/bin/logger /opt/yunion/bin/logger
--- a/build/docker/Dockerfile.monitor
+++ b/build/docker/Dockerfile.monitor
@@ -1,4 +1,4 @@
-FROM registry.cn-beijing.aliyuncs.com/yunionio/onecloud-base:v0.2
+FROM registry.cn-beijing.aliyuncs.com/yunionio/onecloud-base:v0.1
+
+ADD ./_output/bin/monitor /opt/yunion/bin/monitor

-COPY ./build/monitor/root/opt/ /opt/
-ADD ./_output/alpine-build/bin/monitor /opt/yunion/bin/monitor
--- a/build/docker/Dockerfile.notify
+++ b/build/docker/Dockerfile.notify
@@ -1,4 +1,4 @@
-FROM registry.cn-beijing.aliyuncs.com/yunionio/onecloud-base:v0.2
+FROM registry.cn-beijing.aliyuncs.com/yunionio/onecloud-base:v0.1

 COPY ./build/notify/root/opt/ /opt/
-ADD ./_output/alpine-build/bin/notify /opt/yunion/bin/notify
+ADD ./_output/bin/notify /opt/yunion/bin/notify
--- a/build/docker/Dockerfile.onecloud-base
+++ b/build/docker/Dockerfile.onecloud-base
@@ -1,4 +1,4 @@
-FROM alpine:3.11
+FROM frolvlad/alpine-glibc:glibc-2.28

 MAINTAINER "Zexi Li <lizexi@yunionyun.com>"

--- a/build/docker/Dockerfile.region
+++ b/build/docker/Dockerfile.region
@@ -1,4 +1,4 @@
-FROM registry.cn-beijing.aliyuncs.com/yunionio/onecloud-base:v0.2
+FROM registry.cn-beijing.aliyuncs.com/yunionio/onecloud-base:v0.1

 COPY ./build/region/root/opt/ /opt/
-ADD ./_output/alpine-build/bin/region /opt/yunion/bin/region
+ADD ./_output/bin/region /opt/yunion/bin/region
--- a/build/docker/Dockerfile.region-dns
+++ b/build/docker/Dockerfile.region-dns
@@ -1,4 +1,4 @@
-FROM registry.cn-beijing.aliyuncs.com/yunionio/onecloud-base:v0.2
+FROM alpine:3.11.3

 RUN mkdir -p /opt/yunion/bin
 ADD ./_output/alpine-build/bin/region-dns /opt/yunion/bin/region-dns
--- a/build/docker/Dockerfile.s3gateway
+++ b/build/docker/Dockerfile.s3gateway
@@ -1,3 +1,3 @@
-FROM registry.cn-beijing.aliyuncs.com/yunionio/onecloud-base:v0.2
+FROM registry.cn-beijing.aliyuncs.com/yunionio/onecloud-base:v0.1

-ADD ./_output/alpine-build/bin/s3gateway /opt/yunion/bin/s3gateway
+ADD ./_output/bin/s3gateway /opt/yunion/bin/s3gateway
--- a/build/docker/Dockerfile.scheduler
+++ b/build/docker/Dockerfile.scheduler
@@ -1,3 +1,3 @@
-FROM registry.cn-beijing.aliyuncs.com/yunionio/onecloud-base:v0.2
+FROM registry.cn-beijing.aliyuncs.com/yunionio/onecloud-base:v0.1

-ADD ./_output/alpine-build/bin/scheduler /opt/yunion/bin/scheduler
+ADD ./_output/bin/scheduler /opt/yunion/bin/scheduler
--- a/build/docker/Dockerfile.telegraf-raid
+++ b/build/docker/Dockerfile.telegraf-raid
@@ -1,3 +0,0 @@
-FROM registry.cn-beijing.aliyuncs.com/yunionio/yunion-rootfs:v1.0
-
-ADD ./_output/bin/telegraf-raid-plugin /opt/yunion/bin/telegraf-raid-plugin
--- a/build/docker/Dockerfile.torrent
+++ b/build/docker/Dockerfile.torrent
@@ -1,16 +0,0 @@
-FROM registry.cn-beijing.aliyuncs.com/yunionio/onecloud-base:v0.2
-
-MAINTAINER "Yaoqi Wan <wanyaoqi@yunionyun.com>"
-
-RUN apk update && \
-    apk add --no-cache tzdata ca-certificates qemu-img && \
-    rm -rf /var/cache/apk/*
-
-RUN cp /usr/share/zoneinfo/Asia/Shanghai /etc/localtime
-
-ENV TZ Asia/Shanghai
-
-# add executable file torrent
-# make cmd/torrent
-RUN mkdir -p /opt/yunion/bin
-ADD ./_output/alpine-build/bin/torrent /opt/yunion/bin/torrent
--- a/build/docker/Dockerfile.vpcagent
+++ b/build/docker/Dockerfile.vpcagent
@@ -1,4 +1,4 @@
-FROM registry.cn-beijing.aliyuncs.com/yunionio/openvswitch:2.10.4-1
+FROM registry.cn-beijing.aliyuncs.com/yunionio/openvswitch:2.10.4-0

 MAINTAINER "Yousong Zhou <zhouyousong@yunion.cn>"

--- a/build/docker/Dockerfile.webconsole
+++ b/build/docker/Dockerfile.webconsole
@@ -1,3 +1,3 @@
-FROM registry.cn-beijing.aliyuncs.com/yunionio/webconsole-base:v0.2
+FROM registry.cn-beijing.aliyuncs.com/yunionio/webconsole-base:latest

-ADD ./_output/alpine-build/bin/webconsole /opt/yunion/bin/webconsole
+ADD ./_output/bin/webconsole /opt/yunion/bin/webconsole
--- a/build/docker/Dockerfile.webconsole-base
+++ b/build/docker/Dockerfile.webconsole-base
@@ -1,4 +1,4 @@
-FROM registry.cn-beijing.aliyuncs.com/yunionio/kubectl:1.18.6
+FROM yunion/kubectl:1.14.3

 MAINTAINER "Zexi Li <lizexi@yunionyun.com>"

--- a/build/docker/Dockerfile.yunionconf
+++ b/build/docker/Dockerfile.yunionconf
@@ -1,3 +1,4 @@
-FROM registry.cn-beijing.aliyuncs.com/yunionio/onecloud-base:v0.2
+FROM registry.cn-beijing.aliyuncs.com/yunionio/onecloud-base:v0.1
+
+ADD ./_output/bin/yunionconf /opt/yunion/bin/yunionconf

-ADD ./_output/alpine-build/bin/yunionconf /opt/yunion/bin/yunionconf
--- a/build/docker/multi-arch/Dockerfile.esxi-agent
+++ b/build/docker/multi-arch/Dockerfile.esxi-agent
@@ -1,16 +0,0 @@
-FROM registry.cn-beijing.aliyuncs.com/yunionio/alpine-build:1.0-3 as build
-ARG TARGETPLATFORM
-ARG BUILDPLATFORM
-RUN mkdir -p /root/go/src/yunion.io/x/onecloud
-COPY . /root/go/src/yunion.io/x/onecloud
-
-WORKDIR /root/go/src/yunion.io/x/onecloud
-RUN make cmd/esxi-agent
-
-FROM registry.cn-beijing.aliyuncs.com/yunionio/onecloud-base:v0.2
-
-MAINTAINER "Yaoqi Wan wanyaoqi@yunionyun.com"
-
-RUN mkdir -p /opt/yunion/bin
-COPY --from=build /root/go/src/yunion.io/x/onecloud/build/esxi-agent/root/opt/ /opt/
-COPY --from=build /root/go/src/yunion.io/x/onecloud/_output/bin/esxi-agent /opt/yunion/bin/esxi-agent
--- a/build/docker/multi-arch/Dockerfile.host
+++ b/build/docker/multi-arch/Dockerfile.host
@@ -1,18 +0,0 @@
-FROM registry.cn-beijing.aliyuncs.com/yunionio/alpine-build:1.0-3 as build
-ARG TARGETPLATFORM
-ARG BUILDPLATFORM
-RUN mkdir -p /root/go/src/yunion.io/x/onecloud
-COPY . /root/go/src/yunion.io/x/onecloud
-
-WORKDIR /root/go/src/yunion.io/x/onecloud
-RUN make cmd/host
-
-FROM registry.cn-beijing.aliyuncs.com/yunionio/host-base:v0.3
-
-MAINTAINER "Yaoqi Wan wanyaoqi@yunionyun.com"
-
-ENV TZ Asia/Shanghai
-
-RUN apk add librados librbd
-RUN mkdir -p /opt/yunion/bin
-COPY --from=build /root/go/src/yunion.io/x/onecloud/_output/bin/host /opt/yunion/bin/host
--- a/build/docker/multi-arch/Dockerfile.torrent
+++ b/build/docker/multi-arch/Dockerfile.torrent
@@ -1,25 +0,0 @@
-FROM registry.cn-beijing.aliyuncs.com/yunionio/alpine-build:1.0-3 as build
-ARG TARGETPLATFORM
-ARG BUILDPLATFORM
-RUN mkdir -p /root/go/src/yunion.io/x/onecloud
-COPY . /root/go/src/yunion.io/x/onecloud
-
-WORKDIR /root/go/src/yunion.io/x/onecloud
-RUN make cmd/torrent
-
-FROM registry.cn-beijing.aliyuncs.com/yunionio/onecloud-base:v0.2
-
-MAINTAINER "Yaoqi Wan <wanyaoqi@yunionyun.com>"
-
-RUN apk update && \
-    apk add --no-cache tzdata ca-certificates qemu-img && \
-    rm -rf /var/cache/apk/*
-
-RUN cp /usr/share/zoneinfo/Asia/Shanghai /etc/localtime
-
-ENV TZ Asia/Shanghai
-
-# add executable file torrent
-# make cmd/torrent
-RUN mkdir -p /opt/yunion/bin
-COPY --from=build /root/go/src/yunion.io/x/onecloud/_output/bin/torrent /opt/yunion/bin/torrent
--- a/build/fetcherfs/vars
+++ b/build/fetcherfs/vars
@@ -1 +0,0 @@
-DESCRIPTION="Fetcherfs Utility"
--- a/build/monitor/root/opt/yunion/share/notify_templates/alerter/content@cn/DEFAULT
+++ b/build/monitor/root/opt/yunion/share/notify_templates/alerter/content@cn/DEFAULT
@@ -1,18 +0,0 @@
-## {{.title}}
- 时间: {{.start_time}}
- 级别: {{.level}}
- 详情地址: {{.web_url}}/commonalerts
-
-{{ range .matches}}
- 指标: {{.metric}}
- 触发值: {{html .value_str}}
-
-### 触发条件:
- {{html $.description}}
-
-### 标签
- > 名称: {{ index .tags "name" }}
- > ip: {{ index .tags "ip" }}
- > 平台: {{ index .tags "brand" }}
------
-{{- end}}
--- a/build/monitor/root/opt/yunion/share/notify_templates/alerter/content@cn/DEFAULT.email
+++ b/build/monitor/root/opt/yunion/share/notify_templates/alerter/content@cn/DEFAULT.email
@@ -1,138 +0,0 @@
-<!DOCTYPE html>
-<html lang="en">
-<head>
-  <meta charset="UTF-8">
-  <meta name="viewport" content="width=device-width, initial-scale=1.0">
-  <meta http-equiv="X-UA-Compatible" content="ie=edge">
-  <title>{{.Title}}</title>
-</head>
-<style>
-  .title {
-    height: 40px;
-    line-height: 40px;
-    width: 960px;
-    background-color: #4da1ff;
-    color: #fff;
-    font-size: 16px;
-    text-align: center;
-    margin: 0 auto;
-  }
-  .table {
-    width: 960px;
-    margin: 0 auto;
-    padding: 10px 30px 0px 30px;
-    font-family:'微软雅黑',Helvetica,Arial,sans-serif;
-    font-size:14px;
-    background-color: #fbfbfb;
-  }
-  .tr-title {
-    height: 10px;
-    border-left: 5px solid #4da1ff;
-    margin-left: 10px;
-    padding: 3px 8px;
-    font-weight: bold;
-  }
-  .td {
-    width: 80px;
-    padding-left: 20px;
-    height: 35px;
-    font-weight: 400;
-  }
-  .link {
-    text-decoration: none;
-    color: #3591FF;
-  }
-  .thead-tr td {
-    border-left: 1px solid #d7d7d7;
-    border-top: 1px solid #d7d7d7;
-    height: 32px;
-    font-size: 14px;
-    background-color: #d7d7d7;
-    text-align: center;
-  }
-  .tbody-tr td {
-    border-left: 1px solid #d7d7d7;
-    border-top: 1px solid #d7d7d7;
-    height: 32px;
-    font-size: 14px;
-    font-weight: 400;
-    text-align: center;
-  }
-  .pb-3 {
-    padding-bottom: 30px;
-  }
-  .resouce-table {
-    width: 98%;
-    color: #717171;
-    border-right: 1px solid #d7d7d7;
-    border-bottom: 1px solid #d7d7d7;
-  }
-</style>
-<body>
-  <h3 class="title">报警提醒</h3>
-  <table border="0" cellspacing="0" cellpadding="0" class="table">
-    <tr><td colspan="4" class="tr-title">报警信息</td></tr>
-    <tr><td style="height: 10px;"></td></tr>
-    <tr>
-      <td class="td">报警策略：</td>
-      <td>{{.name}}</td>
-    </tr>
-    <tr>
-      <td class="td">报警级别：</td>
-      <td>{{.level}}</td>
-    </tr>
-    <tr>
-      <td class="td">报警时间：</td>
-      <td>{{.start_time}}</td>
-    </tr>
-    <tr>
-      <td class="td">策略详情：</td>
-      <td>{{.description}}</td>
-    </tr>
-  </table>
-  <table class="table" style="padding-top: 6px; padding-bottom: 10px;">
-    <tr>
-      <td style="padding-left: 20px; font-size: 14px;">若要查看详情信息，<a class="link" target="_blank" href="{{.web_url}}/commonalerts
-">请登录平台进行查看</a></td>
-    </tr>
-  </table>
-  <table border="0" cellspacing="0" cellpadding="0" class="table pb-3">
-    <tr><td colspan="4" class="tr-title">报警资源</td></tr>
-    <tr><td style="height: 10px;"></td></tr>
-    <tr>
-      <td colspan="4" style="padding: 10px 0 0 20px;">
-        <table cellspacing="0" cellpadding="0" class="resouce-table">
-          <thead>
-            <tr class="thead-tr">
-
-	          <td>名称</td>
-              <td>IP</td>
-              <td>平台</td>
-              <td>触发值</td>
-            </tr>
-          </thead>
-          <tbody>
-			{{- range $i, $Matche := .matches}}
-				<tr class="tbody-tr">
-
-				  <td>
-					{{- index .tags "name"}}
-                  </td>
-				  <td>
-					{{ index .tags "ip" }}
-                  </td>
-				  <td>
-				   	{{ index .tags "brand" }}
-				  </td>
-				  <td>{{$Matche.value_str}}</td>
-				</tr>
-			{{end}}
-          </tbody>
-        </table>
-      </td>
-    </tr>
-    <tr><td style="height: 10px;"></td></tr>
-  </table>
-  <p style="width: 960px; height: 40px; line-height: 40px; margin: 0 auto; background-color: #4da1ff; color: #fff; font-size: 12px; text-align: center; ">本邮件由系统自动发送，请勿直接回复！</p>
-</body>
-</html>
--- a/build/monitor/root/opt/yunion/share/notify_templates/alerter/content@en/DEFAULT
+++ b/build/monitor/root/opt/yunion/share/notify_templates/alerter/content@en/DEFAULT
@@ -1,18 +0,0 @@
-## {{.title}}
- Time: {{.start_time}}
- Level: {{.level}}
- WebUrl: {{.web_url}}/commonalerts
-
-{{ range .matches}}
- Metric: {{.metric}}
- Trigger value: {{html .value_str}}
-
-### Trigger condition:
- {{html $.description }}
-
-### Label
- > Name: {{ index .tags "name" }}
- > IP: {{ index .tags "ip" }}
- > Brand: {{ index .tags "brand" }}
------
-{{- end}}
--- a/build/monitor/root/opt/yunion/share/notify_templates/alerter/content@en/DEFAULT.email
+++ b/build/monitor/root/opt/yunion/share/notify_templates/alerter/content@en/DEFAULT.email
@@ -1,145 +0,0 @@
-<!DOCTYPE html>
-<html lang="en">
-<head>
-  <meta charset="UTF-8">
-  <meta name="viewport" content="width=device-width, initial-scale=1.0">
-  <meta http-equiv="X-UA-Compatible" content="ie=edge">
-  <title>{{.Title}}</title>
-</head>
-<style>
-  .title {
-    height: 40px;
-    line-height: 40px;
-    width: 960px;
-    background-color: #4da1ff;
-    color: #fff;
-    font-size: 16px;
-    text-align: center;
-    margin: 0 auto;
-  }
-  .table {
-    width: 960px;
-    margin: 0 auto;
-    padding: 10px 30px 0px 30px;
-    font-family:'微软雅黑',Helvetica,Arial,sans-serif;
-    font-size:14px;
-    background-color: #fbfbfb;
-  }
-  .tr-title {
-    height: 10px;
-    border-left: 5px solid #4da1ff;
-    margin-left: 10px;
-    padding: 3px 8px;
-    font-weight: bold;
-  }
-  .td {
-    width: 80px;
-    padding-left: 20px;
-    height: 35px;
-    font-weight: 400;
-  }
-  .link {
-    text-decoration: none;
-    color: #3591FF;
-  }
-  .thead-tr td {
-    border-left: 1px solid #d7d7d7;
-    border-top: 1px solid #d7d7d7;
-    height: 32px;
-    font-size: 14px;
-    background-color: #d7d7d7;
-    text-align: center;
-  }
-  .tbody-tr td {
-    border-left: 1px solid #d7d7d7;
-    border-top: 1px solid #d7d7d7;
-    height: 32px;
-    font-size: 14px;
-    font-weight: 400;
-    text-align: center;
-  }
-  .pb-3 {
-    padding-bottom: 30px;
-  }
-  .resouce-table {
-    width: 98%;
-    color: #717171;
-    border-right: 1px solid #d7d7d7;
-    border-bottom: 1px solid #d7d7d7;
-  }
-</style>
-<body>
-  <h3 class="title">Alert</h3>
-  <table border="0" cellspacing="0" cellpadding="0" class="table">
-    <tr><td colspan="4" class="tr-title">Alert info</td></tr>
-    <tr><td style="height: 10px;"></td></tr>
-    <tr>
-      <td class="td">Alarm strategy：</td>
-      <td>{{.name}}</td>
-    </tr>
-    <tr>
-      <td class="td">Alarm level：</td>
-      <td>{{.level}}</td>
-    </tr>
-    <tr>
-      <td class="td">Alarm time：</td>
-      <td>{{.start_time}}</td>
-    </tr>
-    <tr>
-      <td class="td">Strategy details：</td>
-      <td>{{.description}}</td>
-    </tr>
-  </table>
-  <table class="table" style="padding-top: 6px; padding-bottom: 10px;">
-    <tr>
-      <td style="padding-left: 20px; font-size: 14px;">To view details，<a class="link" target="_blank" href="{{.web_url}}/commonalerts
-">Please log in to the platform to view</a></td>
-    </tr>
-  </table>
-  <table border="0" cellspacing="0" cellpadding="0" class="table pb-3">
-    <tr><td colspan="4" class="tr-title">Alarm resources</td></tr>
-    <tr><td style="height: 10px;"></td></tr>
-    <tr>
-      <td colspan="4" style="padding: 10px 0 0 20px;">
-        <table cellspacing="0" cellpadding="0" class="resouce-table">
-          <thead>
-            <tr class="thead-tr">
-
-	          <td>Name</td>
-              <td>IP</td>
-              <td>Brand</td>
-              <td>Trigger value</td>
-            </tr>
-          </thead>
-          <tbody>
-			{{- range $i, $Matche := .matches}}
-				<tr class="tbody-tr">
-
-				  <td>
-					{{- index .tags "name"}}
-                  </td>
-				  <td>
-					{{ index .tags "ip" }}
-                  </td>
-				  <td>
-				   	{{ index .tags "brand" }}
-				  </td>
-				  <td>{{$Matche.value_str}}</td>
-				</tr>
-			{{end}}
-          </tbody>
-        </table>
-      </td>
-    </tr>
-    <tr><td style="height: 10px;"></td></tr>
-  </table>
-  <p style="width: 960px; height: 40px; line-height: 40px; margin: 0 auto; background-color: #4da1ff; color: #fff; font-size: 12px; text-align: center; ">This email is sent automatically by the system. Please do not reply directly！</p>
-</body>
-</html>
-
-
-
-
-
-
-
--- a/build/monitor/root/opt/yunion/share/notify_templates/alerter/title@cn/DEFAULT
+++ b/build/monitor/root/opt/yunion/share/notify_templates/alerter/title@cn/DEFAULT
@@ -1 +0,0 @@
-{{.title}}
--- a/build/monitor/root/opt/yunion/share/notify_templates/alerter/title@cn/DEFAULT.email
+++ b/build/monitor/root/opt/yunion/share/notify_templates/alerter/title@cn/DEFAULT.email
@@ -1 +0,0 @@
-{{.title}}
--- a/build/monitor/root/opt/yunion/share/notify_templates/alerter/title@en/DEFAULT
+++ b/build/monitor/root/opt/yunion/share/notify_templates/alerter/title@en/DEFAULT
@@ -1 +0,0 @@
-{{.title}}
--- a/build/monitor/root/opt/yunion/share/notify_templates/alerter/title@en/DEFAULT.email
+++ b/build/monitor/root/opt/yunion/share/notify_templates/alerter/title@en/DEFAULT.email
@@ -1 +0,0 @@
-{{.title}}
--- a/build/notify/root/opt/yunion/share/template/content/VERIFY.email
+++ b/build/notify/root/opt/yunion/share/template/content/VERIFY.email
@@ -47,13 +47,16 @@
 	  				</td>
 	  			</tr>
 	  			<tr>
-                    <td style="padding-bottom: 10px;">您正在验证邮箱，请在验证码输入框中输入：{{.code}}，已完成验证。</td>
+	  				<td style="padding-bottom: 10px;">请点击下面的链接，完成用户邮箱的激活：</td>
+	  			</tr>
+	  			<tr>
+                    <td style="padding-bottom: 30px;"><a href="{{.link}}">{{.link}}</a></td>
 	  			</tr>
 	  		</table>
  		</td>
  	</tr>
  	<tr style="width: 96%;">
-        <td colspan="2" style="border-top: 1px dashed #ccc; color: #333; font-size: 12px; padding-bottom: 10px; font-weight: 100;">如非本人操作，请及时登录平台并修改密码以保证账户的安全</td>
+		<td colspan="2" style="border-top: 1px dashed #ccc; color: #333; font-size: 12px; padding-bottom: 10px; font-weight: 100;">*为了确保您的帐号安全，该链接仅48小时内访问有效，请勿直接回复此邮件。</td>
 	</tr>
 	<tr>
 		<td colspan="2" style="background: #333; text-align: right; padding-right: 20px; font-size: 12px; color: #fff; height: 50px;">版权所有 © {{.copyright}} 保留一切权利</td>
--- a/build/notify/root/opt/yunion/share/template/title/VERIFY.email
+++ b/build/notify/root/opt/yunion/share/template/title/VERIFY.email
@@ -1 +1 @@
-{{.copyright}} Verify
+Yunion Verify
--- a/build/region/root/opt/yunion/share/notify_templates/compute/content/SERVER_CHANGE_FLAVOR
+++ b/build/region/root/opt/yunion/share/notify_templates/compute/content/SERVER_CHANGE_FLAVOR
@@ -0,0 +1 @@
+您的{{ .brand }}主机{{ .name }}的套餐类型已经更改为 CPU:{{ index .flavor_info "cpu" }}核，内存:{{ index .flavor_info "memory" }}M，数据盘:{{ index .flavor_info "datadisk" }}G，带宽: {{ index .flavor_info "ebw" }}M。
--- a/build/region/root/opt/yunion/share/notify_templates/compute/content/SERVER_CREATED
+++ b/build/region/root/opt/yunion/share/notify_templates/compute/content/SERVER_CREATED
@@ -0,0 +1 @@
+您的{{ .brand }}主机{{ .name }}已经创建成功，服务器IP地址为{{ .ips }}，{{ if .account }}初始帐号为{{ .account }}，{{ end }}{{ if .keypair }}访问ssh密钥为{{ .keypair }}，{{ end }}{{ if .password }}初始密码为{{ .password }}，{{ end }}请使用{{ if .windows }}远程桌面连接器(RDC){{ else }}SSH{{ end }}或控制面板控制台访问云主机。
--- a/build/region/root/opt/yunion/share/notify_templates/compute/content/SERVER_CREATED_ADMIN
+++ b/build/region/root/opt/yunion/share/notify_templates/compute/content/SERVER_CREATED_ADMIN
@@ -0,0 +1 @@
+项目{{ .tenant }}的{{ .brand }}主机{{ .name }}已经创建成功。
--- a/build/region/root/opt/yunion/share/notify_templates/compute/content/SERVER_DELETED
+++ b/build/region/root/opt/yunion/share/notify_templates/compute/content/SERVER_DELETED
@@ -0,0 +1 @@
+您的{{ .brand }}主机{{ .name }}已经删除。
--- a/build/region/root/opt/yunion/share/notify_templates/compute/content/SERVER_DELETED_ADMIN
+++ b/build/region/root/opt/yunion/share/notify_templates/compute/content/SERVER_DELETED_ADMIN
@@ -0,0 +1 @@
+项目{{ .tenant }}的{{ .brand }}主机{{ .name }}已经删除。
--- a/build/region/root/opt/yunion/share/notify_templates/compute/content/SERVER_PANICKED
+++ b/build/region/root/opt/yunion/share/notify_templates/compute/content/SERVER_PANICKED
@@ -0,0 +1 @@
+您的{{ .brand }}主机{{ .name }}系统崩溃了: {{ .reason }}
--- a/build/region/root/opt/yunion/share/notify_templates/compute/content/SERVER_REBUILD_ROOT
+++ b/build/region/root/opt/yunion/share/notify_templates/compute/content/SERVER_REBUILD_ROOT
@@ -0,0 +1 @@
+您的{{ .brand }}主机{{ .name }}重装系统成功，{{ if .account }}初始帐号为{{ .account }}，{{ end }}{{ if .keypair }}访问密钥为{{ .keypair }}，{{ end }}{{ if .password }}初始密码为{{ .password }}，{{ end }}请使用{{ if .windows }}远程桌面连接器(RDC){{ else }}SSH{{ end }}或控制面板控制台访问云主机。
--- a/build/region/root/opt/yunion/share/notify_templates/compute/content@cn/SYSTEM_ERROR
+++ b/build/region/root/opt/yunion/share/notify_templates/compute/content@cn/SYSTEM_ERROR
--- a/build/region/root/opt/yunion/share/notify_templates/compute/content@cn/SYSTEM_WARNING
+++ b/build/region/root/opt/yunion/share/notify_templates/compute/content@cn/SYSTEM_WARNING
--- a/build/region/root/opt/yunion/share/notify_templates/compute/content@cn/SERVER_CHANGE_FLAVOR
+++ b/build/region/root/opt/yunion/share/notify_templates/compute/content@cn/SERVER_CHANGE_FLAVOR
@@ -1 +0,0 @@
-您的{{ .brand }}虚拟机{{ .name }}的套餐类型已经更改为 CPU:{{ index .flavor_info "cpu" }}核，内存:{{ index .flavor_info "memory" }}M，数据盘:{{ index .flavor_info "datadisk" }}G，带宽: {{ index .flavor_info "ebw" }}M。
--- a/build/region/root/opt/yunion/share/notify_templates/compute/content@cn/SERVER_CREATED
+++ b/build/region/root/opt/yunion/share/notify_templates/compute/content@cn/SERVER_CREATED
@@ -1 +0,0 @@
-您的{{ .brand }}虚拟机{{ .name }}已经创建成功，虚拟机IP地址为{{ .ips }}，{{ if .account }}初始帐号为{{ .account }}，{{ end }}{{ if .keypair }}访问ssh密钥为{{ .keypair }}，{{ end }}{{ if .password }}初始密码为{{ .password }}，{{ end }}请使用{{ if .windows }}远程桌面连接器(RDC){{ else }}SSH{{ end }}或控制面板控制台访问虚拟机。
--- a/build/region/root/opt/yunion/share/notify_templates/compute/content@cn/SERVER_CREATED_ADMIN
+++ b/build/region/root/opt/yunion/share/notify_templates/compute/content@cn/SERVER_CREATED_ADMIN
@@ -1 +0,0 @@
-项目{{ .tenant }}的{{ .brand }}虚拟机{{ .name }}已经创建成功。
--- a/build/region/root/opt/yunion/share/notify_templates/compute/content@cn/SERVER_DELETED
+++ b/build/region/root/opt/yunion/share/notify_templates/compute/content@cn/SERVER_DELETED
@@ -1 +0,0 @@
-您的{{ .brand }}虚拟机{{ .name }}已经删除。
--- a/build/region/root/opt/yunion/share/notify_templates/compute/content@cn/SERVER_DELETED_ADMIN
+++ b/build/region/root/opt/yunion/share/notify_templates/compute/content@cn/SERVER_DELETED_ADMIN
@@ -1 +0,0 @@
-项目{{ .tenant }}的{{ .brand }}虚拟机{{ .name }}已经删除。
--- a/build/region/root/opt/yunion/share/notify_templates/compute/content@cn/SERVER_PANICKED
+++ b/build/region/root/opt/yunion/share/notify_templates/compute/content@cn/SERVER_PANICKED
@@ -1 +0,0 @@
-您的{{ .brand }}虚拟机{{ .name }}系统崩溃了: {{ .reason }}
--- a/build/region/root/opt/yunion/share/notify_templates/compute/content@cn/SERVER_REBUILD_ROOT
+++ b/build/region/root/opt/yunion/share/notify_templates/compute/content@cn/SERVER_REBUILD_ROOT
@@ -1 +0,0 @@
-您的{{ .brand }}虚拟机{{ .name }}重装系统成功，{{ if .account }}初始帐号为{{ .account }}，{{ end }}{{ if .keypair }}访问密钥为{{ .keypair }}，{{ end }}{{ if .password }}初始密码为{{ .password }}，{{ end }}请使用{{ if .windows }}远程桌面连接器(RDC){{ else }}SSH{{ end }}或控制面板控制台访问虚拟机。
--- a/build/region/root/opt/yunion/share/notify_templates/compute/content@en/SERVER_CHANGE_FLAVOR
+++ b/build/region/root/opt/yunion/share/notify_templates/compute/content@en/SERVER_CHANGE_FLAVOR
@@ -1 +0,0 @@
-The instance type of your {{ .brand }} virtual machine {{ .name }} has been changed to: {{ index .flavor_info "cpu" }}-core CPU, {{ index .flavor_info "memory" }}M memory, {{ index .flavor_info "datadisk" }}G data disk, {{ index .flavor_info "ebw" }}M bandwidth.
--- a/build/region/root/opt/yunion/share/notify_templates/compute/content@en/SERVER_CREATED
+++ b/build/region/root/opt/yunion/share/notify_templates/compute/content@en/SERVER_CREATED
@@ -1 +0,0 @@
-Your {{ .brand }} virtual machine {{ .name }} has been created successfully. The VM's IP address is {{ .ips }}, {{ if .account }}initial account is {{ .account }}, {{ end }}{{ if .keypair }}the access ssh key is {{ .keypair }}, {{ end }}{{ if .password }}the initial password is {{ .password }}, {{ end }}and please use {{ if .windows }}Remote Desktop Connector (RDC){{ else }}SSH{{ end }} or the control panel console to access the VM.
--- a/build/region/root/opt/yunion/share/notify_templates/compute/content@en/SERVER_CREATED_ADMIN
+++ b/build/region/root/opt/yunion/share/notify_templates/compute/content@en/SERVER_CREATED_ADMIN
@@ -1 +0,0 @@
-The {{ .brand }} virtual machine {{ .name }} of the project {{ .tenant }} has been created successfully.
--- a/build/region/root/opt/yunion/share/notify_templates/compute/content@en/SERVER_DELETED
+++ b/build/region/root/opt/yunion/share/notify_templates/compute/content@en/SERVER_DELETED
@@ -1 +0,0 @@
-Your {{ .brand }} virtual machine {{ .name }} has been deleted.
--- a/build/region/root/opt/yunion/share/notify_templates/compute/content@en/SERVER_DELETED_ADMIN
+++ b/build/region/root/opt/yunion/share/notify_templates/compute/content@en/SERVER_DELETED_ADMIN
@@ -1 +0,0 @@
-The {{ .brand }} virtual machine {{ .name }} of the project {{ .tenant }} has been deleted.
--- a/build/region/root/opt/yunion/share/notify_templates/compute/content@en/SERVER_PANICKED
+++ b/build/region/root/opt/yunion/share/notify_templates/compute/content@en/SERVER_PANICKED
@@ -1 +0,0 @@
-Your {{ .brand }} virtual machine {{ .name }} system crashed: {{ .reason }}
--- a/build/region/root/opt/yunion/share/notify_templates/compute/content@en/SERVER_REBUILD_ROOT
+++ b/build/region/root/opt/yunion/share/notify_templates/compute/content@en/SERVER_REBUILD_ROOT
@@ -1 +0,0 @@
-Your {{ .brand }} virtual machine {{ .name }} is successfully reinstalled. The VM's {{ if .account }}initial account is {{ .account }}, {{ end }}{{ if .keypair }}the access key is {{ .keypair }}, {{ end }}{{ if .password }}the initial password is {{ .password }}, {{ end }}and please use {{ if .windows }}remote desktop connection (RDC){{ else }}SSH{{ end }} or the control panel console to access the virtual machine.
--- a/build/region/root/opt/yunion/share/notify_templates/compute/content@en/SYSTEM_ERROR
+++ b/build/region/root/opt/yunion/share/notify_templates/compute/content@en/SYSTEM_ERROR
@@ -1,6 +0,0 @@
-System error message
-Resource: {{ .name}}
-Resource ID: {{ .id }}
-Event: {{ .event }}
-Reason: {{ .reason }}
-Time: {{ .created }}
--- a/build/region/root/opt/yunion/share/notify_templates/compute/content@en/SYSTEM_WARNING
+++ b/build/region/root/opt/yunion/share/notify_templates/compute/content@en/SYSTEM_WARNING
@@ -1,6 +0,0 @@
-System warning message
-Resource: {{ .name}}
-Resource ID: {{ .id }}
-Event: {{ .event }}
-Reason: {{ .reason }}
-Time: {{ .created }}
--- a/build/region/root/opt/yunion/share/notify_templates/compute/title/SERVER_CHANGE_FLAVOR
+++ b/build/region/root/opt/yunion/share/notify_templates/compute/title/SERVER_CHANGE_FLAVOR
@@ -0,0 +1 @@
+您的{{ .brand }}主机{{ .name }}的套餐类型已经更改为 CPU:{{ index .flavor_info "cpu" }}核，内存:{{ index .flavor_info "memory" }}M，数据盘:{{ index .flavor_info "datadisk" }}G，带宽: {{ index .flavor_info "ebw" }}M。
--- a/build/region/root/opt/yunion/share/notify_templates/compute/title/SERVER_CREATED
+++ b/build/region/root/opt/yunion/share/notify_templates/compute/title/SERVER_CREATED
@@ -0,0 +1 @@
+{{ .brand }}主机{{ .Name }}创建成功
--- a/build/region/root/opt/yunion/share/notify_templates/compute/title/SERVER_CREATED_ADMIN
+++ b/build/region/root/opt/yunion/share/notify_templates/compute/title/SERVER_CREATED_ADMIN
@@ -0,0 +1 @@
+项目{{ .tenant }}的{{ .brand }}主机{{ .name }}已经创建成功
--- a/build/region/root/opt/yunion/share/notify_templates/compute/title/SERVER_DELETED
+++ b/build/region/root/opt/yunion/share/notify_templates/compute/title/SERVER_DELETED
@@ -0,0 +1 @@
+{{ .brand }}主机{{ .name }}删除通知
--- a/build/region/root/opt/yunion/share/notify_templates/compute/title/SERVER_DELETED_ADMIN
+++ b/build/region/root/opt/yunion/share/notify_templates/compute/title/SERVER_DELETED_ADMIN
@@ -0,0 +1 @@
+项目{{ .tenant }}的{{ .brand }}主机{{ .name }}已经删除
--- a/build/region/root/opt/yunion/share/notify_templates/compute/title/SERVER_PANICKED
+++ b/build/region/root/opt/yunion/share/notify_templates/compute/title/SERVER_PANICKED
@@ -0,0 +1 @@
+您的{{ .brand }}主机{{ .name }}系统崩溃了
--- a/build/region/root/opt/yunion/share/notify_templates/compute/title/SERVER_REBUILD_ROOT
+++ b/build/region/root/opt/yunion/share/notify_templates/compute/title/SERVER_REBUILD_ROOT
@@ -0,0 +1 @@
+{{ .brand }}主机{{ .name }}重装系统成功
--- a/build/region/root/opt/yunion/share/notify_templates/compute/title@cn/SYSTEM_ERROR
+++ b/build/region/root/opt/yunion/share/notify_templates/compute/title@cn/SYSTEM_ERROR
--- a/build/region/root/opt/yunion/share/notify_templates/compute/title@cn/SYSTEM_WARNING
+++ b/build/region/root/opt/yunion/share/notify_templates/compute/title@cn/SYSTEM_WARNING
--- a/build/region/root/opt/yunion/share/notify_templates/compute/title@cn/SERVER_CHANGE_FLAVOR
+++ b/build/region/root/opt/yunion/share/notify_templates/compute/title@cn/SERVER_CHANGE_FLAVOR
@@ -1 +0,0 @@
-您的{{ .brand }}虚拟机{{ .name }}的套餐类型已经更改为 CPU:{{ index .flavor_info "cpu" }}核，内存:{{ index .flavor_info "memory" }}M，数据盘:{{ index .flavor_info "datadisk" }}G，带宽: {{ index .flavor_info "ebw" }}M。
--- a/build/region/root/opt/yunion/share/notify_templates/compute/title@cn/SERVER_CREATED
+++ b/build/region/root/opt/yunion/share/notify_templates/compute/title@cn/SERVER_CREATED
@@ -1 +0,0 @@
-{{ .brand }}虚拟机{{ .Name }}创建成功
--- a/build/region/root/opt/yunion/share/notify_templates/compute/title@cn/SERVER_CREATED_ADMIN
+++ b/build/region/root/opt/yunion/share/notify_templates/compute/title@cn/SERVER_CREATED_ADMIN
@@ -1 +0,0 @@
-项目{{ .tenant }}的{{ .brand }}虚拟机{{ .name }}已经创建成功
--- a/Show More
+++ b/Show More
				`@@ -0,0 +1 @@`
				`您的{{ .brand }}主机{{ .name }}的套餐类型已经更改为 CPU:{{ index .flavor_info "cpu" }}核，内存:{{ index .flavor_info "memory" }}M，数据盘:{{ index .flavor_info "datadisk" }}G，带宽: {{ index .flavor_info "ebw" }}M。`
				`@@ -0,0 +1 @@`
				`您的{{ .brand }}主机{{ .name }}已经创建成功，服务器IP地址为{{ .ips }}，{{ if .account }}初始帐号为{{ .account }}，{{ end }}{{ if .keypair }}访问ssh密钥为{{ .keypair }}，{{ end }}{{ if .password }}初始密码为{{ .password }}，{{ end }}请使用{{ if .windows }}远程桌面连接器(RDC){{ else }}SSH{{ end }}或控制面板控制台访问云主机。`
				`@@ -0,0 +1 @@`
				`项目{{ .tenant }}的{{ .brand }}主机{{ .name }}已经创建成功。`
				`@@ -0,0 +1 @@`
				`您的{{ .brand }}主机{{ .name }}已经删除。`
				`@@ -0,0 +1 @@`
				`您的{{ .brand }}主机{{ .name }}系统崩溃了: {{ .reason }}`
				`@@ -0,0 +1 @@`
				`您的{{ .brand }}主机{{ .name }}重装系统成功，{{ if .account }}初始帐号为{{ .account }}，{{ end }}{{ if .keypair }}访问密钥为{{ .keypair }}，{{ end }}{{ if .password }}初始密码为{{ .password }}，{{ end }}请使用{{ if .windows }}远程桌面连接器(RDC){{ else }}SSH{{ end }}或控制面板控制台访问云主机。`
				`@@ -1 +0,0 @@`
				`您的{{ .brand }}虚拟机{{ .name }}的套餐类型已经更改为 CPU:{{ index .flavor_info "cpu" }}核，内存:{{ index .flavor_info "memory" }}M，数据盘:{{ index .flavor_info "datadisk" }}G，带宽: {{ index .flavor_info "ebw" }}M。`
				`@@ -1 +0,0 @@`
				`您的{{ .brand }}虚拟机{{ .name }}已经创建成功，虚拟机IP地址为{{ .ips }}，{{ if .account }}初始帐号为{{ .account }}，{{ end }}{{ if .keypair }}访问ssh密钥为{{ .keypair }}，{{ end }}{{ if .password }}初始密码为{{ .password }}，{{ end }}请使用{{ if .windows }}远程桌面连接器(RDC){{ else }}SSH{{ end }}或控制面板控制台访问虚拟机。`
				`@@ -1 +0,0 @@`
				`项目{{ .tenant }}的{{ .brand }}虚拟机{{ .name }}已经创建成功。`
				`@@ -1 +0,0 @@`
				`您的{{ .brand }}虚拟机{{ .name }}已经删除。`