build:v1.5.1

fit2cloud · Sep 28, 2021 · b49916b · b49916b
2 parents 08c41bd + fa59202
commit b49916b
Show file tree

Hide file tree

Showing 9 changed files with 101 additions and 11 deletions.
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -49,20 +49,18 @@ jobs:
             ```
 
             ## 新增功能
-            - 支持 自定义 KS，iPXE 装机
-            - 自定义品牌
-            - 镜像支持后台挂载
-
-            ## 功能优化
-            - 重写 DHCP-PROXY 服务减小离线包体积
+             - Huawei 2288H V3 V5 RAID
 
             ## 问题修复
-            - 修复了一些已知问题
+             - 浪潮M5 删除与创建 RAID 失败
+             - CentOS 装机指定脚本安装 ip 指定失效
+             - IDRAC6 远程 kvm 报错
+             - 更新删除镜像报错
 
             # 产品文档
-            点击 [完整文档](https://rackshift.io) 查看完整的安装和使用文档
+             点击 [完整文档](https://rackshift.io) 查看完整的安装和使用文档
             # 离线安装包
-            [离线安装包下载地址](https://community.fit2cloud.com/#/download/rackshift/v1-5-0)
+             - [离线安装包下载地址](https://community.fit2cloud.com/#/download/rackshift/v1-5-1)
 
       - name: Upload Release Asset
         id: upload-release-asset

diff --git a/...inspurm5-metal-plugin/src/main/java/io/rackshift/plugin/inspur/InspurM5MetalProvider.java b/...inspurm5-metal-plugin/src/main/java/io/rackshift/plugin/inspur/InspurM5MetalProvider.java
@@ -55,6 +55,7 @@ public InspurM5MetalProvider() {
     public List<String> getSupportedBrands() {
         return new ArrayList<String>() {{
             add("Inspur");
+            add("Huawei");
         }};
     }
 
@@ -66,6 +67,8 @@ public List<String> getSupportedModels() {
             add("Inspur NF5270M5");
             add("Inspur NF5266M5");
             add("Inspur NF8480M5");
+            add("Huawei RH2288H V3");
+            add("Huawei 2288H V5");
         }};
     }
 

diff --git a/rackshift-server/src/main/resources/db/migration/V37__fix_centos_ks.sql b/rackshift-server/src/main/resources/db/migration/V37__fix_centos_ks.sql
diff --git a/rackshift-server/src/main/resources/db/migration/V38__addhuaweiraid.sql b/rackshift-server/src/main/resources/db/migration/V38__addhuaweiraid.sql
@@ -0,0 +1,66 @@
+insert into workflow
+values (uuid(),
+        'system',
+        'Graph.Quanta.storcli.Catalog',
+        '搜集 Huawei 服务器磁盘 Raid 信息',
+        'POST_OTHER_WORKFLOW_START',
+        '[\'Huawei\']',
+        'false',
+        '{
+  "bootstrap-rancher": {
+    "dockerFile": "secure.erase.docker.tar.xz"
+  }
+}',
+        'enable',
+        now());
+
+insert into workflow
+values (uuid(),
+        'system',
+        'Graph.Raid.Delete.MegaRAID',
+        '清空 Huawei 服务器磁盘 Raid 信息',
+        'POST_OTHER_WORKFLOW_START',
+        '[\'Huawei\']',
+        'false',
+        '{
+  "bootstrap-rancher": {
+    "dockerFile": "secure.erase.docker.tar.xz"
+  }
+}',
+        'enable',
+        now());
+
+insert into workflow
+values (uuid(),
+        'system',
+        'Graph.Raid.Create.PercRAID',
+        '创建 Huawei 服务器磁盘 Raid 虚拟磁盘',
+        'POST_OTHER_WORKFLOW_START',
+        '[\'Huawei\']',
+        'true',
+        '{
+  "options": {
+    "bootstrap-rancher": {
+      "dockerFile": "secure.erase.docker.tar.xz"
+    },
+    "create-raid": {
+      "createDefault": false,
+      "controller": 0,
+      "path": "/opt/MegaRAID/storcli/storcli64",
+      "raidList": [
+        {
+          "enclosure": 32,
+          "type": "raid5",
+          "drives": [
+            0,
+            1,
+            2
+          ],
+          "name": "VD0"
+        }
+      ]
+    }
+  }
+}',
+        'enable',
+        now());
diff --git a/rackshift-server/src/main/resources/db/migration/V39__fixidrac6java.sql b/rackshift-server/src/main/resources/db/migration/V39__fixidrac6java.sql
@@ -0,0 +1,3 @@
+update system_parameter
+set param_value = 'registry.cn-qingdao.aliyuncs.com/x-lab/kvm:v1.5.1'
+where param_key = 'kvm.image';
diff --git a/rackshift-web/src/common/about/AboutUs.vue b/rackshift-web/src/common/about/AboutUs.vue
@@ -47,7 +47,7 @@ export default {
       dialogVisible: false,
       githubUrl: 'https://github.com/rackshift/rackshift',
       websiteUrl: 'https://rackshift.io',
-      version: 'Release v1.5.0'
+      version: 'Release v1.5.1'
     }
   },
   created() {

diff --git a/rackshift-web/src/rackparams/Graph.InstallCentOS.vue b/rackshift-web/src/rackparams/Graph.InstallCentOS.vue
@@ -498,6 +498,7 @@ export default {
       }
       if (customPXE)
         this.$message.info(this.$t("not_support_validate"));
+      this.payLoad.options.defaults.repo = url;
     },
     receiveValue(val) {
       this.payLoad.options.defaults.postInstallCommands = val;
@@ -767,9 +768,13 @@ export default {
             this.payLoad.options.defaults.repo = centosImage.url;
             if (centosImage.pName) {
               this.payLoad.options.defaults.profile = centosImage.pName;
+            } else {
+              delete this.payLoad.options.defaults.profile;
             }
             if (centosImage.tName) {
               this.payLoad.options.defaults.installScript = centosImage.tName;
+            } else {
+              delete this.payLoad.options.defaults.installScript;
             }
             if (centosImage.pName || centosImage.tName) {
               this.$message.info(this.$t("not_support_validate"));

diff --git a/rackshift-web/src/rackparams/Graph.InstallRHEL.vue b/rackshift-web/src/rackparams/Graph.InstallRHEL.vue
@@ -498,6 +498,7 @@ export default {
       }
       if (customPXE)
         this.$message.info(this.$t("not_support_validate"));
+      this.payLoad.options.defaults.repo = url;
     },
     receiveValue(val) {
       this.payLoad.options.defaults.postInstallCommands = val;
@@ -767,9 +768,13 @@ export default {
             this.payLoad.options.defaults.repo = centosImage.url;
             if (centosImage.pName) {
               this.payLoad.options.defaults.profile = centosImage.pName;
+            } else {
+              delete this.payLoad.options.defaults.profile;
             }
             if (centosImage.tName) {
               this.payLoad.options.defaults.installScript = centosImage.tName;
+            } else {
+              delete this.payLoad.options.defaults.installScript;
             }
             if (centosImage.pName || centosImage.tName) {
               this.$message.info(this.$t("not_support_validate"));

diff --git a/rackshift-web/src/rackparams/Graph.Raid.Create.PercRAID.vue b/rackshift-web/src/rackparams/Graph.Raid.Create.PercRAID.vue
@@ -62,6 +62,7 @@ export default {
   },
   data() {
     return {
+      enclosure: 32,
       defaultPayLoad: {
         "options": {
           "bootstrap-rancher": {
@@ -126,7 +127,7 @@ export default {
     addRaid() {
       this.payLoad.options['create-raid'].raidList.push(
           {
-            "enclosure": 32,
+            "enclosure": this.enclosure,
             "type": null,
             "drives": [],
             "name": "VD" + this.payLoad.options['create-raid'].raidList.length
@@ -257,6 +258,14 @@ export default {
         }
         this.disks = res.data.disks;
         this.nics = res.data.nics;
+        if (this.disks && this.disks.length > 0) {
+          this.enclosure = this.disks[0].enclosureId;
+          if (this.payLoad.options['create-raid'].raidList.length > 0) {
+            _.forEach(this.payLoad.options['create-raid'].raidList, r => {
+              r.enclosure = this.disks[0].enclosureId;
+            })
+          }
+        }
       })
     }
     ,