环境代码变更

README.md

-# 088ab5-vmware-software
-
-
-
-## Getting started
-
-To make it easy for you to get started with GitLab, here's a list of recommended next steps.
-
-Already a pro? Just edit this README.md and make it your own. Want to make it easy? [Use the template at the bottom](#editing-this-readme)!
-
-## Add your files
-
-- [ ] [Create](https://docs.gitlab.com/ee/user/project/repository/web_editor.html#create-a-file) or [upload](https://docs.gitlab.com/ee/user/project/repository/web_editor.html#upload-a-file) files
-- [ ] [Add files using the command line](https://docs.gitlab.com/ee/gitlab-basics/add-file.html#add-a-file-using-the-command-line) or push an existing Git repository with the following command:
-
+# Module 介绍:
+该 Module 定义创建 混合私有云，如Vmware、Fusioncloud（华为私有云）、FusionCompute（华为虚拟化）、H3C、青云、阿里专有云等虚拟机模板。
+
+# 版本特性：
+支持自定义虚拟机规格  
+支持 RHEL/CentOS/Kylin 虚拟机创建  
+支持自定义数据盘大小
+
+# Vmware配置参考
+配置以下参数用于正常供给您的基础设施资源：
+- `idc_code` - (必填) 数据中心
+- `datastore` -（必填）数据存储
+- `resource_pool` - （必填）资源池
+- `network` - （必填）网络
+- `image` - （必填）操作系统
+- `data_disk_size_gb` - （必填）数据盘大小列表
+- `ips` - （必填）虚拟机ip地址
+- `netmask` - （必填）子网掩码
+- `gateway` - （必填）网关
+- `dns_server` - （必填）DNS域名解析
+- `data_disk_label` - （可选）数据盘标签
+- `thin_provisioned` - （可选）数据磁盘是否精简
+- `eagerly_scrub` - （可选）数据磁盘空间是否清零
+- `scsi_controller` - （可选）系统磁盘控制器
+- `data_disk_scsi_controller` - （可选）数据磁盘控制器
+- `domain` - （可选）主机域
+- `cpu` - （可选）虚拟机CPU配置
+- `memory` - （可选）虚拟机内存配置，单位MB
+- `disk_label` - （可选）系统盘标签
+- `instance_name` - （可选）主机名称
+- `instance_number` - （可选）创建实例数量
+
+只要设置了上述变量赋值，您应该可以使用 vSphere 6.5、6.7、7.0 环境进行虚拟机创建。
+
+Vmware使用示例：
 ```
-cd existing_repo
-git remote add origin https://gitlab.yun.shop/eos-test/088ab5-vmware-software.git
-git branch -M master
-git push -uf origin master
+module "vmware" {
+  source = "../base-module/terraform-vmware-vm"
+  idc_code                   = "请填写您的数据中心"
+  datastore                  = "请填写您的存储名称"
+  disk_label                 = ["disk0"]
+  scsi_controller            = 0
+  data_disk_scsi_controller  = []
+  data_disk_label            = []
+  data_disk_size_gb          = [10]
+  thin_provisioned           = null
+  eagerly_scrub              = null
+  domain                     = "test.internal"
+  instance_name              = "default-01"
+  image                      = "请填写您的虚拟机模板"
+  ips                        = "请填写您的虚拟机IP"
+  dns_server                 = "请填写您的DNS服务器地址"
+  netmask                    = "255.255.0.0"
+  gateway                    = "请填写您的网关"
+  cpu                        = 2
+  memory                     = 4096
+  network                    = var.network
+  resource_pool              = "请填写您的资源池名称"
+  instance_number            = 1
+}
 ```
 
-## Integrate with your tools
-
-- [ ] [Set up project integrations](https://gitlab.yun.shop/eos-test/088ab5-vmware-software/-/settings/integrations)
-
-## Collaborate with your team
-
-- [ ] [Invite team members and collaborators](https://docs.gitlab.com/ee/user/project/members/)
-- [ ] [Create a new merge request](https://docs.gitlab.com/ee/user/project/merge_requests/creating_merge_requests.html)
-- [ ] [Automatically close issues from merge requests](https://docs.gitlab.com/ee/user/project/issues/managing_issues.html#closing-issues-automatically)
-- [ ] [Enable merge request approvals](https://docs.gitlab.com/ee/user/project/merge_requests/approvals/)
-- [ ] [Automatically merge when pipeline succeeds](https://docs.gitlab.com/ee/user/project/merge_requests/merge_when_pipeline_succeeds.html)
-
-## Test and Deploy
-
-Use the built-in continuous integration in GitLab.
-
-- [ ] [Get started with GitLab CI/CD](https://docs.gitlab.com/ee/ci/quick_start/index.html)
-- [ ] [Analyze your code for known vulnerabilities with Static Application Security Testing(SAST)](https://docs.gitlab.com/ee/user/application_security/sast/)
-- [ ] [Deploy to Kubernetes, Amazon EC2, or Amazon ECS using Auto Deploy](https://docs.gitlab.com/ee/topics/autodevops/requirements.html)
-- [ ] [Use pull-based deployments for improved Kubernetes management](https://docs.gitlab.com/ee/user/clusters/agent/)
-- [ ] [Set up protected environments](https://docs.gitlab.com/ee/ci/environments/protected_environments.html)
-
-***
-
-# Editing this README
-
-When you're ready to make this README your own, just edit this file and use the handy template below (or feel free to structure it however you want - this is just a starting point!). Thank you to [makeareadme.com](https://www.makeareadme.com/) for this template.
-
-## Suggestions for a good README
-Every project is different, so consider which of these sections apply to yours. The sections used in the template are suggestions for most open source projects. Also keep in mind that while a README can be too long and detailed, too long is better than too short. If you think your README is too long, consider utilizing another form of documentation rather than cutting out information.
-
-## Name
-Choose a self-explaining name for your project.
-
-## Description
-Let people know what your project can do specifically. Provide context and add a link to any reference visitors might be unfamiliar with. A list of Features or a Background subsection can also be added here. If there are alternatives to your project, this is a good place to list differentiating factors.
-
-## Badges
-On some READMEs, you may see small images that convey metadata, such as whether or not all the tests are passing for the project. You can use Shields to add some to your README. Many services also have instructions for adding a badge.
-
-## Visuals
-Depending on what you are making, it can be a good idea to include screenshots or even a video (you'll frequently see GIFs rather than actual videos). Tools like ttygif can help, but check out Asciinema for a more sophisticated method.
-
-## Installation
-Within a particular ecosystem, there may be a common way of installing things, such as using Yarn, NuGet, or Homebrew. However, consider the possibility that whoever is reading your README is a novice and would like more guidance. Listing specific steps helps remove ambiguity and gets people to using your project as quickly as possible. If it only runs in a specific context like a particular programming language version or operating system or has dependencies that have to be installed manually, also add a Requirements subsection.
-
-## Usage
-Use examples liberally, and show the expected output if you can. It's helpful to have inline the smallest example of usage that you can demonstrate, while providing links to more sophisticated examples if they are too long to reasonably include in the README.
-
-## Support
-Tell people where they can go to for help. It can be any combination of an issue tracker, a chat room, an email address, etc.
-
-## Roadmap
-If you have ideas for releases in the future, it is a good idea to list them in the README.
-
-## Contributing
-State if you are open to contributions and what your requirements are for accepting them.
-
-For people who want to make changes to your project, it's helpful to have some documentation on how to get started. Perhaps there is a script that they should run or some environment variables that they need to set. Make these steps explicit. These instructions could also be useful to your future self.
-
-You can also document commands to lint the code or run tests. These steps help to ensure high code quality and reduce the likelihood that the changes inadvertently break something. Having instructions for running tests is especially helpful if it requires external setup, such as starting a Selenium server for testing in a browser.
-
-## Authors and acknowledgment
-Show your appreciation to those who have contributed to the project.
-
-## License
-For open source projects, say how it is licensed.
-
-## Project status
-If you have run out of energy or time for your project, put a note at the top of the README saying that development has slowed down or stopped completely. Someone may choose to fork your project or volunteer to step in as a maintainer or owner, allowing your project to keep going. You can also make an explicit request for maintainers.
+# 软件安装说明
+## 混合私有云软件Tomcat模块
+支持RHEL7.X/Ubuntu/KylinV10操作系统安装和配置Tomcat服务器(8.x.x、9.x.x版本)
+```
+## Role 变量
+- `software_ip`: 介质服务器ip
+- `jdk_software_path`: jdk软件包路径
+- `jdk_version`: jdk版本
+- `jdk_install_path`: jdk安装路径
+- `jdk_software_name`: jdk软件包名称
+- `tomcat_software_path`: tomcat软件包路径
+- `tomcat_version`: tomcat版本
+- `tomcat_install_path`: tomcat安装路径
+- `tomcat_software_name`: tomcat软件包名称
+- `tomcat_service_port`: tomcat服务端口
+- `tomcat_jvm_min_num`: JVM最小堆栈数(tomcat)
+- `tomcat_jvm_max_num`: JVM最大堆栈数(tomcat)
+- `wait_connection_timeout`: 等待超时连接时间
+
+```
\ No newline at end of file

main.tf

+# cpg环境层
+module "vm_resource" {
+      source = "git::http://gitlab.idcos.com/terraform-modules/terraform-hybridprivatecloud-software-base.git//modules/folder?ref=v2.0.2"
+      name = "mock_${random_string.random.result}"
+}
+resource "random_string" "random" {
+      length           = 8
+      special          = false
+}
+
+#非cpg环境层
+#locals{
+#    vmware_keys = sort(keys(var.instance_list.vmware))
+#}
+#vmware实例执行参数
+#module "instance_vmware" {
+#      source            = "git::http://gitlab.idcos.com/terraform-modules/terraform-hybridprivatecloud-software-base.git//vmware/modules/instance?ref=v1.2.2"
+#      count = length(local.vmware_keys)
+#      idc_code                  = var.instance_list.vmware[local.vmware_keys[count.index]].idc_code
+#      datastore                 = var.instance_list.vmware[local.vmware_keys[count.index]].datastore
+#      disk_label                = var.instance_list.vmware[local.vmware_keys[count.index]].disk_label
+#      scsi_controller           = var.instance_list.vmware[local.vmware_keys[count.index]].scsi_controller
+#      data_disk_scsi_controller = var.instance_list.vmware[local.vmware_keys[count.index]].data_disk_scsi_controller
+#      data_disk_label           = var.instance_list.vmware[local.vmware_keys[count.index]].data_disk_label
+#      vmware_data_disk_gb       = var.instance_list.vmware[local.vmware_keys[count.index]].vmware_data_disk_gb
+#      thin_provisioned          = var.instance_list.vmware[local.vmware_keys[count.index]].thin_provisioned
+#      eagerly_scrub             = var.instance_list.vmware[local.vmware_keys[count.index]].eagerly_scrub
+#      domain                    = var.instance_list.vmware[local.vmware_keys[count.index]].domain
+#      vmware_names              = var.instance_list.vmware[local.vmware_keys[count.index]].vmware_names
+#      vmware_os                 = var.instance_list.vmware[local.vmware_keys[count.index]].vmware_os
+#      vmware_ips                = var.instance_list.vmware[local.vmware_keys[count.index]].vmware_ips
+#      dns_server                = var.instance_list.vmware[local.vmware_keys[count.index]].dns_server
+#      netmask                   = var.instance_list.vmware[local.vmware_keys[count.index]].netmask
+#      gateway                   = var.instance_list.vmware[local.vmware_keys[count.index]].gateway
+#      vmware_cpu                = var.instance_list.vmware[local.vmware_keys[count.index]].vmware_cpu
+#      vmware_memory             = var.instance_list.vmware[local.vmware_keys[count.index]].vmware_memory
+#      network                   = var.instance_list.vmware[local.vmware_keys[count.index]].network
+#      resource_pool             = var.instance_list.vmware[local.vmware_keys[count.index]].resource_pool
+#      vmware_instance_number    = var.instance_list.vmware[local.vmware_keys[count.index]].vmware_instance_number
+#      vmware_annotation         = var.instance_list.vmware[local.vmware_keys[count.index]].vmware_annotation
+#}
+
+#tomcat软件安装
+#module "tomcat" {
+#      source = "git::http://gitlab.idcos.com/terraform-modules/terraform-hybridprivatecloud-software-base.git//modules/tomcat?ref=v1.2.2"
+#      host_ip = join(",",module.instance_vmware[0].vm)
+#      tomcat_install = var.tomcat_install
+#      wait_connection_timeout = var.wait_connection_timeout
+#      ansible_ssh_user = var.ansible_ssh_user
+#      ansible_ssh_pass = var.ansible_ssh_pass
+#      tomcat_version = var.tomcat_version
+#      tomcat_jvm_min_num = var.tomcat_jvm_min_num
+#      tomcat_jvm_max_num = var.tomcat_jvm_max_num
+#      tomcat_service_port = var.tomcat_service_port
+#      jdk_version = var.jdk_version
+#      depends_on = ["module.instance_vmware"]
+#}
+
+
+# nginx模块安装
+#module "nginx" {
+#      source = "git::http://gitlab.idcos.com/terraform-modules/terraform-hybridprivatecloud-software-base.git//modules/nginx?ref=v1.0.4"
+#      host_ip = join(",",module.instance_vmware[0].vm)
+#      wait_connection_timeout = var.wait_connection_timeout
+#      ansible_ssh_user = var.ansible_ssh_user
+#      ansible_ssh_pass = var.ansible_ssh_pass
+#}
\ No newline at end of file

outputs.tf

+
+output "env_info" {
+  value = {
+    "环境部署云平台"  = var.instance_list[*].vmO.cloudType
+    "虚机规格"  = var.instance_list[*].vmO.spec
+    "磁盘容量"  = var.instance_list[*].vmO.disk_size
+    "镜像名称"  = var.instance_list[*].vmO.vmware_os
+    "服务器IP地址" = var.instance_list[*].vmO.ip
+    "登录用户"      = var.instance_list[*].vmO.username
+  }
+  description = "环境服务器信息"
+}
+output "software_info" {
+  value = {
+    "软件类型"  = var.software_list[*].softwareO.type
+    "软件版本" = var.software_list[*].softwareO.version
+    "软件参数模版"      = var.software_list[*].softwareO.template
+  }
+  description = "环境软件信息"
+}
+
+output "deploy_units" {
+  value = [
+    {
+      deploy_unit_name         = var.instance_list[*].vmO.cloudType,
+      deploy_unit_resource_num = 1,
+      deploy_unit_resources    = [
+        {
+          id : module.vm_resource.id,
+          name : module.vm_resource.name,
+          type : "vsphere_virtual_machine"
+          private_ip : var.instance_list[*].vmO.ip
+          public_ip : "",
+          status : "running",
+          instance_type : {
+            description : "2C4G 80G"
+          }
+        }
+      ]
+    }
+  ]
+}
+
+# vmware 返回数据
+#output "instance_vmware" {
+#    value = module.instance_vmware
+#}
\ No newline at end of file

providers.tf

+provider "vsphere" {
+  allow_unverified_ssl = true
+  user = "Administrator@vsphere.local"
+  password = "Yunjikeji#123"
+  vsphere_server = "10.0.1.24"
+}
\ No newline at end of file

variables.tf

+# cpg层
+variable "instance_list" {
+  type = map (any)
+  default = {
+    vmO = {
+      cloudType = "vmware"
+      spec = "2C4G"
+      ip = "192.168.3.120"
+      disk_size = "10"
+      username = "root"
+      password = "zaq1@WSX"
+      vmware_os = "centos7"
+      env_name = "环境名称"
+    }
+  }
+}
+variable "software_list" {
+  type = map (any)
+    default = {
+        softwareO = {
+          type = "tomcat"
+          version = "8.5"
+          template = "软件版本=[v8.5]  服务端口=[8080]  安装目录=[/usr/local/tomcat]   安装用户=[tomcat]   jvm版本=[v1.8.0.33]   jvm最小内存=[64M]   jvm最大内存=[128M]  "
+        }
+    }
+}
+#非cpg层
+##vmware参数
+#variable "instance_list" {
+#  type = map (any)
+#  default = {
+#    vmware= {
+#      vmO = {
+#        idc_code = "Datacenter-TEST"
+#        datastore = "datastore1"
+#        resource_pool = "vmware-test"
+#        vmware_names = "defaultest-001"
+#        network = "VM Network"
+#        vmware_os = "centos7_10G"
+#        disk_label                = ["disk0"]
+#        scsi_controller           = 0
+#        data_disk_scsi_controller = []
+#        data_disk_label           = []
+#        vmware_data_disk_gb       = ["10"]
+#        thin_provisioned          = null
+#        eagerly_scrub             = null
+#        domain                    = "test.internal"
+#        vmware_ips                = "10.0.0.150"
+#        dns_server                = ["10.0.0.1"]
+#        netmask                   = 16
+#        gateway                   = "10.0.0.1"
+#        vmware_cpu                = 2
+#        vmware_memory             = 4096
+#        vmware_instance_number    = 1
+#        vmware_annotation         = "这是一台测试机器"
+#      }
+#      }
+#  }
+#}
+#
+#
+##ansible参数
+#variable "ansible_ssh_user" {
+#  type = string
+#  default = "root"
+#}
+#variable "ansible_ssh_pass" {
+#  type = string
+#  sensitive = true
+#  default = "Yunjikeji#2019"
+#}
+#variable "wait_connection_timeout" {
+#  default = 300
+#}
+#
+##tomcat参数
+#variable "tomcat_install" {
+#  type = bool
+#  description = "是否安装tomcat"
+#  default = true
+#}
+#variable "tomcat_version" {
+#  type = string
+#  description = "Tomcat版本"
+#  default = "8.5.78"
+#}
+#variable "tomcat_jvm_min_num" {
+#  type = string
+#  description = "Jvm最小堆栈数（M）"
+#  default = "64"
+#}
+#variable "tomcat_jvm_max_num" {
+#  type = string
+#  description = "Jvm最大堆栈数（M）"
+#  default = "128"
+#}
+#variable "tomcat_service_port" {
+#  type = string
+#  description = "Tomcat服务端口"
+#  default = "8080"
+#}
+#
+## JDK模块参数
+#variable "jdk_version" {
+#  type = string
+#  description = "JVM版本"
+#  default = "1.8.0_333"
+#}
+#
+#
+## nginx模块参数
+##variable "nginx_install" {
+##  type = bool
+##  default = true
+##}

versions.tf

+terraform {
+  required_version = ">= 1.0.0"
+
+  required_providers {
+    vsphere = {
+      source  = "hashicorp/vsphere"
+      version = "2.2.0"
+    }
+    random = {
+      source = "hashicorp/random"
+      version = "3.5.1"
+    }
+    ansible = {
+      source = "store.cloudiac.org/idcos/ansible"
+      version = "1.2.0"
+    }
+  }
+}