Skip to content

Commit

Permalink
Merge pull request #1446 from staebler/vsphere_tf
Browse files Browse the repository at this point in the history
upi/vshpere: Add initial support for vSphere UPI
  • Loading branch information
openshift-merge-robot authored Mar 22, 2019
2 parents 74ddacc + 58a3b49 commit 0d891e1
Show file tree
Hide file tree
Showing 11 changed files with 592 additions and 0 deletions.
56 changes: 56 additions & 0 deletions upi/vsphere/README.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,56 @@
1. Create an install-config.yaml.
There is not a vsphere platform yet, so use the none platform.
The machine CIDR for the dev cluster is 139.178.89.192/26.

```
apiVersion: v1beta4
baseDomain: devcluster.openshift.com
metadata:
name: mstaeble
networking:
machineCIDR: "139.178.89.192/26"
platform:
none: {}
pullSecret: YOUR_PULL_SECRET
sshKey: YOUR_SSH_KEY
```

2. Run `openshift-install create ignition-configs`.

3. Fill out a terraform.tfvars file with the ignition configs generated.
There is an example terraform.tfvars file in this directory named terraform.tfvars.example. The example file is set up for use with the dev cluster running at vcsa.vmware.devcluster.openshift.com. At a minimum, you need to set values for `cluster_id`, `cluster_domain`, `vsphere_user`, `vsphere_password`, `bootstrap_ignition_url`, `control_plane_ignition`, and `compute_ignition`.
The bootstrap ignition config must be placed in a location that will be accessible by the bootstrap machine. For example, you could store the bootstrap ignition config in a gist.
Initially, the `bootstrap_complete` variable must be false, the `bootstrap_ip` variable must be an empty string, and the `control_plane_ips variable must be an empty list.

4. Run `terraform init`.

5. Run `terraform apply -auto-approve`.

6. Find the IP address of the bootstrap machine.
If you provided an extra user, you can use that user to log into the bootstrap machine via the vSphere web console.
Alternatively, you could iterate through the IP addresses in the 139.178.89.192/26 block looking for one that has the expected hostname, which is bootstrap-0.{cluster_domain}. For example, `ssh -i ~/.ssh/libra.pem -o StrictHostNameChecking=no -q [email protected] hostname`

7. Update the terraform.tfvars file with the IP address of the bootstrap machine.

8. Run `terraform apply -auto-approve`.
From this point forward, route53 resources will be managed by terraform. You will need to have your AWS profile set and a region specified.

9. Find the IP addresses of the control plane machines. See step 6 for examples of how to do this. The expected hostnames are control-plane-{0,1,2}.{cluster_domain}. The control plane machines will change their IP addresses once. You need the final IP addresses. If you happen to use the first set of IP addresses, you can later update the IP addresses in the terraform.tfvars file and re-run terraform.

10. Update the terraform.tfvars file with the IP addresses of the control plane machines.

11. Run `terraform apply -auto-approve`.

12. Run `openshift-install user-provided-infrastructure`. Wait for the bootstrapping to complete.
You *may* need to log into each of the control plane machines. It would seem that, for some reason, the etcd-member pod does not start until the machine is logged into.

13. Update the terraform.tfvars file to set the `bootstrap_complete` variable to "true".

14. Run `terraform apply -auto-approve`.

15. Run `openshift-install user-provided-infrastructure finish`. Wait for the cluster install to finish.
Currently, the cluster install does not finish. There is an outstanding issue with the openshift-console operator not installing successfully. The cluster should still be usable save for the console, however.

16. Enjoy your new OpenShift cluster.

17. Run `terraform destroy -auto-approve`.
96 changes: 96 additions & 0 deletions upi/vsphere/machine/main.tf
Original file line number Diff line number Diff line change
@@ -0,0 +1,96 @@
locals {
ignition_encoded = "data:text/plain;charset=utf-8;base64,${base64encode(var.ignition)}"
}

data "ignition_file" "hostname" {
count = "${var.instance_count}"

filesystem = "root"
path = "/etc/hostname"
mode = "420"

content {
content = "${var.name}-${count.index}.${var.cluster_domain}"
}
}

data "ignition_user" "extra_users" {
count = "${length(var.extra_user_names)}"

name = "${var.extra_user_names[count.index]}"
password_hash = "${var.extra_user_password_hashes[count.index]}"
}

data "ignition_config" "ign" {
count = "${var.instance_count}"

append {
source = "${var.ignition_url != "" ? var.ignition_url : local.ignition_encoded}"
}

files = [
"${data.ignition_file.hostname.*.id[count.index]}",
]

users = ["${data.ignition_user.extra_users.*.id}"]
}

resource "vsphere_virtual_machine" "vm" {
count = "${var.instance_count}"

name = "${var.name}-${count.index}"
resource_pool_id = "${var.resource_pool_id}"
datastore_id = "${var.datastore_id}"
num_cpus = "4"
memory = "8192"
guest_id = "other26xLinux64Guest"

wait_for_guest_net_timeout = 0
wait_for_guest_net_routable = false

network_interface {
network_id = "${var.network_id}"
}

disk {
label = "disk0"
size = 60

// want to change this to thin provisioned. need to change template.
thin_provisioned = false
}

clone {
template_uuid = "${var.vm_template_id}"
}

vapp {
properties {
"guestinfo.coreos.config.data" = "${data.ignition_config.ign.*.rendered[count.index]}"
}
}
}

/*
"networkd": {
"units": [
{
"contents": "[Match]\nName=eth0\n\n[Network]\nDNS=8.8.8.8\nAddress=${var.bootstrap_ip}/${var.network_prefix}\nGateway=${var.gateway}",
"name": "00-eth0.network"
}
]
},
*/
/*
{
"filesystem":"root",
"path":"/etc/sysconfig/network-scripts/ifcfg-eth0",
"contents":
{
"source":"data:,TYPE%3DEthernet%0APROXY_METHOD%3Dnone%0ABROWSER_ONLY%3Dno%0ABOOTPROTO%3Dnone%0ADEFROUTE%3Dyes%0AIPV4_FAILURE_FATAL%3Dno%0AIPV6INIT%3Dyes%0AIPV6_AUTOCONF%3Dyes%0AIPV6_DEFROUTE%3Dyes%0AIPV6_FAILURE_FATAL%3Dno%0AIPV6_ADDR_GEN_MODE%3Dstable-privacy%0ANAME%3Deth0%0AUUID%3Dcc0fcac7-aabd-440a-b0e2-4c98ed3ef8b5%0ADEVICE%3Deth0%0AONBOOT%3Dyes%0AIPADDR%3D${var.bootstrap_ip}%0APREFIX%3D${var.network_prefix}%0AGATEWAY%3D${var.gateway}%0ADNS1%3D8.8.8.8%0A",
"verification":{}
},
"mode":420
}]
*/

45 changes: 45 additions & 0 deletions upi/vsphere/machine/variables.tf
Original file line number Diff line number Diff line change
@@ -0,0 +1,45 @@
variable "name" {
type = "string"
}

variable "instance_count" {
type = "string"
}

variable "ignition" {
type = "string"
default = ""
}

variable "ignition_url" {
type = "string"
default = ""
}

variable "resource_pool_id" {
type = "string"
}

variable "datastore_id" {
type = "string"
}

variable "network_id" {
type = "string"
}

variable "vm_template_id" {
type = "string"
}

variable "cluster_domain" {
type = "string"
}

variable "extra_user_names" {
type = "list"
}

variable "extra_user_password_hashes" {
type = "list"
}
100 changes: 100 additions & 0 deletions upi/vsphere/main.tf
Original file line number Diff line number Diff line change
@@ -0,0 +1,100 @@
locals {
network_prefix = "${element(split("/", var.machine_cidr), 1)}"
gateway = "${cidrhost(var.machine_cidr,1)}"
}

provider "vsphere" {
user = "${var.vsphere_user}"
password = "${var.vsphere_password}"
vsphere_server = "${var.vsphere_server}"
allow_unverified_ssl = true
}

data "vsphere_datacenter" "dc" {
name = "${var.vsphere_datacenter}"
}

data "vsphere_compute_cluster" "compute_cluster" {
name = "${var.vsphere_cluster}"
datacenter_id = "${data.vsphere_datacenter.dc.id}"
}

data "vsphere_datastore" "datastore" {
name = "${var.vsphere_datastore}"
datacenter_id = "${data.vsphere_datacenter.dc.id}"
}

data "vsphere_network" "network" {
name = "${var.vm_network}"
datacenter_id = "${data.vsphere_datacenter.dc.id}"
}

data "vsphere_virtual_machine" "template" {
name = "${var.vm_template}"
datacenter_id = "${data.vsphere_datacenter.dc.id}"
}

module "resource_pool" {
source = "./resource_pool"

name = "${var.cluster_id}"
datacenter_id = "${data.vsphere_datacenter.dc.id}"
vsphere_cluster = "${var.vsphere_cluster}"
}

module "bootstrap" {
source = "./machine"

name = "bootstrap"
instance_count = "${var.bootstrap_complete ? 0 : 1}"
ignition_url = "${var.bootstrap_ignition_url}"
resource_pool_id = "${module.resource_pool.pool_id}"
datastore_id = "${data.vsphere_datastore.datastore.id}"
network_id = "${data.vsphere_network.network.id}"
vm_template_id = "${data.vsphere_virtual_machine.template.id}"
cluster_domain = "${var.cluster_domain}"

extra_user_names = ["${var.extra_user_names}"]
extra_user_password_hashes = ["${var.extra_user_password_hashes}"]
}

module "control_plane" {
source = "./machine"

name = "control-plane"
instance_count = "${var.control_plane_instance_count}"
ignition = "${var.control_plane_ignition}"
resource_pool_id = "${module.resource_pool.pool_id}"
datastore_id = "${data.vsphere_datastore.datastore.id}"
network_id = "${data.vsphere_network.network.id}"
vm_template_id = "${data.vsphere_virtual_machine.template.id}"
cluster_domain = "${var.cluster_domain}"

extra_user_names = ["${var.extra_user_names}"]
extra_user_password_hashes = ["${var.extra_user_password_hashes}"]
}

module "compute" {
source = "./machine"

name = "compute"
instance_count = "${var.compute_instance_count}"
ignition = "${var.compute_ignition}"
resource_pool_id = "${module.resource_pool.pool_id}"
datastore_id = "${data.vsphere_datastore.datastore.id}"
network_id = "${data.vsphere_network.network.id}"
vm_template_id = "${data.vsphere_virtual_machine.template.id}"
cluster_domain = "${var.cluster_domain}"

extra_user_names = ["${var.extra_user_names}"]
extra_user_password_hashes = ["${var.extra_user_password_hashes}"]
}

module "dns" {
source = "./route53"

base_domain = "${var.base_domain}"
cluster_domain = "${var.cluster_domain}"
bootstrap_ip = "${var.bootstrap_complete ? "" : var.bootstrap_ip}"
control_plane_ips = "${var.control_plane_ips}"
}
9 changes: 9 additions & 0 deletions upi/vsphere/resource_pool/main.tf
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
data "vsphere_compute_cluster" "compute_cluster" {
name = "${var.vsphere_cluster}"
datacenter_id = "${var.datacenter_id}"
}

resource "vsphere_resource_pool" "resource_pool" {
name = "${var.name}"
parent_resource_pool_id = "${data.vsphere_compute_cluster.compute_cluster.resource_pool_id}"
}
3 changes: 3 additions & 0 deletions upi/vsphere/resource_pool/output.tf
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
output "pool_id" {
value = "${vsphere_resource_pool.resource_pool.id}"
}
11 changes: 11 additions & 0 deletions upi/vsphere/resource_pool/variables.tf
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
variable "name" {
type = "string"
}

variable "datacenter_id" {
type = "string"
}

variable "vsphere_cluster" {
type = "string"
}
63 changes: 63 additions & 0 deletions upi/vsphere/route53/main.tf
Original file line number Diff line number Diff line change
@@ -0,0 +1,63 @@
locals {
route53_zone_count = "${length(var.control_plane_ips) + length(var.bootstrap_ip) == "0" ? "0" : "1"}"
}

data "aws_route53_zone" "base" {
name = "${var.base_domain}"
}

resource "aws_route53_zone" "cluster" {
count = "${local.route53_zone_count}"

name = "${var.cluster_domain}"
force_destroy = true

tags = "${map(
"Name", "${var.cluster_domain}",
"Platform", "vSphere")}"
}

resource "aws_route53_record" "name_server" {
count = "${local.route53_zone_count}"

name = "${var.cluster_domain}"
type = "NS"
ttl = "300"
zone_id = "${data.aws_route53_zone.base.zone_id}"
records = ["${aws_route53_zone.cluster.name_servers}"]
}

resource "aws_route53_record" "api" {
count = "${local.route53_zone_count}"

type = "A"
ttl = "60"
zone_id = "${aws_route53_zone.cluster.zone_id}"
name = "api.${var.cluster_domain}"
set_identifier = "api"
records = "${compact(concat(list(var.bootstrap_ip), var.control_plane_ips))}"

weighted_routing_policy {
weight = 90
}
}

resource "aws_route53_record" "etcd_a_nodes" {
count = "${length(var.control_plane_ips)}"

type = "A"
ttl = "60"
zone_id = "${aws_route53_zone.cluster.zone_id}"
name = "etcd-${count.index}.${var.cluster_domain}"
records = ["${var.control_plane_ips[count.index]}"]
}

resource "aws_route53_record" "etcd_cluster" {
count = "${length(var.control_plane_ips) == "0" ? "0" : "1"}"

type = "SRV"
ttl = "60"
zone_id = "${aws_route53_zone.cluster.zone_id}"
name = "_etcd-server-ssl._tcp"
records = ["${formatlist("0 10 2380 %s", aws_route53_record.etcd_a_nodes.*.fqdn)}"]
}
Loading

0 comments on commit 0d891e1

Please sign in to comment.