Commit d8d2160c authored by admin's avatar admin
Browse files

环境代码变更

No related merge requests found
Showing with 305 additions and 92 deletions
+305 -92
# a9e64a-aliyun-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:
```
cd existing_repo
git remote add origin https://gitlab.yun.shop/eos-test/a9e64a-aliyun-software.git
git branch -M master
git push -uf origin master
```
## Integrate with your tools
- [ ] [Set up project integrations](https://gitlab.yun.shop/eos-test/a9e64a-aliyun-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.
main.tf 0 → 100644
#vmware资源控制
module "instance_vmware" {
source = "git::http://gitlab.idcos.com/iac-module/terraform-vmware-modules.git//modules/instance?ref=v0.0.1"
idc_code = var.idc_code
datastore = var.datastore
disk_label = var.disk_label
scsi_controller = var.scsi_controller
data_disk_scsi_controller = var.data_disk_scsi_controller
data_disk_label = var.data_disk_label
vmware_data_disk_gb = var.vmware_data_disk_gb
thin_provisioned = var.thin_provisioned
eagerly_scrub = var.eagerly_scrub
domain = var.domain
vmware_names = var.vmware_names
vmware_os = var.vmware_os
vmware_ips = var.vmware_ips
dns_server = var.dns_server
netmask = var.netmask
gateway = var.gateway
vmware_cpu = var.vmware_cpu
vmware_memory = var.vmware_memory
network = var.network
resource_pool = var.resource_pool
vmware_instance_number = var.vmware_instance_number
vmware_annotation = var.vmware_annotation
}
# nginx模块安装
#module "nginx" {
# source = "git::https://gitlab.yun.shop/ydd-idp-idcos/terraform-hybridprivatecloud-software-single.git//modules/nginx"
# host_ip = module.instance_vmware.vm[0]
# wait_connection_timeout = var.wait_connection_timeout
# ansible_ssh_user = var.ansible_ssh_user
# ansible_ssh_pass = var.ansible_ssh_pass
# nginx_service_name = var.nginx_service_name
# which_app_user = var.which_app_user
# nginx_install = var.nginx_install
# nas_business_ip = var.nas_business_ip
#}
module "tomcat" {
source = "git::http://gitlab.idcos.com/terraform-modules/terraform-hybridprivatecloud-software-base.git//modules/tomcat"
host_ip = module.instance_vmware.vm[0]
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"]
}
\ No newline at end of file
output "instance_vmware" {
value = module.instance_vmware
}
\ No newline at end of file
provider "vsphere" {
allow_unverified_ssl = true
user = var.vsphere_user_name
password = var.vsphere_password
vsphere_server = var.vsphere_server
}
\ No newline at end of file
# VC认证信息
variable "vsphere_user_name" {
default = "Administrator@vsphere.local"
description = "VC认证用户名"
}
variable "vsphere_password" {
default = "Yunjikeji#123"
description = "VC认证密码"
}
variable "vsphere_server" {
default = "10.0.1.24"
description = "VCip地址"
}
variable "idc_code" {
description = "(必填)数据中心"
type = string
default = "Datacenter-TEST"
}
variable "datastore" {
description = "数据存储"
type = string
default = "datastore1"
}
variable "resource_pool" {
description = "资源池"
type = string
default = "vmware-test"
}
variable "vmware_names" {
description = "主机名称"
type = string
default = "defaultest-001"
}
variable "network" {
description = "网络"
type = string
default = "VM Network"
}
variable "vmware_os" {
description = "操作系统"
type = string
default = "centos7_10G"
}
variable "domain" {
description = "主机域"
type = string
default = "test.internal"
}
variable "vmware_cpu" {
description = "虚拟机CPU配置"
default = 2
}
variable "vmware_memory" {
description = "虚拟机内存配置"
default = 4096
}
variable "disk_label" {
description = "系统盘标签"
type = list(any)
default = ["disk0"]
}
variable "vmware_data_disk_gb" {
description = "数据盘大小列表"
type = list(any)
default = ["10"]
}
variable "data_disk_label" {
description = "数据盘标签"
type = list(any)
default = []
}
variable "vmware_annotation" {
description = "主机备注"
type = string
default = "这是一台测试机器"
}
variable "thin_provisioned" {
description = "数据磁盘是否精简,默认是精简"
type = list(any)
default = null
}
variable "eagerly_scrub" {
description = "数据磁盘空间是否清零"
type = list(any)
default = null
}
variable "scsi_controller" {
description = "系统磁盘控制器"
type = number
default = 0
}
variable "data_disk_scsi_controller" {
description = "数据磁盘控制器"
type = list(any)
default = []
}
variable "vmware_ips" {
description = "虚拟机ip地址"
type = string
default = "10.0.0.150"
}
variable "netmask" {
description = "子网掩码"
type = string
default = "16"
}
variable "gateway" {
description = "网关"
type = string
default = "10.0.0.1"
}
variable "dns_server" {
description = "DNS域名解析"
type = list(string)
default = ["10.0.0.1"]
}
variable "vmware_instance_number" {
default = 1
type = number
description = "创建实例数量"
}
# nginx模块变量
#variable "nas_business_ip" {
# default = ""
#}
#
#variable "ansible_ssh_user" {
# default = "root"
#}
#
#variable "ansible_ssh_pass" {
# sensitive = true
# default = "Yunjikeji#2019"
#}
#
#variable "nginx_service_name" {
# default = "kfptyw"
#}
#variable "which_app_user" {
# default = "appuser"
#}
#
#variable "nginx_install" {
# type = bool
# default = true
#}
#
#variable "wait_connection_timeout" {
# default = 600
#}
#tomcat参数
variable "ansible_ssh_user" {
type = string
default = "root"
}
variable "ansible_ssh_pass" {
type = string
sensitive = true
default = "Yunjikeji#123"
}
variable "wait_connection_timeout" {
default = 600
}
variable "tomcat_install" {
type = bool
description = "是否安装tomcat"
default = true
}
variable "tomcat_version" {
type = string
description = "Tomcat版本"
default = "8.5.78.tar.gz"
}
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"
}
variable "jdk_version" {
type = string
description = "JVM版本"
default = "1.8.0_333"
}
terraform {
required_version = ">= 1.0.0"
required_providers {
vsphere = {
source = "hashicorp/vsphere"
version = "2.2.0"
}
ansible = {
source = "store.cloudiac.org/idcos/ansible"
version = "1.2.0"
}
}
}
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment