Merge pull request #2526 from ioito/automated-cherry-pick-of-#2522-upstream-release-2.9.0

Automated cherry pick of #2522: fix: sync status after guest sync conf

.circleci/Dockerfile

@@ -0,0 +1,29 @@
+FROM centos:7
+MAINTAINER Yousong Zhou <zhouyousong@yunion.cn>
+
+RUN true \
+	&& yum install -y https://dl.fedoraproject.org/pub/epel/epel-release-latest-7.noarch.rpm \
+	&& yum install -y git wget \
+	&& yum groupinstall -y "Development Tools" \
+	&& : ceph for cmd/host \
+	&& rpm --import 'https://download.ceph.com/keys/release.asc' \
+	&& yum install -y https://download.ceph.com/rpm-luminous/el7/noarch/ceph-release-1-1.el7.noarch.rpm \
+	&& yum install -y libcephfs-devel librbd-devel librados-devel \
+	&& yum clean all
+
+WORKDIR /opt
+RUN true \
+	&& wget https://dl.google.com/go/go1.12.1.linux-amd64.tar.gz \
+	&& tar xzf go1.12.1.linux-amd64.tar.gz \
+	&& rm -vf  go1.12.1.linux-amd64.tar.gz \
+	&& true
+ENV GOROOT="/opt/go"
+ENV PATH="/opt/go/bin:${PATH}"
+
+RUN useradd -c "OneCloud Builder" --create-home --home-dir /home/build --shell /bin/bash build
+USER build
+ENV HOME /home/build
+WORKDIR /home/build
+
+ENV GOPATH="/home/build/go"
+ENV PATH="${GOPATH}/bin:${PATH}"

.circleci/config.yml

@@ -3,82 +3,41 @@
 # Check https://circleci.com/docs/2.0/language-go/ for more details
 version: 2
 jobs:
-  check:
-    docker:
-      - image: yunionio/centos-build:1.0-1
-        environment:
-          ONECLOUD_CI_BUILD: "1"
-    working_directory: /root/go/onecloud
-    steps:
-      - checkout
-      - run:
-          command: |
-            make -j3 check
   build:
-    requires:
-      - check
     docker:
-      - image: yunionio/centos-build:1.0-1
-        environment:
-          ONECLOUD_CI_BUILD: "1"
+      - image: yunionio/onecloud-ci:20190328
 
     #### TEMPLATE_NOTE: go expects specific checkout path representing url
     #### expecting it in the form of
     ####   /go/src/github.com/circleci/go-tool
     ####   /go/src/bitbucket.org/circleci/go-tool
-    working_directory: /root/go/onecloud
+    working_directory: /home/build/go/src/yunion.io/x/onecloud
     parallelism: 4
     steps:
       - checkout
-      - restore_cache:
-          key: onecloud-build-cache-{{ checksum "go.mod" }}-{{ checksum "Makefile" }}
-          paths:
-            - /root/.cache/go-build
       - run:
           command: |
             targets="$(circleci tests glob "cmd/*" | grep -v cmd/host-image | circleci tests split)"
             echo $targets | tr ' ' '\n'
-            make -j3 $targets
+            make $targets
             ls -lh _output/bin/
-      - save_cache:
-          key: onecloud-build-cache-{{ checksum "go.mod" }}-{{ checksum "Makefile" }}
-          paths:
-            - /root/.cache/go-build
-      - store_artifacts:
-          path: _output/
 
   test:
-    requires:
-      - check
     docker:
-      - image: yunionio/centos-build:1.0-1
-        environment:
-          GO111MODULE: "on"
-    working_directory: /root/go/onecloud
-    parallelism: 4
+      - image: yunionio/onecloud-ci:20190328
+    working_directory: /home/build/go/src/yunion.io/x/onecloud
     steps:
       - checkout
-      - restore_cache:
-          key: onecloud-test-cache-{{ checksum "go.mod" }}-{{ checksum "Makefile" }}
-          paths:
-            - /root/.cache/go-build
       - run:
           name: unit_test
-          command: |
-            ./scripts/coverage.sh --codecov
-      - save_cache:
-          key: onecloud-test-cache-{{ checksum "go.mod" }}-{{ checksum "Makefile" }}
-          paths:
-            - /root/.cache/go-build
+          command: make test
+      - run:
+          name: generate_code_coverage
+          command: ./scripts/coverage.sh --codecov
 
 workflows:
   version: 2
   build_and_test:
     jobs:
-      - check
-      - build:
-          requires:
-            - check
-      - test:
-          requires:
-            - check
+      - build
+      - test

.dockerignore

@@ -1,4 +0,0 @@
-/.git
-/vendor
-/cmd
-/pkg

.drone.yml

@@ -2,131 +2,49 @@
 kind: pipeline
 name: build
 
-clone:
-  depth: 1
-
 workspace:
-  base: /home/build/go
+  base: /go
   path: src/yunion.io/x/onecloud
 
 steps:
 - name: build
-  image: yunion/onecloud-ci:latest
+  image: d3lx/golang:yunion
   commands:
-  - CGO_ENABLED=0 make -j 4 cmd/apigateway cmd/baremetal-agent cmd/climc cmd/keystone
-  - CGO_ENABLED=0 make -j 4 cmd/logger cmd/region cmd/scheduler cmd/webconsole
-  - CGO_ENABLED=0 make -j 4 cmd/yunionconf cmd/glance cmd/torrent
+  - make
+  when:
+    event:
+    - pull_request
+    - tag
 
-- name: image-baremetal-agent
+trigger:
+  event:
+  - pull_request
+  - tag
+
+---
+kind: pipeline
+name: release
+
+steps:
+- name: release-img
   image: plugins/docker
   settings:
-    repo: registry.cn-beijing.aliyuncs.com/yunionio/baremetal-agent
+    repo: registry.cn-beijing.aliyuncs.com/yunionio/onecloud
     registry: registry.cn-beijing.aliyuncs.com
-    dockerfile: build/docker/Dockerfile.baremetal-agent
-    tags: "${DRONE_TAG}"
-    username:
-      from_secret: docker_username
-    password:
-      from_secret: docker_password
-
-- name: image-climc
-  image: plugins/docker
-  settings:
-    repo: registry.cn-beijing.aliyuncs.com/yunionio/climc
-    registry: registry.cn-beijing.aliyuncs.com
-    dockerfile: build/docker/Dockerfile.climc
-    tags: "${DRONE_TAG}"
-    username:
-      from_secret: docker_username
-    password:
-      from_secret: docker_password
-
-- name: image-keystone
-  image: plugins/docker
-  settings:
-    repo: registry.cn-beijing.aliyuncs.com/yunionio/keystone
-    registry: registry.cn-beijing.aliyuncs.com
-    dockerfile: build/docker/Dockerfile.keystone
-    tags: "${DRONE_TAG}"
-    username:
-      from_secret: docker_username
-    password:
-      from_secret: docker_password
-
-- name: image-logger
-  image: plugins/docker
-  settings:
-    repo: registry.cn-beijing.aliyuncs.com/yunionio/logger
-    registry: registry.cn-beijing.aliyuncs.com
-    dockerfile: build/docker/Dockerfile.logger
-    tags: "${DRONE_TAG}"
-    username:
-      from_secret: docker_username
-    password:
-      from_secret: docker_password
-
-- name: image-region
-  image: plugins/docker
-  settings:
-    repo: registry.cn-beijing.aliyuncs.com/yunionio/region
-    registry: registry.cn-beijing.aliyuncs.com
-    dockerfile: build/docker/Dockerfile.region
-    tags: "${DRONE_TAG}"
-    username:
-      from_secret: docker_username
-    password:
-      from_secret: docker_password
-
-- name: image-scheduler
-  image: plugins/docker
-  settings:
-    repo: registry.cn-beijing.aliyuncs.com/yunionio/scheduler
-    registry: registry.cn-beijing.aliyuncs.com
-    dockerfile: build/docker/Dockerfile.scheduler
-    tags: "${DRONE_TAG}"
-    username:
-      from_secret: docker_username
-    password:
-      from_secret: docker_password
-
-- name: image-yunionconf
-  image: plugins/docker
-  settings:
-    repo: registry.cn-beijing.aliyuncs.com/yunionio/yunionconf
-    registry: registry.cn-beijing.aliyuncs.com
-    dockerfile: build/docker/Dockerfile.yunionconf
-    tags: "${DRONE_TAG}"
-    username:
-      from_secret: docker_username
-    password:
-      from_secret: docker_password
-
-- name: image-apigateway
-  image: plugins/docker
-  settings:
-    repo: registry.cn-beijing.aliyuncs.com/yunionio/apigateway
-    registry: registry.cn-beijing.aliyuncs.com
-    dockerfile: build/docker/Dockerfile.apigateway
-    tags: "${DRONE_TAG}"
-    username:
-      from_secret: docker_username
-    password:
-      from_secret: docker_password
-
-- name: image-glance
-  image: plugins/docker
-  settings:
-    repo: registry.cn-beijing.aliyuncs.com/yunionio/glance
-    registry: registry.cn-beijing.aliyuncs.com
-    dockerfile: build/docker/Dockerfile.glance
-    tags: "${DRONE_TAG}"
+    tags: "{DRONE_TAG}"
     username:
       from_secret: docker_username
     password:
       from_secret: docker_password
+  when:
+    event:
+    - tag
 
 trigger:
   event:
   - tag
   status:
   - success
+
+depends_on:
+- build

.github/pull_request_template.md

@@ -1,15 +1,9 @@
 **这个 PR 实现什么功能/修复什么问题**:
 
-<!--
-- [ ] 功能、bugfix描述
-- [ ] 冒烟测试
-- [ ] 单元测试编写
--->
-
 **是否需要 backport 到之前的 release 分支**:
-
 <!--
 如果不需要，填写 "NONE".
 如果需要，就以下面 item 的格式写 release 分支名，并提交对应的 cherry-pick PR:
-- release/3.1
+- release/2.8.0
+- release/2.6.0
 -->

.github/workflows/docker.yml

@@ -1,242 +0,0 @@
-name: Docker image
-
-on:
-  push:
-    branches:
-    - master
-    - releases/*
-    #paths:
-    #- 'cmd/*'
-    #- 'pkg/*'
-    #- 'vendor/*'
-
-jobs:
-
-  build:
-    name: Build
-    runs-on: ubuntu-latest
-    steps:
-
-    - name: Set up Go 1.12
-      uses: actions/setup-go@v1
-      with:
-        go-version: 1.12
-      id: go
-
-    - name: Check out code into the Go module directory
-      uses: actions/checkout@v1
-
-    - name: Build
-      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 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:
-        name: registry.cn-beijing.aliyuncs.com/yunionio/region
-        username: ${{ secrets.DOCKER_USERNAME }}
-        password: ${{ secrets.DOCKER_PASSWORD }}
-        registry: registry.cn-beijing.aliyuncs.com
-        snapshot: true
-        dockerfile: build/docker/Dockerfile.region
-
-    - name: Image host
-      uses: elgohr/Publish-Docker-Github-Action@master
-      with:
-        name: registry.cn-beijing.aliyuncs.com/yunionio/host
-        username: ${{ secrets.DOCKER_USERNAME }}
-        password: ${{ secrets.DOCKER_PASSWORD }}
-        registry: registry.cn-beijing.aliyuncs.com
-        snapshot: true
-        dockerfile: build/docker/Dockerfile.host
-
-    - name: Image host-deployer
-      uses: elgohr/Publish-Docker-Github-Action@master
-      with:
-        name: registry.cn-beijing.aliyuncs.com/yunionio/host-deployer
-        username: ${{ secrets.DOCKER_USERNAME }}
-        password: ${{ secrets.DOCKER_PASSWORD }}
-        registry: registry.cn-beijing.aliyuncs.com
-        snapshot: true
-        dockerfile: build/docker/Dockerfile.host-deployer
-
-    - name: Image baremetal-agent
-      uses: elgohr/Publish-Docker-Github-Action@master
-      with:
-        name: registry.cn-beijing.aliyuncs.com/yunionio/baremetal-agent
-        username: ${{ secrets.DOCKER_USERNAME }}
-        password: ${{ secrets.DOCKER_PASSWORD }}
-        registry: registry.cn-beijing.aliyuncs.com
-        snapshot: true
-        dockerfile: build/docker/Dockerfile.baremetal-agent
-
-    - name: Image esxi-agent
-      uses: elgohr/Publish-Docker-Github-Action@master
-      with:
-        name: registry.cn-beijing.aliyuncs.com/yunionio/esxi-agent
-        username: ${{ secrets.DOCKER_USERNAME }}
-        password: ${{ secrets.DOCKER_PASSWORD }}
-        registry: registry.cn-beijing.aliyuncs.com
-        snapshot: true
-        dockerfile: build/docker/Dockerfile.esxi-agent
-
-    - name: Image vpcagent
-      uses: elgohr/Publish-Docker-Github-Action@master
-      with:
-        name: registry.cn-beijing.aliyuncs.com/yunionio/vpcagent
-        username: ${{ secrets.DOCKER_USERNAME }}
-        password: ${{ secrets.DOCKER_PASSWORD }}
-        registry: registry.cn-beijing.aliyuncs.com
-        snapshot: true
-        dockerfile: build/docker/Dockerfile.vpcagent
-
-    - name: Image climc
-      uses: elgohr/Publish-Docker-Github-Action@master
-      with:
-        name: registry.cn-beijing.aliyuncs.com/yunionio/climc
-        username: ${{ secrets.DOCKER_USERNAME }}
-        password: ${{ secrets.DOCKER_PASSWORD }}
-        registry: registry.cn-beijing.aliyuncs.com
-        snapshot: true
-        dockerfile: build/docker/Dockerfile.climc
-
-    - name: Image keystone
-      uses: elgohr/Publish-Docker-Github-Action@master
-      with:
-        name: registry.cn-beijing.aliyuncs.com/yunionio/keystone
-        username: ${{ secrets.DOCKER_USERNAME }}
-        password: ${{ secrets.DOCKER_PASSWORD }}
-        registry: registry.cn-beijing.aliyuncs.com
-        snapshot: true
-        dockerfile: build/docker/Dockerfile.keystone
-
-    - name: Image logger
-      uses: elgohr/Publish-Docker-Github-Action@master
-      with:
-        name: registry.cn-beijing.aliyuncs.com/yunionio/logger
-        username: ${{ secrets.DOCKER_USERNAME }}
-        password: ${{ secrets.DOCKER_PASSWORD }}
-        registry: registry.cn-beijing.aliyuncs.com
-        snapshot: true
-        dockerfile: build/docker/Dockerfile.logger
-
-    - name: Image scheduler
-      uses: elgohr/Publish-Docker-Github-Action@master
-      with:
-        name: registry.cn-beijing.aliyuncs.com/yunionio/scheduler
-        username: ${{ secrets.DOCKER_USERNAME }}
-        password: ${{ secrets.DOCKER_PASSWORD }}
-        registry: registry.cn-beijing.aliyuncs.com
-        snapshot: true
-        dockerfile: build/docker/Dockerfile.scheduler
-
-    - name: Image apigateway
-      uses: elgohr/Publish-Docker-Github-Action@master
-      with:
-        name: registry.cn-beijing.aliyuncs.com/yunionio/apigateway
-        username: ${{ secrets.DOCKER_USERNAME }}
-        password: ${{ secrets.DOCKER_PASSWORD }}
-        registry: registry.cn-beijing.aliyuncs.com
-        snapshot: true
-        dockerfile: build/docker/Dockerfile.apigateway
-
-    - name: Image s3gateway
-      uses: elgohr/Publish-Docker-Github-Action@master
-      with:
-        name: registry.cn-beijing.aliyuncs.com/yunionio/s3gateway
-        username: ${{ secrets.DOCKER_USERNAME }}
-        password: ${{ secrets.DOCKER_PASSWORD }}
-        registry: registry.cn-beijing.aliyuncs.com
-        snapshot: true
-        dockerfile: build/docker/Dockerfile.s3gateway
-
-    - name: Image ansibleserver
-      uses: elgohr/Publish-Docker-Github-Action@master
-      with:
-        name: registry.cn-beijing.aliyuncs.com/yunionio/ansibleserver
-        username: ${{ secrets.DOCKER_USERNAME }}
-        password: ${{ secrets.DOCKER_PASSWORD }}
-        registry: registry.cn-beijing.aliyuncs.com
-        snapshot: true
-        dockerfile: build/docker/Dockerfile.ansibleserver
-
-    - name: Image cloudnet
-      uses: elgohr/Publish-Docker-Github-Action@master
-      with:
-        name: registry.cn-beijing.aliyuncs.com/yunionio/cloudnet
-        username: ${{ secrets.DOCKER_USERNAME }}
-        password: ${{ secrets.DOCKER_PASSWORD }}
-        registry: registry.cn-beijing.aliyuncs.com
-        snapshot: true
-        dockerfile: build/docker/Dockerfile.cloudnet
-
-    - name: Image glance
-      uses: elgohr/Publish-Docker-Github-Action@master
-      with:
-        name: registry.cn-beijing.aliyuncs.com/yunionio/glance
-        username: ${{ secrets.DOCKER_USERNAME }}
-        password: ${{ secrets.DOCKER_PASSWORD }}
-        registry: registry.cn-beijing.aliyuncs.com
-        snapshot: true
-        dockerfile: build/docker/Dockerfile.glance
-
-    - name: Image notify
-      uses: elgohr/Publish-Docker-Github-Action@master
-      with:
-        name: registry.cn-beijing.aliyuncs.com/yunionio/notify
-        username: ${{ secrets.DOCKER_USERNAME }}
-        password: ${{ secrets.DOCKER_PASSWORD }}
-        registry: registry.cn-beijing.aliyuncs.com
-        snapshot: true
-        dockerfile: build/docker/Dockerfile.notify
-
-    - name: Image cloudevent
-      uses: elgohr/Publish-Docker-Github-Action@master
-      with:
-        name: registry.cn-beijing.aliyuncs.com/yunionio/cloudevent
-        username: ${{ secrets.DOCKER_USERNAME }}
-        password: ${{ secrets.DOCKER_PASSWORD }}
-        registry: registry.cn-beijing.aliyuncs.com
-        snapshot: true
-        dockerfile: build/docker/Dockerfile.cloudevent
-
-    - name: Image cloudid
-      uses: elgohr/Publish-Docker-Github-Action@master
-      with:
-        name: registry.cn-beijing.aliyuncs.com/yunionio/cloudid
-        username: ${{ secrets.DOCKER_USERNAME }}
-        password: ${{ secrets.DOCKER_PASSWORD }}
-        registry: registry.cn-beijing.aliyuncs.com
-        snapshot: true
-        dockerfile: build/docker/Dockerfile.cloudid
-
-    - name: Image devtool
-      uses: elgohr/Publish-Docker-Github-Action@master
-      with:
-        name: registry.cn-beijing.aliyuncs.com/yunionio/devtool
-        username: ${{ secrets.DOCKER_USERNAME }}
-        password: ${{ secrets.DOCKER_PASSWORD }}
-        registry: registry.cn-beijing.aliyuncs.com
-        snapshot: true
-        dockerfile: build/docker/Dockerfile.devtool
-
-    - name: Image region DNS
-      uses: elgohr/Publish-Docker-Github-Action@master
-      with:
-        name: registry.cn-beijing.aliyuncs.com/yunionio/region-dns
-        username: ${{ secrets.DOCKER_USERNAME }}
-        password: ${{ secrets.DOCKER_PASSWORD }}
-        registry: registry.cn-beijing.aliyuncs.com
-        snapshot: true
-        dockerfile: build/docker/Dockerfile.region-dns

.gitignore

@@ -30,10 +30,6 @@ _output
 /relay
 /structargtest
 .idea
-.vscode
 GPATH
 GRTAGS
 GTAGS
-pkg/generated
-
-*.orig

.travis.yml

@@ -1,29 +1,22 @@
+# This is how to tell Travis to use the fast container-based test
+# runner instead of the slow VM-based one.
 sudo: false
 
-dist: bionic
+dist: xenial
 
-addons:
-  apt:
-    sources:
-      - sourceline: "deb https://download.ceph.com/debian-luminous/ bionic main"
-        key_url: "https://download.ceph.com/keys/release.asc"
-    packages:
-      - build-essential
-      - libcephfs-dev
-      - librbd-dev
-      - librados-dev
+services:
+  - docker
 
 language: go
-go:
-  - 1.12.x
-go_import_path: yunion.io/x/onecloud
-cache:
-  directories:
-    - $HOME/.cache/go-build
 
+go_import_path: yunion.io/x/onecloud
+
+go:
+  - "1.12.x"
+
+# Only clone the most recent commit.
 git:
-  depth: 8
+  depth: 1
 
 script:
-  - make -j$(nproc) ONECLOUD_CI_BUILD=1
-  - ls -lh _output/bin
+  - make docker_build

CONTRIBUTING.md

@@ -1,3 +0,0 @@
-# 开发贡献参考
-
-详情见文档 [开发贡献](https://docs.yunion.io/docs/contribute/)

Dockerfile

@@ -0,0 +1,20 @@
+FROM alpine:3.8
+
+MAINTAINER "Zexi Li <lizexi@yunionyun.com>"
+
+ENV TZ Asia/Shanghai
+
+# Fix binary file not found, see:
+# https://stackoverflow.com/questions/34729748/installed-go-binary-not-found-in-path-on-alpine-linux-docker
+RUN mkdir /lib64 && ln -s /lib/libc.musl-x86_64.so.1 /lib64/ld-linux-x86-64.so.2
+
+RUN mkdir -p /opt/yunion/bin
+
+ADD ./_output/bin/climc /opt/yunion/bin/climc
+ADD ./_output/bin/cloudir /opt/yunion/bin/cloudir
+ADD ./_output/bin/glance /opt/yunion/bin/glance
+ADD ./_output/bin/region /opt/yunion/bin/region
+ADD ./_output/bin/region-dns /opt/yunion/bin/region-dns
+ADD ./_output/bin/scheduler /opt/yunion/bin/scheduler
+ADD ./_output/bin/webconsole /opt/yunion/bin/webconsole
+ADD ./_output/bin/yunionconf /opt/yunion/bin/yunionconf

Gopkg.toml

@@ -0,0 +1,216 @@
+# Gopkg.toml example
+#
+# Refer to https://golang.github.io/dep/docs/Gopkg.toml.html
+# for detailed Gopkg.toml documentation.
+#
+# required = ["github.com/user/thing/cmd/thing"]
+# ignored = ["github.com/user/project/pkgX", "bitbucket.org/user/project/pkgA/pkgY"]
+#
+# [[constraint]]
+#   name = "github.com/user/project"
+#   version = "1.0.0"
+#
+# [[constraint]]
+#   name = "github.com/user/project2"
+#   branch = "dev"
+#   source = "github.com/myfork/project2"
+#
+# [[override]]
+#   name = "github.com/x/y"
+#   version = "2.4.0"
+#
+# [prune]
+#   non-go = false
+#   go-tests = true
+#   unused-packages = true
+
+[[constraint]]
+  name = "github.com/pierrec/lz4"
+  version = "2.0.7"
+
+[[constraint]]
+  name = "github.com/360EntSecGroup-Skylar/excelize"
+  version = "1.4.0"
+
+[[constraint]]
+  name = "github.com/Azure/azure-sdk-for-go"
+  version = "=19.1.0"
+
+[[constraint]]
+  branch = "master"
+  name = "github.com/Microsoft/azure-vhd-utils"
+
+[[constraint]]
+  name = "github.com/aliyun/alibaba-cloud-sdk-go"
+  version = "0.7.4"
+
+[[constraint]]
+  name = "github.com/aliyun/aliyun-oss-go-sdk"
+  version = "1.9.1"
+
+[[constraint]]
+  name = "github.com/aokoli/goutils"
+  version = "1.0.1"
+
+[[constraint]]
+  name = "github.com/aws/aws-sdk-go"
+  version = "=1.15.73"
+
+[[constraint]]
+  name = "github.com/bitly/go-simplejson"
+  version = "0.5.0"
+
+[[constraint]]
+  name = "github.com/c-bata/go-prompt"
+  version = "=0.2.1"
+
+[[constraint]]
+  name = "github.com/coredns/coredns"
+  version = "v1.2.0"
+
+[[constraint]]
+  name = "github.com/fatih/color"
+  version = "1.7.0"
+
+[[constraint]]
+  name = "github.com/go-sql-driver/mysql"
+  version = "1.4.0"
+
+[[constraint]]
+  name = "github.com/golang-plus/uuid"
+  version = "1.0.0"
+
+[[constraint]]
+  branch = "master"
+  name = "github.com/googollee/go-socket.io"
+
+[[constraint]]
+  name = "github.com/gorilla/mux"
+  version = "1.6.2"
+
+[[constraint]]
+  name = "github.com/gorilla/websocket"
+  version = "1.4.0"
+
+[[constraint]]
+  name = "github.com/koding/websocketproxy"
+  branch = "master"
+
+[[constraint]]
+  branch = "master"
+  name = "github.com/gosuri/uitable"
+
+[[constraint]]
+  name = "github.com/hako/durafmt"
+  version = "1.0.0"
+
+[[constraint]]
+  name = "github.com/jinzhu/gorm"
+  version = "1.9.1"
+
+[[constraint]]
+  name = "github.com/kr/pty"
+  version = "1.1.3"
+
+[[constraint]]
+  name = "github.com/mholt/caddy"
+  version = "0.10.11"
+
+[[constraint]]
+  name = "github.com/miekg/dns"
+  version = "1.0.15"
+
+[[constraint]]
+  branch = "master"
+  name = "github.com/moul/http2curl"
+
+[[constraint]]
+  name = "github.com/nelsonken/cos-go-sdk-v5"
+  version = "1.21.0"
+
+[[constraint]]
+  branch = "master"
+  name = "github.com/serialx/hashring"
+
+[[constraint]]
+  name = "github.com/stretchr/testify"
+  version = "1.3.0"
+
+[[constraint]]
+  name = "github.com/tencentcloud/tencentcloud-sdk-go"
+  version = "=3.0.30"
+
+[[constraint]]
+  branch = "master"
+  name = "github.com/tredoe/osutil"
+
+[[constraint]]
+  name = "github.com/vmware/govmomi"
+  version = "0.19.0"
+
+[[constraint]]
+  branch = "master"
+  name = "golang.org/x/crypto"
+
+[[constraint]]
+  name = "gopkg.in/gin-gonic/gin.v1"
+  version = "1.2.0"
+
+[[constraint]]
+  name = "k8s.io/api"
+  version = "kubernetes-1.12.0"
+
+[[constraint]]
+  branch = "master"
+  name = "k8s.io/apimachinery"
+
+[[constraint]]
+  name = "k8s.io/client-go"
+  version = "9.0.0"
+
+[[constraint]]
+  branch = "master"
+  name = "github.com/anacrolix/torrent"
+
+[[constraint]]
+  branch = "master"
+  name = "yunion.io/x/jsonutils"
+
+[[constraint]]
+  branch = "master"
+  name = "yunion.io/x/log"
+
+[[constraint]]
+  branch = "master"
+  name = "yunion.io/x/pkg"
+
+[[constraint]]
+  branch = "master"
+  name = "yunion.io/x/sqlchemy"
+
+[[constraint]]
+  branch = "master"
+  name = "github.com/pkg/errors"
+
+[[constraint]]
+  branch = "master"
+  name = "yunion.io/x/structarg"
+
+[[override]]
+  name = "github.com/apache/thrift"
+  revision = "e59b73d3c2bf1c328ccb78e683c0462fa1a473c7"
+
+[prune]
+  go-tests = true
+  unused-packages = true
+
+[[constraint]]
+  name = "github.com/shirou/gopsutil"
+  version = "2.18.10"
+
+[[constraint]]
+  name="github.com/ceph/go-ceph"
+  branch = "master"
+[[constraint]]
+  branch = "master"
+  name = "github.com/libvirt/libvirt-go-xml"

Makefile

@@ -1,25 +1,18 @@
 #####################################################
 
 REPO_PREFIX := yunion.io/x/onecloud
-VERSION_PKG := yunion.io/x/pkg/util/version
+VENDOR_PATH := $(REPO_PREFIX)/vendor
+VERSION_PKG := $(VENDOR_PATH)/yunion.io/x/pkg/util/version
 ROOT_DIR := $(CURDIR)
 BUILD_DIR := $(ROOT_DIR)/_output
 BIN_DIR := $(BUILD_DIR)/bin
 BUILD_SCRIPT := $(ROOT_DIR)/build/build.sh
 
-ifeq ($(ONECLOUD_CI_BUILD),)
-	GIT_COMMIT := $(shell git rev-parse --short HEAD)
-	GIT_BRANCH := $(shell git name-rev --name-only HEAD)
-	GIT_VERSION := $(shell git describe --always --tags --abbrev=14 $(GIT_COMMIT)^{commit})
-	GIT_TREE_STATE := $(shell s=`git status --porcelain 2>/dev/null`; if [ -z "$$s" ]; then echo "clean"; else echo "dirty"; fi)
-	BUILD_DATE := $(shell date -u +'%Y-%m-%dT%H:%M:%SZ')
-else
-	GIT_COMMIT:=x
-	GIT_BRANCH:=x
-	GIT_VERSION:=x
-	BUILD_TREE_STATE:=clean
-	BUILD_DATE=2099-07-01T07:11:09Z
-endif
+GIT_COMMIT := $(shell git rev-parse --short HEAD)
+GIT_BRANCH := $(shell git rev-parse --abbrev-ref HEAD)
+GIT_VERSION := $(shell git describe --tags --abbrev=14 $(GIT_COMMIT)^{commit})
+GIT_TREE_STATE := $(shell s=`git status --porcelain 2>/dev/null`; if [ -z "$$s" ]; then echo "clean"; else echo "dirty"; fi)
+BUILD_DATE := $(shell date -u +'%Y-%m-%dT%H:%M:%SZ')
 
 LDFLAGS := "-w \
 	-X $(VERSION_PKG).gitVersion=$(GIT_VERSION) \
@@ -32,12 +25,8 @@ LDFLAGS := "-w \
 
 
 #####################################################
-ifneq ($(DLV),)
-	GO_BUILD_FLAGS += -gcflags "all=-N -l"
-	LDFLAGS = ""
-endif
-GO_BUILD_FLAGS+=-mod vendor -ldflags $(LDFLAGS)
-GO_BUILD := go build $(GO_BUILD_FLAGS)
+
+GO_BUILD := go build -ldflags $(LDFLAGS)
 GO_INSTALL := go install -ldflags $(LDFLAGS)
 GO_TEST := go test
 
@@ -47,24 +36,13 @@ CGO_CFLAGS_ENV = $(shell go env CGO_CFLAGS)
 CGO_LDFLAGS_ENV = $(shell go env CGO_LDFLAGS)
 
 ifdef LIBQEMUIO_PATH
-		X_CGO_CFLAGS := ${CGO_CFLAGS_ENV} -I${LIBQEMUIO_PATH}/src -I${LIBQEMUIO_PATH}/src/include
-		X_CGO_LDFLAGS := ${CGO_LDFLAGS_ENV} -laio -lqemuio -lpthread  -L ${LIBQEMUIO_PATH}/src
+    X_CGO_CFLAGS := ${CGO_CFLAGS_ENV} -I${LIBQEMUIO_PATH}/src -I${LIBQEMUIO_PATH}/src/include
+    X_CGO_LDFLAGS := ${CGO_LDFLAGS_ENV} -laio -lqemuio -lpthread  -L ${LIBQEMUIO_PATH}/src
 endif
 
-export GOOS ?= linux
-export GO111MODULE:=on
 export CGO_CFLAGS = ${X_CGO_CFLAGS}
 export CGO_LDFLAGS = ${X_CGO_LDFLAGS}
 
-UNAME := $(shell uname)
-
-ifeq ($(UNAME), Linux)
-XARGS_FLAGS = --no-run-if-empty
-endif
-
-cmdTargets:=$(filter-out cmd/host-image,$(wildcard cmd/*))
-rpmTargets:=$(foreach b,$(patsubst cmd/%,%,$(cmdTargets)),$(if $(shell [ -f "$(CURDIR)/build/$(b)/vars" ] && echo 1),rpm/$(b)))
-
 all: build
 
 
@@ -75,32 +53,33 @@ install: prepare_dir
 	done
 
 
+build: gendoc
+	$(MAKE) $(filter-out cmd/host-image, $(wildcard cmd/*))
+
+gendoc:
+	@sh build/gendoc.sh
+
 gencopyright:
-	@bash scripts/gencopyright.sh pkg cmd
+	@sh scripts/gencopyright.sh pkg cmd
 
 test:
-	@go test $(GO_BUILD_FLAGS) $(shell go list ./... | egrep -v 'host-image|hostimage')
+	@go test $(shell go list ./... | egrep -v 'host-image|hostimage')
 
 vet:
 	go vet ./...
 
-cmd/esxi-agent: prepare_dir
-	CGO_ENABLED=0 $(GO_BUILD) -o $(BIN_DIR)/$(shell basename $@) $(REPO_PREFIX)/$@
-
-cmd/%: prepare_dir
+cmd/%: prepare_dir fmt
 	$(GO_BUILD) -o $(BIN_DIR)/$(shell basename $@) $(REPO_PREFIX)/$@
 
-rpm/%: cmd/%
-	$(BUILD_SCRIPT) $*
 
-pkg/%: prepare_dir
+pkg/%: prepare_dir fmt
 	$(GO_INSTALL) $(REPO_PREFIX)/$@
 
-build:
-	$(MAKE) $(cmdTargets)
 
+# a hack
 rpm:
-	$(MAKE) $(rpmTargets)
+	$(MAKE) $(patsubst %,cmd/%,$(filter-out $@,$(MAKECMDGOALS)))
+	$(foreach cmd,$(filter-out $@,$(MAKECMDGOALS)),$(BUILD_SCRIPT) $(cmd);)
 
 rpmclean:
 	rm -fr $(BUILD_DIR)/rpms
@@ -115,8 +94,14 @@ bin_dir: output_dir
 output_dir:
 	@mkdir -p $(BUILD_DIR)
 
+dep_clean:
+	rm -fr $(GOPATH)/pkg/dep/sources/*
 
-.PHONY: all build prepare_dir clean rpm
+dep_install:
+	curl https://raw.githubusercontent.com/golang/dep/master/install.sh | sh
+
+
+.PHONY: all build prepare_dir clean fmt rpm
 
 
 clean:
@@ -124,197 +109,14 @@ clean:
 
 
 fmt:
-	@git ls-files --exclude '*' '*.go' \
-		| grep -v '^vendor/' \
-		| xargs $(XARGS_FLAGS) gofmt -w
+	@find . -type f -name "*.go" -not -path "./_output/*" \
+		-not -path "./vendor/*" | xargs gofmt -s -w
 
-fmt-check: fmt
-	@if git status --short | grep -E '^.M .*/[^.]+.go'; then \
-		git diff | cat; \
-		echo "$@: working tree modified (possibly by gofmt)" >&2 ; \
-		false ; \
-	fi
-.PHONY: fmt fmt-check
-
-gendocgo:
-	@sh build/gendoc.sh
-
-adddocgo:
-	@git ls-files --others '*/doc.go' | xargs $(XARGS_FLAGS) -- git add
-
-gendocgo-check: gendocgo
-	@n="$$(git ls-files --others '*/doc.go' | wc -l)"; \
-	if test "$$n" -gt 0; then \
-		git ls-files --others '*/doc.go' | sed -e 's/^/  /'; \
-		echo "$@: untracked doc.go file(s) exist in working directory" >&2 ; \
-		false ; \
-	fi
-.PHONY: gendocgo adddocgo gendocgo-check
-
-goimports-check:
-	@goimports -w -local "yunion.io/x/:yunion.io/x/onecloud" pkg cmd; \
-	if git status --short | grep -E '^.M .*/[^.]+.go'; then \
-		git diff | cat; \
-		echo "$@: working tree modified (possibly by goimports)" >&2 ; \
-		echo "$@: " >&2 ; \
-		echo "$@: import spec should be grouped in order: std, 3rd-party, yunion.io/x, yunion.io/x/onecloud" >&2 ; \
-		echo "$@: see \"yun\" branch at https://github.com/yousong/tools" >&2 ; \
-		false ; \
-	fi
-.PHONY: goimports-check
-
-vet-check:
-	./scripts/vet.sh gen
-	./scripts/vet.sh chk
-.PHONY: vet-check
-
-check: fmt-check
-check: gendocgo-check
-check: goimports-check
-check: vet-check
-.PHONY: check
-
-
-define depDeprecated
-OneCloud now requires using go-mod for dependency management.  dep target,
-vendor files will be removed in future versions
-
-Follow the following link to find out more about go-mod
-
- - https://blog.golang.org/using-go-modules
- - https://github.com/golang/go/wiki/Modules
-
-Switching to "make mod"...
-
-endef
-
-dep: export depDeprecated:=$(depDeprecated)
 dep:
-	@echo "$$depDeprecated"
-	@$(MAKE) mod
-
-mod:
-	go get -d $(patsubst %,%@master,$(shell GO111MODULE=on go mod edit -print  | sed -n -e 's|.*\(yunion.io/x/[a-z].*\) v.*|\1|p'))
-	go mod tidy
-	go mod vendor -v
-
-
-DOCKER_BUILD_IMAGE_VERSION?=1.0-1
-
-define dockerCentOSBuildCmd
-set -o xtrace
-set -o errexit
-set -o pipefail
-cd /root/onecloud
-export GOFLAGS=-mod=vendor
-make $(1)
-chown -R $(shell id -u):$(shell id -g) _output
-endef
-
-docker-centos-build: export dockerCentOSBuildCmd:=$(call dockerCentOSBuildCmd,$(F))
-docker-centos-build:
-	docker rm --force onecloud-ci-build &>/dev/null || true
-	docker run \
-		--name onecloud-ci-build \
-		--rm \
-		--volume $(CURDIR):/root/onecloud \
-		--volume $(CURDIR)/_output/_cache:/root/.cache \
-		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
-
-# 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-centos stop --time 0 onecloud-ci-build || true
-
-.PHONY: docker-centos-build
-.PHONY: docker-centos-build-stop
-
-define dockerAlpineBuildCmd
-set -o xtrace
-set -o errexit
-set -o pipefail
-cd /root/go/src/yunion.io/x/onecloud
-export GOFLAGS=-mod=vendor
-make $(1)
-chown -R $(shell id -u):$(shell id -g) _output
-endef
-
-docker-alpine-build: export dockerAlpineBuildCmd:=$(call dockerAlpineBuildCmd,$(F))
-docker-alpine-build:
-	docker rm --force onecloud-docker-alpine-build &>/dev/null || true
-	docker run --rm \
-		--name onecloud-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 \
-		registry.cn-beijing.aliyuncs.com/yunionio/alpine-build:1.0-1 \
-		/bin/sh -c "$$dockerAlpineBuildCmd"
-	ls -lh _output/alpine-build/bin
-
-docker-alpine-build-stop:
-	docker stop --time 0 onecloud-docker-alpine-build || true
-
-.PHONY: docker-alpine-build
-.PHONY: docker-alpine-build-stop
-
-define helpText
-Build with docker
-
-	make docker-centos-build F='-j4'
-	make docker-centos-build F='-j4 cmd/region cmd/climc'
-	make docker-centos-build-stop
-
-	make docker-alpine-build F='-j4'
-	make docker-alpine-build F='-j4 cmd/host cmd/host-deployer'
-	make docker-alpine-build-stop
-
-Tidy up go modules and vendor directory
-
-	make mod
-endef
-
-help: export helpText:=$(helpText)
-help:
-	@echo "$$helpText"
-
-.PHONY: help
-
-gen-model-api-check:
-	which model-api-gen || (GO111MODULE=off go get -u yunion.io/x/code-generator/cmd/model-api-gen)
-
-gen-model-api: gen-model-api-check
-	$(ROOT_DIR)/scripts/codegen.py model-api
-
-gen-swagger-check:
-	which swagger || (GO111MODULE=off go get -u github.com/go-swagger/go-swagger/cmd/swagger)
-	which swagger-gen || (GO111MODULE=off go get -u yunion.io/x/code-generator/cmd/swagger-gen)
-	which swagger-serve || (GO111MODULE=off go get -u yunion.io/x/code-generator/cmd/swagger-serve)
-
-gen-swagger: gen-swagger-check
-	$(ROOT_DIR)/scripts/codegen.py swagger-code
-	$(ROOT_DIR)/scripts/codegen.py swagger-yaml
-
-swagger-serve-only:
-	$(ROOT_DIR)/scripts/codegen.py swagger-serve
-
-swagger-serve: gen-model-api gen-swagger swagger-serve-only
-
-swagger-site: gen-model-api gen-swagger
-	$(ROOT_DIR)/scripts/codegen.py swagger-site
-
-.PHONY: gen-model-api-check gen-model-api gen-swagger-check gen-swagger swagger-serve swagger-site
-
-REGISTRY ?= "registry.cn-beijing.aliyuncs.com/yunionio"
-VERSION ?= $(shell git describe --exact-match 2> /dev/null || \
-                git describe --match=$(git rev-parse --short=8 HEAD) --always --dirty --abbrev=8)
-
-image:
-	TAG=$(VERSION) REGISTRY=$(REGISTRY) $(ROOT_DIR)/scripts/docker_push.sh $(filter-out $@,$(MAKECMDGOALS))
-
-.PHONY: image
+	cd $(ROOT_DIR) && dep ensure -v -update $(shell for p in $$(ls vendor/yunion.io/x/); do echo "yunion.io/x/$$p"; done | xargs)
 
 %:
 	@:
+
+docker_build:
+	$(ROOT_DIR)/build/docker_build.sh

OWNERS

@@ -1,13 +1,11 @@
 # See the OWNERS docs at https://go.k8s.io/owners
 reviewers:
+  - swordqiu
+  - yousong
+  - wanyaoqi
   - Zexi
   - ioito
-  - swordqiu
   - tb365
-  - wanyaoqi
-  - yousong
-  - zhaoxiangchun
-  - zhasm
 approvers:
   - swordqiu
   - yousong

README-CN.md

@@ -1,54 +0,0 @@
-# Yunion OneCloud (云联融合云）
-
-[![CircleCI](https://circleci.com/gh/yunionio/onecloud.svg?style=svg)](https://circleci.com/gh/yunionio/onecloud) 
-[![Build Status](https://travis-ci.com/yunionio/onecloud.svg?branch=master)](https://travis-ci.org/yunionio/onecloud) 
-[![Go Report Card](https://goreportcard.com/badge/github.com/yunionio/onecloud)](https://goreportcard.com/report/github.com/yunionio/onecloud) 
-
-## 什么是云联融合云?
-
-云联融合云（Yunion OneCloud）是一个开源的多云平台。融合云构建在用户分布于多云基础设施之上，通过技术手段将分布于多云的异构IT资源统一管理，将多底层多云的差异向用户屏蔽，并通过网络和调度实现资源的融合与打通，在多云之上进行抽象，向用户呈现统一的使用界面和API接口，让用户就像使用一个云平台一样使用分布于多云的资源，实现一个统一的“云上之云”的云平台。
-
-鉴于企业IT基础设施的两个趋势：1. 企业使用多云基础设施，并且公有云是最主要的基础设施提供者；2. 企业应用将逐步云原生化，企业IT基础设施需要为Kubernetes优化。融合云为此架构而设计。一方面抽象管理底层的多云基础设施，另一方面为多云Kubernetes提供运行环境。融合云为企业未来的的IT基础设施架构而设计。
-
-云联融合云具备以下功能特性:
-
-- 多云资源统一管理
-
-  统一API、镜像、调度、账号体系、监控和计费等操作，能够全面管理 On premises、 私有云、公有云资源。
-
-- 内置私有云
-
-  OneCloud内置完备的私有云实现，提供对用户本地IDC的虚拟机、物理机和负载均衡等资源管理。
-
-- 为多云Kubernetes提供运行环境
-
-  OneCloud自身为运行在Kubernetes的云原生应用，并且能在多云环境部署运行Kubernetes集群。
-
-欢迎安装部署云联融合云，期待大家的反馈！
-
-
-## 部署
-
-请参考文档 [安装部署](https://docs.yunion.io/docs/setup/) 搭建 OneCloud 集群。
-
-
-## 文档
-
-- [文档中心](https://docs.yunion.io/)
-
-- [Swagger API文档](https://docs.yunion.cn/api/)
-
-
-## 架构
-
-![architecture](./docs/architecture.png)
-
-
-## 贡献
-
-我们非常欢迎和感谢开发者向项目做贡献，流程细节请查看 [CONTRIBUTING.md](./CONTRIBUTING.md) 。
-
-
-## License
-
-OneCloud 使用 Apache license 2.0. 详情请看 [LICENSE](./LICENSE) 。

README.md

@@ -1,55 +1,4 @@
 # Yunion OneCloud
 
-[![CircleCI](https://circleci.com/gh/yunionio/onecloud.svg?style=svg)](https://circleci.com/gh/yunionio/onecloud) 
-[![Build Status](https://travis-ci.com/yunionio/onecloud.svg?branch=master)](https://travis-ci.com/yunionio/onecloud/branches) 
-[![Go Report Card](https://goreportcard.com/badge/github.com/yunionio/onecloud)](https://goreportcard.com/report/github.com/yunionio/onecloud) 
-
-### [README in Chinese](./README-CN.md)
-
-## What is Yunion OneCloud?
-
-Yunion OneCloud is an open source unified-IaaS cloud platform.
-
-As its name sugguests, 'Yun' means 'cloud' in Chinese and 'Yunion OneCloud' means to unify many distinct clouds into the one that behaves like an integral cloud platform.
-
-As trends show, the enterprise IT infrastructure in the future would be unavoidably heterogeneous and the public clouds should be the major infrastructure providers for many enterprises. Further, the infrastructure would most likely be prepared for the cloud-native applications running on Kubernetes. Yunion OneCloud is built to provide the cloud architecture for this scenario such that it is the middle layer between the underlying cloud infrustructures and the overlay kubernetes clusters across many clouds.
-
-Many may consider Yunion OneCloud as a multi-cloud management platform (MCMP). Rather, we would view it as an IaaS platform as it does not only manage the resources and services from many clouds, but also hides the differences of underlying technologies and exposes one set of APIs that allow programatically interacting with the compute/storage/networking resources across many clouds.
-
-Yunion OneCloud is working on abstracting APIs for the following resources:
-
-* Compute, including virtual machines, images, etc.
-* Storage, including disks, snapshots, object storages, etc.
-* Networking, including load balancers, VPC, virtual networks, NAT gateways, security groups, etc.
-* Accouting and billing, etc.
-* ...
-
-over the following many cloud providers:
-
-* On-premise IT resources, including kvm VM, baremetal, VMware vsphere/ESXi, etc.
-* Private clouds, including OpenStack, etc.
-* Public clouds, including Aliyun, AWS, Azure, Tencent Cloud, Huawei Cloud, etc.
-
-You are welcome to install and try Yunion OneCloud. Looking forward to your feedback.
-
-## Installation
-
-Please refers to [install & deployment](https://docs.yunion.io/docs/setup/) (currently in Chinese Only).
-
-## Documentations
-
-- [Yunion OneCloud Documents](https://docs.yunion.io/)
-
-- [Swagger API](https://docs.yunion.cn/apiv2/)
-
-## Architecture
-
-![architecture](./docs/architecture.png)
-
-## Contribution
-
-You are welcome to contribute to the project. Please refer to [CONTRIBUTING.md](./CONTRIBUTING.md) for guidelines.
-
-## License
-
-Apache License 2.0. See [LICENSE](./LICENSE) 。
+[![CircleCI](https://circleci.com/gh/yunionio/onecloud.svg?style=svg)](https://circleci.com/gh/yunionio/onecloud) [![Build Status](https://travis-ci.org/yunionio/onecloud.svg?branch=master)](https://travis-ci.org/yunionio/onecloud)
+[![Go Report Card](https://goreportcard.com/badge/github.com/yunionio/onecloud)](https://goreportcard.com/report/github.com/yunionio/onecloud)

build/ansibleserver/root/etc/yunion/ansibleserver.conf.sample

@@ -1,10 +0,0 @@
-region = 'Yunion'
-address = '10.168.222.136'
-port = 8890
-auth_uri = 'http://10.168.222.136:35357/v3'
-admin_user = 'yunionansible'
-admin_password = 'xxxxxxxxxxxxxxxx'
-admin_tenant_name = 'system'
-sql_connection = 'mysql+pymysql://yunionansible:9YuQL9KEZn1mppaK@localhost:3306/yunionansible?charset=utf8'
-
-auto_sync_table = True

build/ansibleserver/vars

@@ -1,5 +0,0 @@
-DESCRIPTION="Yunion Ansible Controller"
-
-REQUIRES=(
-	"ansible"
-)

build/baremetal-agent/vars

@@ -1,6 +1 @@
-DESCRIPTION="Baremetal Agent Command Line Utility"
-
-REQUIRES=(
-    ipmitool
-    mkisofs
-)
+DESCRIPTION="Baremetal Agent Command Line Utility"

build/build.sh

@@ -134,11 +134,7 @@ fi
 
 rpmbuild --define "_topdir $BUILDROOT" -bb $SPEC_FILE
 
-find $RPM_DIR -type f | while read f; do
-	d="$(dirname "$f")"
-	d="$OUTPUT_DIR/${d#$RPM_DIR}"
-	mkdir -p "$d"
-	cp $f $d
-done
+mkdir -p $OUTPUT_DIR
+cp -fr $RPM_DIR/* $OUTPUT_DIR/
 
 rm -fr $BUILDROOT

build/climc/root/opt/yunion/scripts/rbac/domainadmin.yaml

@@ -1,6 +0,0 @@
-# rbac for project owner, not allow for delete
-roles:
-  - domain_admin
-scope: domain
-policy:
-  '*': allow

build/climc/root/opt/yunion/scripts/rbac/member.yaml

@@ -1,9 +0,0 @@
-# rbac for normal user, not allow for delete
-scope: project
-policy:
-  '*':
-    '*':
-      '*': allow
-      create: deny
-      update: deny
-      delete: deny

build/climc/root/opt/yunion/scripts/rbac/projectowner.yaml

@@ -1,6 +0,0 @@
-# rbac for project owner, not allow for delete
-roles:
-  - project_owner
-scope: project
-policy:
-  '*': allow

build/climc/root/opt/yunion/scripts/rbac/sysadmin.yaml

@@ -1,8 +0,0 @@
-# rbac for sysadmin
-projects:
-  - system
-roles:
-  - admin
-scope: system
-policy:
-  '*': allow

build/climc/root/opt/yunion/scripts/tools/clean_account.sh

@@ -1,42 +0,0 @@
-#!/bin/bash
-
-set -e
-
-pushd $(dirname $BASH_SOURCE) > /dev/null
-CUR_DIR=$(pwd -P)
-popd > /dev/null
-
-
-ACCOUNT=$1
-
-if [ -z "$ACCOUNT" ]; then
-    echo "Usage: $0 <cloud-acount-id-or-name>"
-    exit 1
-fi
-
-ACCOUNT_ID=$(climc cloud-account-show $ACCOUNT | grep -w " id " | awk '{print $4}')
-ACCOUNT_NAME=$(climc cloud-account-show $ACCOUNT | grep -w " name " | awk '{print $4}')
-
-if [ -z "$ACCOUNT_ID" ]; then
-    echo "Cloud account $ACCOUNT not found"
-    exit 1
-fi
-
-
-echo "Ready to clean cloud account $ACCOUNT_NAME($ACCOUNT_ID)..."
-
-echo "1. Disable cloud account $ACCOUNT_NAME($ACCOUNT_ID) ..."
-
-climc cloud-account-disable $ACCOUNT_ID
-
-echo "2. Clean all providers ..."
-
-for provider_id in $(climc cloud-provider-list --account $ACCOUNT_ID --limit 0 | egrep '[0-9a-f]{8}-([0-9a-f]{4}-){3}[0-9a-f]{12}' | awk '{print $2}')
-do
-    echo "### to clean cloud provider $provider_id ..."
-    $CUR_DIR/clean_provider.sh $provider_id
-done
-
-echo "3. Delete cloud account ..."
-
-climc cloud-account-delete $ACCOUNT_ID

build/climc/root/opt/yunion/scripts/tools/clean_eip.sh

@@ -1,27 +0,0 @@
-#/bin/bash
-
-set -e
-
-EIP=$1
-
-if [ -z "$EIP" ]; then
-    echo "Usage: $0 <eip_id_or_name>"
-    exit 1
-fi
-
-EIP_NAME=$(climc eip-show $EIP | grep -w " name " | awk '{print $4}')
-EIP_ID=$(climc eip-show $EIP | grep -w " id " | awk '{print $4}')
-
-if [ -z "$EIP_ID" ]; then
-    echo "Cannot find eip $EIP_ID"
-    exit 1
-fi
-
-echo "To clean eip $EIP_NAME($EIP_ID)..."
-
-clean_eip() {
-    local EID=$1
-    climc eip-purge $EID
-}
-
-clean_eip $EIP_ID

build/climc/root/opt/yunion/scripts/tools/clean_host.sh

@@ -1,80 +0,0 @@
-#!/bin/bash
-
-set -e
-
-HOST=$1
-
-if [ -z "$HOST" ]; then
-    echo "Usage: $0 <host_id_or_name>"
-    exit 1
-fi
-
-error_exit() {
-    echo "Error: $1"
-    exit 1
-}
-
-HOSTID=$(climc host-show $HOST | grep -w " id " | awk '{print $4}')
-
-HOSTNAME=$(climc host-show $HOST | grep -w " name " | awk '{print $4}')
-
-if [ -z "$HOSTNAME" ]; then
-    error_exit "Cannot find host $HOST"
-fi
-
-if [ -z "$HOSTID" ]; then
-    error_exit "Cannot find host $HOST"
-fi
-
-echo "Ready to purge host $HOSTNAME($HOSTID)..."
-
-echo "1. Disable $HOSTNAME($HOSTID)"
-
-if ! climc host-disable $HOSTID > /dev/null; then
-    error_exit "Fail to disable $HOST"
-fi
-
-echo "2. Clean servers on $HOSTNAME($HOSTID)"
-
-for i in $(climc server-list --host $HOSTID --admin --limit 2048 --system | egrep '[0-9a-f]{8}-([0-9a-f]{4}-){3}[0-9a-f]{12}' | awk '{print $2}')
-do
-    climc server-update --delete enable $i > /dev/null
-    climc server-purge $i > /dev/null
-done
-
-for i in $(climc server-list --host $HOSTID --admin --limit 2048 --pending-delete --system | egrep '[0-9a-f]{8}-([0-9a-f]{4}-){3}[0-9a-f]{12}' | awk '{print $2}')
-do
-    climc server-purge $i > /dev/null
-done
-
-echo "3. Clean disks on $HOSTNAME($HOSTID)"
-
-for storageid in $(climc host-storage-list --host $HOSTID --show-emulated | egrep '[0-9a-f]{8}-([0-9a-f]{4}-){3}[0-9a-f]{12}' | awk '{print $4}')
-do
-    STORAGENAME=$(climc storage-show $storageid | grep -w " name " | awk '{print $4}')
-    STORAGE_TYPE=$(climc storage-show $storageid | grep -w " storage_type " | awk '{print $4}')
-    if [ "$STORAGE_TYPE" == "local" ]; then
-        for diskid in $(climc disk-list --admin --system --details --search $storageid --limit 2048 | egrep '[0-9a-f]{8}-([0-9a-f]{4}-){3}[0-9a-f]{12}' | awk '{print $2}')
-        do
-            climc disk-purge $diskid > /dev/null
-        done
-        for diskid in $(climc disk-list --admin --system --details --search $storageid --pending-delete --limit 2048 | egrep '[0-9a-f]{8}-([0-9a-f]{4}-){3}[0-9a-f]{12}' | awk '{print $2}')
-        do
-            climc disk-purge $diskid > /dev/null
-        done
-    fi
-done
-
-echo "4. Remove host $HOSTNAME($HOSTID)"
-
-BAREMETAL=$(climc host-show $HOSTID | grep -w " is_baremetal " | awk '{print $4}')
-
-HOSTTYPE=$(climc host-show $HOSTID | grep -w " host_type " | awk '{print $4}')
-
-if [ "$BAREMETAL" == "true" ] && [ "$HOSTTYPE" != "baremetal" ]; then
-    climc host-update --host-type baremetal $HOSTID > /dev/null
-fi
-
-climc host-delete $HOSTID > /dev/null
-
-echo "DONE."

build/climc/root/opt/yunion/scripts/tools/clean_loadbalancer.sh

@@ -1,27 +0,0 @@
-#!/bin/bash
-
-set -e
-
-LB=$1
-
-if [ -z "$LB" ]; then
-    echo "Usage: $0 <loadbalancer_id_or_name>"
-    exit 1
-fi
-
-LB_ID=$(climc lb-show $LB | grep -w " id " | awk '{print $4}')
-LB_NAME=$(climc lb-show $LB | grep -w " name " | awk '{print $4}')
-
-if [ -z "$LB_ID" ]; then
-    echo "Loadbalancer $LB not found"
-    exit 1
-fi
-
-echo "Ready to remove loadbalancer $LB_NAME($LB_ID) ..."
-
-clean_loadbalancer() {
-    local LID=$1
-    climc lb-purge $LID
-}
-
-clean_loadbalancer $LB_ID

build/climc/root/opt/yunion/scripts/tools/clean_loadbalancer_acl.sh

@@ -1,27 +0,0 @@
-#!/bin/bash
-
-set -e
-
-LB_ACL=$1
-
-if [ -z "$LB_ACL" ]; then
-    echo "Usage: $0 <loadbalancer_id_or_name>"
-    exit 1
-fi
-
-LB_ACL_ID=$(climc lbacl-show $LB_ACL | grep -w " id " | awk '{print $4}')
-LB_ACL_NAME=$(climc lbacl-show $LB_ACL | grep -w " name " | awk '{print $4}')
-
-if [ -z "$LB_ACL_ID" ]; then
-    echo "Loadbalancer ACL $LB_ACL_ID not found"
-    exit 1
-fi
-
-echo "Ready to remove loadbalancer acl $LB_ACL_NAME($LB_ACL_ID) ..."
-
-clean_loadbalancer_acl() {
-    local LID=$1
-    climc lbacl-purge $LID
-}
-
-clean_loadbalancer_acl $LB_ACL_ID

build/climc/root/opt/yunion/scripts/tools/clean_loadbalancer_certificate.sh

@@ -1,27 +0,0 @@
-#!/bin/bash
-
-set -e
-
-LB_CERT=$1
-
-if [ -z "$LB_CERT" ]; then
-    echo "Usage: $0 <loadbalancer_id_or_name>"
-    exit 1
-fi
-
-LB_CERT_ID=$(climc lbcert-show $LB_CERT | grep -w " id " | awk '{print $4}')
-LB_CERT_NAME=$(climc lbcert-show $LB_CERT | grep -w " name " | awk '{print $4}')
-
-if [ -z "$LB_CERT_ID" ]; then
-    echo "Loadbalancer certificate $LB_CERT_ID not found"
-    exit 1
-fi
-
-echo "Ready to remove loadbalancer certificate $LB_CERT_NAME($LB_CERT_ID) ..."
-
-clean_loadbalancer_cert() {
-    local LID=$1
-    climc lbcert-purge $LID
-}
-
-clean_loadbalancer_cert $LB_CERT_ID

build/climc/root/opt/yunion/scripts/tools/clean_provider.sh

@@ -1,96 +0,0 @@
-#!/bin/bash
-
-set -e
-
-pushd $(dirname $BASH_SOURCE) > /dev/null
-CUR_DIR=$(pwd -P)
-popd > /dev/null
-
-
-PROVIDER=$1
-
-if [ -z "$PROVIDER" ]; then
-    echo "Usage: $0 <cloud-provider-id-or-name>"
-    exit 1
-fi
-
-PROVIDER_ID=$(climc cloud-provider-show $PROVIDER | grep -w " id " | awk '{print $4}')
-PROVIDER_NAME=$(climc cloud-provider-show $PROVIDER | grep -w " name " | awk '{print $4}')
-
-if [ -z "$PROVIDER_ID" ]; then
-    echo "Cloud provider $PROVIDER not found"
-    exit 1
-fi
-
-
-echo "Ready to clean cloud provider $PROVIDER_NAME($PROVIDER_ID)..."
-
-echo "1. Disable cloud provider $PROVIDER_NAME($PROVIDER_ID) ..."
-
-climc cloud-provider-disable $PROVIDER_ID
-
-echo "2. Clean all hosts ..."
-
-for hostid in $(climc host-list --manager $PROVIDER_ID --admin --show-emulated --limit 0 | egrep '[0-9a-f]{8}-([0-9a-f]{4}-){3}[0-9a-f]{12}' | awk '{print $2}')
-do
-    $CUR_DIR/clean_host.sh $hostid
-done
-
-echo "3. Clean all loadbalancer ..."
-
-for lbid in $(climc lb-list --manager $PROVIDER_ID --admin --show-emulated --limit 0 | egrep '[0-9a-f]{8}-([0-9a-f]{4}-){3}[0-9a-f]{12}' | awk '{print $2}')
-do
-    $CUR_DIR/clean_loadbalancer.sh $lbid
-done
-
-echo "4. Clean all loadbalancer acl ..."
-
-for lbaclid in $(climc lbacl-list --manager $PROVIDER_ID --admin --show-emulated --limit 0 | egrep '[0-9a-f]{8}-([0-9a-f]{4}-){3}[0-9a-f]{12}' | awk '{print $2}')
-do
-    $CUR_DIR/clean_loadbalancer_acl.sh $lbaclid
-done
-
-echo "5. Clean all loadbalancer certificate ..."
-
-for lbcertid in $(climc lbcert-list --manager $PROVIDER_ID --admin --show-emulated --limit 0 | egrep '[0-9a-f]{8}-([0-9a-f]{4}-){3}[0-9a-f]{12}' | awk '{print $2}')
-do
-    $CUR_DIR/clean_loadbalancer_certificate.sh $lbcertid
-done
-
-echo "6. Clean all vpc ..."
-
-for vpcid in $(climc vpc-list --manager $PROVIDER_ID --admin --show-emulated --limit 0 | egrep '[0-9a-f]{8}-([0-9a-f]{4}-){3}[0-9a-f]{12}' | awk '{print $2}')
-do
-    $CUR_DIR/clean_vpc.sh $vpcid
-done
-
-echo "7. Clean all eips ..."
-for eipid in $(climc eip-list --admin --manager $PROVIDER_ID --admin --show-emulated --limit 0 | egrep '[0-9a-f]{8}-([0-9a-f]{4}-){3}[0-9a-f]{12}' | awk '{print $2}')
-do
-    $CUR_DIR/clean_eip.sh $eipid
-done
-
-echo "8. Clean all snapshots ..."
-for snapid in $(climc snapshot-list --admin --manager $PROVIDER_ID --admin --show-emulated --limit 0 | egrep '[0-9a-f]{8}-([0-9a-f]{4}-){3}[0-9a-f]{12}' | awk '{print $2}')
-do
-    echo "to clean snapshot $snapid ..."
-    $CUR_DIR/clean_snapshot.sh $snapid
-done
-
-echo "9. Clean all storagecache ..."
-
-for cacheid in $(climc storage-cache-list --manager $PROVIDER_ID --admin --show-emulated --limit 0 | egrep '[0-9a-f]{8}-([0-9a-f]{4}-){3}[0-9a-f]{12}' | awk '{print $2}')
-do
-    $CUR_DIR/clean_storagecache.sh $cacheid
-done
-
-echo "10. Clean all storages ..."
-
-for storeid in $(climc storage-list --manager $PROVIDER_ID --admin --show-emulated --limit 0 | egrep '[0-9a-f]{8}-([0-9a-f]{4}-){3}[0-9a-f]{12}' | awk '{print $2}')
-do
-    $CUR_DIR/clean_storage.sh $storeid
-done
-
-echo "Delete cloud provider ..."
-
-climc cloud-provider-delete $PROVIDER_ID

build/climc/root/opt/yunion/scripts/tools/clean_snapshot.sh

@@ -1,27 +0,0 @@
-#/bin/bash
-
-set -e
-
-SNAPSHOT=$1
-
-if [ -z "$SNAPSHOT" ]; then
-    echo "Usage: $0 <snapshot_id_or_name>"
-    exit 1
-fi
-
-SNAPSHOT_NAME=$(climc snapshot-show $SNAPSHOT | grep -w " name " | awk '{print $4}')
-SNAPSHOT_ID=$(climc snapshot-show $SNAPSHOT | grep -w " id " | awk '{print $4}')
-
-if [ -z "$SNAPSHOT_ID" ]; then
-    echo "Cannot find snapshot $SNAPSHOT_ID"
-    exit 1
-fi
-
-echo "To clean snapshot $SNAPSHOT_NAME($SNAPSHOT_ID)..."
-
-clean_snapshot() {
-    local SNAP_ID=$1
-    climc snapshot-purge $SNAP_ID > /dev/null
-}
-
-clean_snapshot $SNAPSHOT_ID

build/climc/root/opt/yunion/scripts/tools/clean_storage.sh

@@ -1,34 +0,0 @@
-#!/bin/bash
-
-set -e
-
-STORAGE=$1
-
-if [ -z "$STORAGE" ]; then
-    echo "Usage: $0 <storage_id_or_name>"
-    exit 1
-fi
-
-STORAGE_ID=$(climc storage-show $STORAGE | grep -w " id " | awk '{print $4}')
-STORAGE_NAME=$(climc storage-show $STORAGE | grep -w " name " | awk '{print $4}')
-
-if [ -z "$STORAGE_ID" ]; then
-    echo "Storage $STORAGE not found"
-    exit 1
-fi
-
-echo "Clean disks on storage $STORAGE_NAME($STORAGE_ID) ..."
-
-for disk_id in $(climc disk-list --admin --storage $STORAGE_ID --show-emulated --limit 2048 | egrep '[0-9a-f]{8}-([0-9a-f]{4}-){3}[0-9a-f]{12}' | awk '{print $2}')
-do
-    climc disk-purge $disk_id > /dev/null
-done
-
-for disk_id in $(climc disk-list --admin --storage $STORAGE_ID --show-emulated --pending-delete --limit 2048 | egrep '[0-9a-f]{8}-([0-9a-f]{4}-){3}[0-9a-f]{12}' | awk '{print $2}')
-do
-    climc disk-purge $disk_id > /dev/null
-done
-
-# CACHE_ID=$(climc storage-show $STORAGE_ID | grep -w " storagecache_id " | awk '{print $4}')
-
-climc storage-delete $STORAGE_ID > /dev/null

build/climc/root/opt/yunion/scripts/tools/clean_storagecache.sh

@@ -1,28 +0,0 @@
-#!/bin/bash
-
-set -e
-
-CACHE=$1
-
-if [ -z "$CACHE" ]; then
-    echo "Usage: $0 <storage_cache_id_or_name>"
-    exit 1
-fi
-
-CACHE_ID=$(climc storage-cache-show $CACHE | grep -w " id " | awk '{print $4}')
-CACHE_NAME=$(climc storage-cache-show $CACHE | grep -w " name " | awk '{print $4}')
-
-if [ -z "$CACHE_ID" ]; then
-    echo "Storage cache $CACHE not found"
-    exit 1
-fi
-
-echo "Ready to remove storagecache $CACHE_NAME($CACHE_ID) ..."
-
-for imgid in $(climc storage-cached-image-list --storagecache $CACHE_ID --show-emulated --limit 0 | egrep '[0-9a-f]{8}-([0-9a-f]{4}-){3}[0-9a-f]{12}' | awk '{print $4}')
-do
-    climc storagecache-uncache-image $CACHE_ID $imgid --force # > /dev/null
-done
-
-climc storage-cache-delete $CACHE_ID > /dev/null
-

build/climc/root/opt/yunion/scripts/tools/clean_vpc.sh

@@ -1,55 +0,0 @@
-#/bin/bash
-
-set -e
-
-VPC=$1
-
-if [ -z "$VPC" ]; then
-    echo "Usage: $0 <vpc_id_or_name>"
-    exit 1
-fi
-
-VPC_NAME=$(climc vpc-show $VPC | grep -w " name " | awk '{print $4}')
-VPC_ID=$(climc vpc-show $VPC | grep -w " id " | awk '{print $4}')
-
-if [ -z "$VPC_ID" ]; then
-    echo "Cannot find vpc $VPC"
-    exit 1
-fi
-
-echo "To clean vpc $VPC_NAME($VPC_ID)..."
-
-clean_network() {
-    climc network-purge $1 > /dev/null
-}
-
-
-clean_wire() {
-    local WIRE_ID=$1
-    for net_id in $(climc network-list --admin --wire $WIRE_ID --show-emulated | egrep '[0-9a-f]{8}-([0-9a-f]{4}-){3}[0-9a-f]{12}' | awk '{print $2}')
-    do
-        clean_network $net_id
-    done
-    climc wire-delete $wire_id > /dev/null
-}
-
-clean_vpc() {
-    local VPC_ID=$1
-    climc vpc-purge $VPC_ID > /dev/null
-}
-
-echo "1. Clean wires ..."
-
-for wire_id in $(climc wire-list --vpc $VPC_ID --show-emulated | egrep '[0-9a-f]{8}-([0-9a-f]{4}-){3}[0-9a-f]{12}' | awk '{print $2}')
-do
-    clean_wire $wire_id
-done
-
-echo "2. Clean route tables ..."
-for routetable_id in $(climc routetable-list --vpc $VPC_ID --show-emulated | egrep '[0-9a-f]{8}-([0-9a-f]{4}-){3}[0-9a-f]{12}' | awk '{print $2}')
-do
-    climc routetable-purge $routetable_id >/dev/null
-done
-
-echo "3. clean vpc ..."
-clean_vpc $VPC_ID

build/cloudevent/vars

@@ -1 +0,0 @@
-DESCRIPTION="Yunion Cloudevent"

build/cloudid/vars

@@ -1 +0,0 @@
-DESCRIPTION="Yunion CloudId"

build/cloudnet/root/etc/yunion/cloudnet.conf.sample

@@ -1,10 +0,0 @@
-region = 'Yunion'
-address = '10.168.222.136'
-port = 8891
-auth_uri = 'http://10.168.222.136:35357/v3'
-admin_user = 'cloudnetadmin'
-admin_password = 'xxxxxxxxxxxxxxxx'
-admin_tenant_name = 'system'
-sql_connection = 'mysql+pymysql://yunionansible:9YuQL9KEZn1mppaK@localhost:3306/yunionansible?charset=utf8'
-
-auto_sync_table = True

build/cloudnet/vars

@@ -1 +0,0 @@
-DESCRIPTION="Yunion Cloudnet"

build/devtool/vars

@@ -1 +0,0 @@
-DESCRIPTION="Yunion DevTools Server"

build/docker/Dockerfile.ansibleserver

@@ -1,3 +0,0 @@
-FROM registry.cn-beijing.aliyuncs.com/yunionio/ansibleserver-base:1.0.0
-
-ADD ./_output/alpine-build/bin/ansibleserver /opt/yunion/bin/ansibleserver

build/docker/Dockerfile.ansibleserver-base

@@ -1,12 +0,0 @@
-FROM alpine:3.11.6
-
-MAINTAINER "Yousong Zhou <zhouyousong@yunionyun.com>"
-
-# openssh-client, for ansible ssh connection
-# git, ca-certificates, for fetching ansible roles
-RUN set -x \
-	&& apk update \
-	&& apk add openssh-client \
-	&& apk add ansible \
-	&& apk add tzdata git ca-certificates \
-	&& rm -rf /var/cache/apk/*

build/docker/Dockerfile.apigateway

@@ -1,3 +0,0 @@
-FROM registry.cn-beijing.aliyuncs.com/yunionio/onecloud-base:v0.1
-
-ADD ./_output/bin/apigateway /opt/yunion/bin/apigateway

build/docker/Dockerfile.baremetal-agent

@@ -1,9 +0,0 @@
-FROM registry.cn-beijing.aliyuncs.com/yunionio/baremetal-base:v0.0.1
-
-MAINTAINER "Zexi Li <lizexi@yunionyun.com>"
-
-RUN mkdir -p /opt/yunion/bin
-
-ADD ./_output/bin/baremetal-agent /opt/yunion/bin/baremetal-agent
-ADD ./_output/bin/.baremetal-agent.bin /opt/yunion/bin/.baremetal-agent.bin
-ADD ./_output/bin/bundles/baremetal-agent /opt/yunion/bin/bundles/baremetal-agent

build/docker/Dockerfile.baremetal-base

@@ -1,39 +0,0 @@
-FROM frolvlad/alpine-glibc:glibc-2.28
-
-MAINTAINER "Yaoqi Wan <wanyaoqi@yunionyun.com>"
-
-RUN mkdir -p /opt/yunion/bin
-
-RUN apk update && \
-    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
-
-# 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
-COPY ./opt/cloud/yunion/baremetal/chain.c32 /opt/cloud/yunion/baremetal
-COPY ./opt/cloud/yunion/baremetal/initramfs /opt/cloud/yunion/baremetal
-COPY ./opt/cloud/yunion/baremetal/isolinux.bin /opt/cloud/yunion/baremetal
-COPY ./opt/cloud/yunion/baremetal/kernel /opt/cloud/yunion/baremetal
-COPY ./opt/cloud/yunion/baremetal/ldlinux.c32 /opt/cloud/yunion/baremetal
-COPY ./opt/cloud/yunion/baremetal/ldlinux.e32 /opt/cloud/yunion/baremetal
-COPY ./opt/cloud/yunion/baremetal/ldlinux.e64 /opt/cloud/yunion/baremetal
-COPY ./opt/cloud/yunion/baremetal/libcom32.c32 /opt/cloud/yunion/baremetal
-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

build/docker/Dockerfile.climc

@@ -1,5 +0,0 @@
-FROM registry.cn-beijing.aliyuncs.com/yunionio/climc-base:v20200308
-
-ADD ./build/climc/root/opt /opt
-
-ADD ./_output/bin/climc ./_output/bin/*cli /opt/yunion/bin/

build/docker/Dockerfile.climc-base

@@ -1,16 +0,0 @@
-FROM frolvlad/alpine-glibc:glibc-2.28
-
-MAINTAINER "Zexi Li <lizexi@yunionyun.com>"
-
-ENV TZ Asia/Shanghai
-
-RUN mkdir -p /opt/yunion/bin
-
-RUN apk add --no-cache bash bash-completion tzdata ca-certificates vim && \
-    rm -rf /var/cache/apk/*
-
-RUN cp /usr/share/zoneinfo/Asia/Shanghai /etc/localtime
-
-ENV PATH="/opt/yunion/bin:${PATH}"
-
-RUN mkdir -p /opt/yunion/bin

build/docker/Dockerfile.cloudevent

@@ -1,3 +0,0 @@
-FROM registry.cn-beijing.aliyuncs.com/yunionio/onecloud-base:v0.1
-
-ADD ./_output/bin/cloudevent /opt/yunion/bin/cloudevent

build/docker/Dockerfile.cloudid

@@ -1,3 +0,0 @@
-FROM registry.cn-beijing.aliyuncs.com/yunionio/onecloud-base:v0.1
-
-ADD ./_output/bin/cloudid /opt/yunion/bin/cloudid

build/docker/Dockerfile.cloudnet

@@ -1,3 +0,0 @@
-FROM registry.cn-beijing.aliyuncs.com/yunionio/onecloud-base:v0.1
-
-ADD ./_output/bin/cloudnet /opt/yunion/bin/cloudnet

build/docker/Dockerfile.devtool

@@ -1,3 +0,0 @@
-FROM registry.cn-beijing.aliyuncs.com/yunionio/onecloud-base:v0.1
-
-ADD ./_output/bin/devtool /opt/yunion/bin/devtool

build/docker/Dockerfile.esxi-agent

@@ -1,4 +0,0 @@
-FROM registry.cn-beijing.aliyuncs.com/yunionio/onecloud-base:v0.1
-
-COPY ./build/esxi-agent/root/opt/ /opt/
-ADD ./_output/bin/esxi-agent /opt/yunion/bin/esxi-agent

build/docker/Dockerfile.glance

@@ -1,6 +0,0 @@
-FROM registry.cn-beijing.aliyuncs.com/yunionio/glance-base:latest
-
-MAINTAINER "Zexi Li <lizexi@yunionyun.com>"
-
-RUN mkdir -p /opt/yunion/bin
-ADD ./_output/bin/glance /opt/yunion/bin/glance

build/docker/Dockerfile.glance-base

@@ -1,18 +0,0 @@
-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

build/docker/Dockerfile.host

@@ -1,9 +0,0 @@
-FROM registry.cn-beijing.aliyuncs.com/yunionio/host-base:v0.2.0
-
-MAINTAINER "Yaoqi Wan wanyaoqi@yunionyun.com"
-
-ENV TZ Asia/Shanghai
-
-RUN apk add librados librbd
-RUN mkdir -p /opt/yunion/bin
-ADD ./_output/alpine-build/bin/host /opt/yunion/bin/host

build/docker/Dockerfile.host-deployer

@@ -1,11 +0,0 @@
-FROM registry.cn-beijing.aliyuncs.com/yunionio/host-deployer-base:v0.0.3
-
-MAINTAINER "Yaoqi Wan wanyaoqi@yunionyun.com"
-
-ENV TZ Asia/Shanghai
-
-RUN mkdir -p /opt/yunion/bin
-
-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

build/docker/Dockerfile.keystone

@@ -1,3 +0,0 @@
-FROM registry.cn-beijing.aliyuncs.com/yunionio/onecloud-base:v0.1
-
-ADD ./_output/bin/keystone /opt/yunion/bin/keystone

build/docker/Dockerfile.logger

@@ -1,4 +0,0 @@
-FROM registry.cn-beijing.aliyuncs.com/yunionio/onecloud-base:v0.1
-
-ADD ./_output/bin/logger /opt/yunion/bin/logger
-

build/docker/Dockerfile.monitor

@@ -1,4 +0,0 @@
-FROM registry.cn-beijing.aliyuncs.com/yunionio/onecloud-base:v0.1
-
-ADD ./_output/bin/monitor /opt/yunion/bin/monitor
-

build/docker/Dockerfile.notify

@@ -1,4 +0,0 @@
-FROM registry.cn-beijing.aliyuncs.com/yunionio/onecloud-base:v0.1
-
-COPY ./build/notify/root/opt/ /opt/
-ADD ./_output/bin/notify /opt/yunion/bin/notify

build/docker/Dockerfile.onecloud-base

@@ -1,13 +0,0 @@
-FROM frolvlad/alpine-glibc:glibc-2.28
-
-MAINTAINER "Zexi Li <lizexi@yunionyun.com>"
-
-ENV TZ Asia/Shanghai
-
-RUN mkdir -p /opt/yunion/bin
-
-RUN apk update && \
-    apk add --no-cache tzdata curl busybox-extras tcpdump strace ca-certificates && \
-    rm -rf /var/cache/apk/*
-
-RUN cp /usr/share/zoneinfo/Asia/Shanghai /etc/localtime

build/docker/Dockerfile.region

@@ -1,4 +0,0 @@
-FROM registry.cn-beijing.aliyuncs.com/yunionio/onecloud-base:v0.1
-
-COPY ./build/region/root/opt/ /opt/
-ADD ./_output/bin/region /opt/yunion/bin/region

build/docker/Dockerfile.region-dns

@@ -1,4 +0,0 @@
-FROM alpine:3.11.3
-
-RUN mkdir -p /opt/yunion/bin
-ADD ./_output/alpine-build/bin/region-dns /opt/yunion/bin/region-dns

build/docker/Dockerfile.s3gateway

@@ -1,3 +0,0 @@
-FROM registry.cn-beijing.aliyuncs.com/yunionio/onecloud-base:v0.1
-
-ADD ./_output/bin/s3gateway /opt/yunion/bin/s3gateway

build/docker/Dockerfile.scheduler

@@ -1,3 +0,0 @@
-FROM registry.cn-beijing.aliyuncs.com/yunionio/onecloud-base:v0.1
-
-ADD ./_output/bin/scheduler /opt/yunion/bin/scheduler

build/docker/Dockerfile.vpcagent

@@ -1,6 +0,0 @@
-FROM registry.cn-beijing.aliyuncs.com/yunionio/openvswitch:2.10.4-0
-
-MAINTAINER "Yousong Zhou <zhouyousong@yunion.cn>"
-
-RUN mkdir -p /opt/yunion/bin
-ADD ./_output/alpine-build/bin/vpcagent /opt/yunion/bin/vpcagent

build/docker/Dockerfile.webconsole

@@ -1,3 +0,0 @@
-FROM registry.cn-beijing.aliyuncs.com/yunionio/webconsole-base:latest
-
-ADD ./_output/bin/webconsole /opt/yunion/bin/webconsole

build/docker/Dockerfile.webconsole-base

@@ -1,12 +0,0 @@
-FROM yunion/kubectl:1.14.3
-
-MAINTAINER "Zexi Li <lizexi@yunionyun.com>"
-
-ENV TZ Asia/Shanghai
-
-RUN mkdir -p /opt/yunion/bin
-
-RUN apk add --no-cache sshpass ipmitool openssh-client tzdata ca-certificates && \
-    rm -rf /var/cache/apk/*
-
-RUN cp /usr/share/zoneinfo/Asia/Shanghai /etc/localtime

build/docker/Dockerfile.yunionconf

@@ -1,4 +0,0 @@
-FROM registry.cn-beijing.aliyuncs.com/yunionio/onecloud-base:v0.1
-
-ADD ./_output/bin/yunionconf /opt/yunion/bin/yunionconf
-

build/docker_build.sh

@@ -0,0 +1,18 @@
+#!/bin/bash
+
+set -o errexit
+set -o nounset
+set -o pipefail
+
+SRC_ROOT=$(realpath $(dirname "${BASH_SOURCE[0]}")/..)
+BIN_DIR=$SRC_ROOT/_output/bin
+WORK_DIR="/go/src/yunion.io/x/onecloud"
+
+docker run --rm -it \
+    -w $WORK_DIR \
+    -v $SRC_ROOT:$WORK_DIR \
+    d3lx/golang:yunion \
+    make
+
+echo "Build finish"
+ls -alh $BIN_DIR

build/esxi-agent/root/opt/yunion/share/vmware/ovf.xml

@@ -1,65 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<Envelope xmlns="http://schemas.dmtf.org/ovf/envelope/1"
-          xmlns:ovf="http://schemas.dmtf.org/ovf/envelope/1"
-          xmlns:cim="http://schemas.dmtf.org/wbem/wscim/1/common"
-          xmlns:rasd="http://schemas.dmtf.org/wbem/wscim/1/cim-schema/2/CIM_ResourceAllocationSettingData"
-          xmlns:vmw="http://www.vmware.com/schema/ovf"
-          xmlns:vssd="http://schemas.dmtf.org/wbem/wscim/1/cim-schema/2/CIM_VirtualSystemSettingData"
-          xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-  <References>
-    <File ovf:href="{{ .Name }}" ovf:id="file1" ovf:size="{{ .Size }}"/>
-  </References>
-  <DiskSection>
-    <Info>Virtual disk information</Info>
-    <Disk ovf:capacity="{{ .Capacity }}" ovf:capacityAllocationUnits="byte" ovf:diskId="vmdisk1" ovf:fileRef="file1" ovf:format="http://www.vmware.com/interfaces/specifications/vmdk.html#streamOptimized" ovf:populatedSize="0"/>
-  </DiskSection>
-  <VirtualSystem ovf:id="{{ .ImportName }}">
-    <Info>A virtual machine</Info>
-    <Name>{{ .ImportName }}</Name>
-    <OperatingSystemSection ovf:id="100" vmw:osType="other26xLinux64Guest">
-      <Info>The kind of installed guest operating system</Info>
-    </OperatingSystemSection>
-    <VirtualHardwareSection>
-      <Info>Virtual hardware requirements</Info>
-      <System>
-        <vssd:ElementName>Virtual Hardware Family</vssd:ElementName>
-        <vssd:InstanceID>0</vssd:InstanceID>
-        <vssd:VirtualSystemIdentifier>{{ .ImportName }}</vssd:VirtualSystemIdentifier>
-        <vssd:VirtualSystemType>vmx-07</vssd:VirtualSystemType>
-      </System>
-      <Item>
-        <rasd:AllocationUnits>hertz * 10^6</rasd:AllocationUnits>
-        <rasd:Description>Number of Virtual CPUs</rasd:Description>
-        <rasd:ElementName>1 virtual CPU(s)</rasd:ElementName>
-        <rasd:InstanceID>1</rasd:InstanceID>
-        <rasd:ResourceType>3</rasd:ResourceType>
-        <rasd:VirtualQuantity>1</rasd:VirtualQuantity>
-      </Item>
-      <Item>
-        <rasd:AllocationUnits>byte * 2^20</rasd:AllocationUnits>
-        <rasd:Description>Memory Size</rasd:Description>
-        <rasd:ElementName>1024MB of memory</rasd:ElementName>
-        <rasd:InstanceID>2</rasd:InstanceID>
-        <rasd:ResourceType>4</rasd:ResourceType>
-        <rasd:VirtualQuantity>1024</rasd:VirtualQuantity>
-      </Item>
-      <Item>
-        <rasd:Address>0</rasd:Address>
-        <rasd:Description>SCSI Controller</rasd:Description>
-        <rasd:ElementName>SCSI Controller 0</rasd:ElementName>
-        <rasd:InstanceID>3</rasd:InstanceID>
-        <rasd:ResourceSubType>VirtualSCSI</rasd:ResourceSubType>
-        <rasd:ResourceType>6</rasd:ResourceType>
-      </Item>
-      <Item>
-        <rasd:AddressOnParent>0</rasd:AddressOnParent>
-        <rasd:ElementName>Hard Disk 1</rasd:ElementName>
-        <rasd:HostResource>ovf:/disk/vmdisk1</rasd:HostResource>
-        <rasd:InstanceID>9</rasd:InstanceID>
-        <rasd:Parent>3</rasd:Parent>
-        <rasd:ResourceType>17</rasd:ResourceType>
-        <vmw:Config ovf:required="false" vmw:key="backing.writeThrough" vmw:value="false"/>
-      </Item>
-    </VirtualHardwareSection>
-  </VirtualSystem>
-</Envelope>

build/esxi-agent/vars

@@ -1,2 +0,0 @@
-DESCRIPTION="Esxi Agent"
-# SERVICE="yes"

build/executor-server/root/usr/lib/systemd/system/yunion-executor.service

@@ -1,18 +0,0 @@
-[Unit]
-Description=Yunion Command Executor
-Documentation=https://docs.yunion.cn
-
-[Service]
-Type=simple
-User=root
-Group=root
-ExecStart=/opt/yunion/bin/executor-server
-WorkingDirectory=/opt/yunion/bin
-KillMode=process
-Restart=always
-RestartSec=30
-LimitNOFILE=500000
-LimitNPROC=500000
-
-[Install]
-WantedBy=multi-user.target

build/executor-server/vars

@@ -1,2 +0,0 @@
-DESCRIPTION="Yunion Executor Server Command Line Utility"
-SERVICE="yes"

build/glance/root/opt/yunion/share/notify_templates/image/content/IMAGE_ACTIVED

@@ -1 +0,0 @@
-您的{{ .os_type }}镜像{{ .name }}上传成功

build/glance/root/opt/yunion/share/notify_templates/image/title/IMAGE_ACTIVED

@@ -1 +0,0 @@
-镜像{{ .name }}上传成功

build/host-deployer/root/usr/lib/systemd/system/yunion-host-deployer.service

@@ -1,19 +0,0 @@
-[Unit]
-Description=Yunion Host Deploy Agent
-Documentation=https://docs.yunion.cn
-After=network.target httpd.service
-
-[Service]
-Type=simple
-User=root
-Group=root
-ExecStart=/opt/yunion/bin/host-deployer --conf /etc/yunion/host.conf
-WorkingDirectory=/opt/yunion/bin
-KillMode=process
-Restart=always
-RestartSec=30
-LimitNOFILE=500000
-LimitNPROC=500000
-
-[Install]
-WantedBy=multi-user.target

build/host-deployer/vars

@@ -1,2 +0,0 @@
-DESCRIPTION="Yunion Host Deploy Agent"
-SERVICE="yes"

build/host-image/root/usr/lib/systemd/system/yunion-host-image.service

@@ -1,19 +0,0 @@
-[Unit]
-Description=Yunion Host Image Server
-Documentation=https://docs.yunion.cn
-After=network.target
-
-[Service]
-Type=simple
-User=root
-Group=root
-ExecStart=/opt/yunion/bin/host-image --conf /etc/yunion/host.conf
-WorkingDirectory=/opt/yunion/bin
-KillMode=process
-Restart=always
-RestartSec=30
-LimitNOFILE=500000
-LimitNPROC=500000
-
-[Install]
-WantedBy=multi-user.target

build/host-image/vars

@@ -1,2 +0,0 @@
-DESCRIPTION="Yunion Host Image Server"
-SERVICE="yes"

build/host/root/usr/lib/systemd/system/yunion-host.service

@@ -1,21 +0,0 @@
-[Unit]
-Description=Yunion Cloud Host Agent server
-Documentation=https://docs.yunion.cn
-After=network-online.target
-Wants=network-online.target
-After=network.target yunion-host-deployer.service
-
-[Service]
-Type=simple
-User=root
-Group=root
-ExecStart=/opt/yunion/bin/host --config /etc/yunion/host.conf
-WorkingDirectory=/opt/yunion/bin
-KillMode=process
-Restart=always
-RestartSec=30
-LimitNOFILE=500000
-LimitNPROC=500000
-
-[Install]
-WantedBy=multi-user.target

build/host/vars

@@ -1,2 +1 @@
-DESCRIPTION="Yunion Host Command Line Utility"
-SERVICE="yes"
+DESCRIPTION="Yunion Host Command Line Utility"

build/keystone/vars

@@ -1 +0,0 @@
-DESCRIPTION="Yunion Cloud Keystone Identity server"

build/ldapcli/vars

@@ -1 +0,0 @@
-DESCRIPTION="LDAP Command Line Utility"

build/notify/root/opt/yunion/share/template/content/IMAGE_ACTIVED

@@ -1 +0,0 @@
-{{.os_type}} 镜像 {{.name}} 上传完成

build/notify/root/opt/yunion/share/template/content/VERIFY.email

@@ -1,66 +0,0 @@
-<!DOCTYPE html>
-<html lang="en">
-<head>
-  <meta charset="UTF-8">
-  <title>Document</title>
-</head>
-<body>
-  <table style="width: 650px; margin-bottom: 20px;" border="0" cellpadding="0" cellspacing="0" align="center">
-  	<tr style="height: 50px; background: #333; overflow: hidden;">
-  		<td>
-  			<table style="margin-left: 20px;">
-  				<tr>
-  					<td>
-  						<img src="data:{{.login_logo_format}};base64,{{.login_logo}}" alt="" style="color: #fff; height: 32px; vertical-align: middle;">
-  					</td>
-  				</tr>
-  			</table>
-  		</td>
-  		<td>
-  			<table style="float: right;">
-  				<tr>
-  					<td style="padding-left: 20px; padding-right: 20px;">
-  						<a href="" style="text-decoration: none; color: #20A0FF; font-size: 12px; display: none;">产品</a>
-  					</td>
-  					<td style="padding-left: 20px; padding-right: 20px;">
-  						<a href="" style="text-decoration: none; color: #20A0FF; font-size: 12px; display: none;">解决方案</a>
-  					</td>
-  					<td style="padding-left: 20px; padding-right: 20px;">
-  						<a href="" style="text-decoration: none; color: #20A0FF; font-size: 12px; display: none;">服务</a>
-  					</td>
-  					<td style="padding-left: 20px; padding-right: 20px;">
-  						<a href="" style="text-decoration: none; color: #20A0FF; font-size: 12px; display: none;">帮助与文档</a>
-  					</td>
-  					<td style="padding-left: 20px; padding-right: 20px;">
-  						<a href="" style="text-decoration: none; color: #20A0FF; font-size: 12px; display: none;">关于我们</a>
-  					</td>
-  				</tr>
-  			</table>
-  		</td>
-  	</tr>
-  	<tr>
-  		<td style="width: 100%;" colspan="2">
-  			<table style="padding: 20px 10px; width: 100%;">
-	  			<tr>
-	  				<td style="padding-bottom: 20px;">
-                        尊敬的{{.name}}，您好：
-	  				</td>
-	  			</tr>
-	  			<tr>
-	  				<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;">*为了确保您的帐号安全，该链接仅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>
-	</tr>
-  </table>
-</body>
-</html>

build/notify/root/opt/yunion/share/template/title/IMAGE_ACTIVED

@@ -1 +0,0 @@
-镜像 {{.name}} 上传完成

build/notify/root/opt/yunion/share/template/title/VERIFY.email

@@ -1 +0,0 @@
-Yunion Verify

build/notify/vars

@@ -1,2 +0,0 @@
-DESCRIPTION="Yunion Cloud noitfy Service"
-

build/region/root/opt/yunion/share/notify_templates/compute/content/SERVER_CHANGE_FLAVOR

@@ -1 +1 @@
-您的{{ .brand }}主机{{ .name }}的套餐类型已经更改为 CPU:{{ index .flavor_info "cpu" }}核，内存:{{ index .flavor_info "memory" }}M，数据盘:{{ index .flavor_info "datadisk" }}G，带宽: {{ index .flavor_info "ebw" }}M。
+您的{{ .hypervisor }}主机{{ .name }}的套餐类型已经更改为 CPU:{{ index .flavor_info "cpu" }}核，内存:{{ index .flavor_info "memory" }}M，数据盘:{{ index .flavor_info "datadisk" }}G，带宽: {{ index .flavor_info "ebw" }}M。

build/region/root/opt/yunion/share/notify_templates/compute/content/SERVER_CREATED

@@ -1 +1 @@
-您的{{ .brand }}主机{{ .name }}已经创建成功，服务器IP地址为{{ .ips }}，{{ if .account }}初始帐号为{{ .account }}，{{ end }}{{ if .keypair }}访问ssh密钥为{{ .keypair }}，{{ end }}{{ if .password }}初始密码为{{ .password }}，{{ end }}请使用{{ if .windows }}远程桌面连接器(RDC){{ else }}SSH{{ end }}或控制面板控制台访问云主机。
+您的{{ .hypervisor }}主机{{ .name }}已经创建成功，服务器IP地址为{{ .ips }}，{{ if .account }}初始帐号为{{ .account }}，{{ end }}{{ if .keypair }}访问ssh密钥为{{ .keypair }}，{{ end }}{{ if .password }}初始密码为{{ .password }}，{{ end }}请使用{{ if .windows }}远程桌面连接器(RDC){{ else }}SSH{{ end }}或控制面板控制台访问云主机。

build/region/root/opt/yunion/share/notify_templates/compute/content/SERVER_CREATED_ADMIN

@@ -1 +1 @@
-项目{{ .tenant }}的{{ .brand }}主机{{ .name }}已经创建成功。
+项目{{ .tenant }}的{{ .hypervisor }}主机{{ .name }}已经创建成功。

build/region/root/opt/yunion/share/notify_templates/compute/content/SERVER_DELETED

@@ -1 +1 @@
-您的{{ .brand }}主机{{ .name }}已经删除。
+您的{{ .hypervisor }}主机{{ .name }}已经删除。

build/region/root/opt/yunion/share/notify_templates/compute/content/SERVER_DELETED_ADMIN

@@ -1 +1 @@
-项目{{ .tenant }}的{{ .brand }}主机{{ .name }}已经删除。
+项目{{ .tenant }}的{{ .hypervisor }}主机{{ .name }}已经删除。

build/region/root/opt/yunion/share/notify_templates/compute/content/SERVER_PANICKED

@@ -1 +0,0 @@
-您的{{ .brand }}主机{{ .name }}系统崩溃了: {{ .reason }}

build/region/root/opt/yunion/share/notify_templates/compute/content/SERVER_REBUILD_ROOT

@@ -1 +1 @@
-您的{{ .brand }}主机{{ .name }}重装系统成功，{{ if .account }}初始帐号为{{ .account }}，{{ end }}{{ if .keypair }}访问密钥为{{ .keypair }}，{{ end }}{{ if .password }}初始密码为{{ .password }}，{{ end }}请使用{{ if .windows }}远程桌面连接器(RDC){{ else }}SSH{{ end }}或控制面板控制台访问云主机。
+您的{{ .hypervisor }}主机{{ .name }}重装系统成功，{{ if .account }}初始帐号为{{ .account }}，{{ end }}{{ if .keypair }}访问密钥为{{ .keypair }}，{{ end }}{{ if .password }}初始密码为{{ .password }}，{{ end }}请使用{{ if .windows }}远程桌面连接器(RDC){{ else }}SSH{{ end }}或控制面板控制台访问云主机。

build/region/root/opt/yunion/share/notify_templates/compute/title/SERVER_CHANGE_FLAVOR

@@ -1 +1 @@
-您的{{ .brand }}主机{{ .name }}的套餐类型已经更改为 CPU:{{ index .flavor_info "cpu" }}核，内存:{{ index .flavor_info "memory" }}M，数据盘:{{ index .flavor_info "datadisk" }}G，带宽: {{ index .flavor_info "ebw" }}M。
+您的{{ .hypervisor }}主机{{ .name }}的套餐类型已经更改为 CPU:{{ index .flavor_info "cpu" }}核，内存:{{ index .flavor_info "memory" }}M，数据盘:{{ index .flavor_info "datadisk" }}G，带宽: {{ index .flavor_info "ebw" }}M。

build/region/root/opt/yunion/share/notify_templates/compute/title/SERVER_CREATED

@@ -1 +1 @@
-{{ .brand }}主机{{ .Name }}创建成功
+{{ .hypervisor }}主机{{ .Name }}创建成功

build/region/root/opt/yunion/share/notify_templates/compute/title/SERVER_CREATED_ADMIN

@@ -1 +1 @@
-项目{{ .tenant }}的{{ .brand }}主机{{ .name }}已经创建成功
+项目{{ .tenant }}的{{ .hypervisor }}主机{{ .name }}已经创建成功