Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
46 changes: 46 additions & 0 deletions data/data/openstack/bootstrap/main.tf
Original file line number Diff line number Diff line change
@@ -0,0 +1,46 @@
resource "openstack_objectstorage_object_v1" "ignition" {
container_name = "${var.swift_container}"
name = "bootstrap.ign"
content = "${var.ignition}"
}

resource "openstack_objectstorage_tempurl_v1" "ignition_tmpurl" {
container = "${var.swift_container}"
method = "get"
object = "${openstack_objectstorage_object_v1.ignition.name}"
ttl = 3600
}

data "ignition_config" "redirect" {
replace {
source = "${openstack_objectstorage_tempurl_v1.ignition_tmpurl.url}"
}
}

data "openstack_images_image_v2" "bootstrap_image" {
name = "${var.image_name}"
most_recent = true
}

data "openstack_compute_flavor_v2" "bootstrap_flavor" {
name = "${var.flavor_name}"
}

resource "openstack_compute_instance_v2" "bootstrap" {
name = "${var.cluster_name}-bootstrap"
flavor_id = "${data.openstack_compute_flavor_v2.bootstrap_flavor.id}"
image_id = "${data.openstack_images_image_v2.bootstrap_image.id}"

user_data = "${data.ignition_config.redirect.rendered}"

network {
port = "${var.bootstrap_port_id}"
}

metadata {
Name = "${var.cluster_name}-bootstrap"

# "kubernetes.io/cluster/${var.cluster_name}" = "owned"
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

in aws kubelet doesn't run unless this is set.

tectonicClusterID = "${var.cluster_id}"
}
}
34 changes: 34 additions & 0 deletions data/data/openstack/bootstrap/variables.tf
Original file line number Diff line number Diff line change
@@ -0,0 +1,34 @@
variable "image_name" {
type = "string"
description = "The name of the Glance image for the bootstrap node."
}

variable "swift_container" {
type = "string"
description = "The Swift container name for bootstrap ignition file."
}

variable "cluster_name" {
type = "string"
description = "The name of the cluster."
}

variable "cluster_id" {
type = "string"
}

variable "ignition" {
type = "string"
description = "The content of the bootstrap ignition file."
}

variable "flavor_name" {
type = "string"
default = "m1.medium"
description = "The Nova flavor for the bootstrap node."
}

variable "bootstrap_port_id" {
type = "string"
description = "The subnet ID for the bootstrap node."
}
73 changes: 73 additions & 0 deletions data/data/openstack/main.tf
Original file line number Diff line number Diff line change
@@ -0,0 +1,73 @@
provider "openstack" {
auth_url = "${var.tectonic_openstack_credentials_auth_url}"
cert = "${var.tectonic_openstack_credentials_cert}"
cloud = "${var.tectonic_openstack_credentials_cloud}"
domain_id = "${var.tectonic_openstack_credentials_domain_id}"
domain_name = "${var.tectonic_openstack_credentials_domain_name}"
endpoint_type = "${var.tectonic_openstack_credentials_endpoint_type}"
insecure = "${var.tectonic_openstack_credentials_insecure}"
key = "${var.tectonic_openstack_credentials_key}"
password = "${var.tectonic_openstack_credentials_password}"
project_domain_id = "${var.tectonic_openstack_credentials_project_domain_id}"
project_domain_name = "${var.tectonic_openstack_credentials_project_domain_name}"
region = "${var.tectonic_openstack_region}"
region = "${var.tectonic_openstack_credentials_region}"
swauth = "${var.tectonic_openstack_credentials_swauth}"
tenant_id = "${var.tectonic_openstack_credentials_tenant_id}"
tenant_name = "${var.tectonic_openstack_credentials_tenant_name}"
token = "${var.tectonic_openstack_credentials_token}"
use_octavia = "${var.tectonic_openstack_credentials_use_octavia}"
user_domain_id = "${var.tectonic_openstack_credentials_user_domain_id}"
user_domain_name = "${var.tectonic_openstack_credentials_user_domain_name}"
user_id = "${var.tectonic_openstack_credentials_user_id}"
user_name = "${var.tectonic_openstack_credentials_user_name}"
version = ">=1.6.0"
}

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

swift_container = "${openstack_objectstorage_container_v1.tectonic.name}"
cluster_name = "${var.tectonic_cluster_name}"
cluster_id = "${var.tectonic_cluster_id}"
image_name = "${var.tectonic_openstack_base_image}"
flavor_name = "${var.tectonic_openstack_master_flavor_name}"
ignition = "${var.ignition_bootstrap}"
bootstrap_port_id = "${module.topology.bootstrap_port_id}"
}

module "masters" {
source = "./masters"

base_image = "${var.tectonic_openstack_base_image}"
cluster_id = "${var.tectonic_cluster_id}"
cluster_name = "${var.tectonic_cluster_name}"
flavor_name = "${var.tectonic_openstack_master_flavor_name}"
instance_count = "${var.tectonic_master_count}"
master_sg_ids = "${concat(var.tectonic_openstack_master_extra_sg_ids, list(module.topology.master_sg_id))}"
subnet_ids = "${module.topology.master_subnet_ids}"
user_data_igns = ["${var.ignition_masters}"]
}

# TODO(shadower) add a dns module here

module "topology" {
source = "./topology"

cidr_block = "${var.tectonic_openstack_network_cidr_block}"
cluster_id = "${var.tectonic_cluster_id}"
cluster_name = "${var.tectonic_cluster_name}"
external_master_subnet_ids = "${compact(var.tectonic_openstack_external_master_subnet_ids)}"
external_network = "${var.tectonic_openstack_external_network}"
masters_count = "${var.tectonic_master_count}"
}

resource "openstack_objectstorage_container_v1" "tectonic" {
name = "${lower(var.tectonic_cluster_name)}.${var.tectonic_base_domain}"

metadata = "${merge(map(
"Name", "${var.tectonic_cluster_name}-ignition-master",
"KubernetesCluster", "${var.tectonic_cluster_name}",
"tectonicClusterID", "${var.tectonic_cluster_id}"
), var.tectonic_openstack_extra_tags)}"
}
28 changes: 28 additions & 0 deletions data/data/openstack/masters/main.tf
Original file line number Diff line number Diff line change
@@ -0,0 +1,28 @@
data "openstack_images_image_v2" "masters_img" {
name = "${var.base_image}"
most_recent = true
}

data "openstack_compute_flavor_v2" "masters_flavor" {
name = "${var.flavor_name}"
}

resource "openstack_compute_instance_v2" "master_conf" {
name = "${var.cluster_name}-master-${count.index}"
count = "${var.instance_count}"

flavor_id = "${data.openstack_compute_flavor_v2.masters_flavor.id}"
image_id = "${data.openstack_images_image_v2.masters_img.id}"
security_groups = ["${var.master_sg_ids}"]
user_data = "${var.user_data_igns[count.index]}"

network = {
port = "${var.subnet_ids[count.index]}"
}

metadata {
Name = "${var.cluster_name}-master"
owned = "kubernetes.io/cluster/${var.cluster_name}"
tectonicClusterID = "${var.cluster_id}"
}
}
33 changes: 33 additions & 0 deletions data/data/openstack/masters/variables.tf
Original file line number Diff line number Diff line change
@@ -0,0 +1,33 @@
variable "base_image" {
type = "string"
}

variable "cluster_id" {
type = "string"
}

variable "cluster_name" {
type = "string"
}

variable "flavor_name" {
type = "string"
}

variable "instance_count" {
type = "string"
}

variable "master_sg_ids" {
type = "list"
default = ["default"]
description = "The security group IDs to be applied to the master nodes."
}

variable "subnet_ids" {
type = "list"
}

variable "user_data_igns" {
type = "list"
}
3 changes: 3 additions & 0 deletions data/data/openstack/topology/common.tf
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
locals {
master_subnet_ids = ["${coalescelist(openstack_networking_port_v2.masters.*.id,var.external_master_subnet_ids)}"]
}
11 changes: 11 additions & 0 deletions data/data/openstack/topology/outputs.tf
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
output "bootstrap_port_id" {
value = "${openstack_networking_port_v2.bootstrap_port.id}"
}

output "master_sg_id" {
value = "${openstack_networking_secgroup_v2.master.id}"
}

output "master_subnet_ids" {
value = "${local.master_subnet_ids}"
}
69 changes: 69 additions & 0 deletions data/data/openstack/topology/private-network.tf
Original file line number Diff line number Diff line change
@@ -0,0 +1,69 @@
locals {
new_master_cidr_range = "${cidrsubnet(var.cidr_block, 1, 0)}"
new_worker_cidr_range = "${cidrsubnet(var.cidr_block, 1, 1)}"
}

resource "openstack_networking_network_v2" "openshift-private" {
name = "openshift"
admin_state_up = "true"
}

resource "openstack_networking_subnet_v2" "masters" {
name = "masters"
cidr = "${local.new_master_cidr_range}"
ip_version = 4
network_id = "${openstack_networking_network_v2.openshift-private.id}"
}

resource "openstack_networking_subnet_v2" "workers" {
name = "worker"
cidr = "${local.new_worker_cidr_range}"
ip_version = 4
network_id = "${openstack_networking_network_v2.openshift-private.id}"
}

resource "openstack_networking_port_v2" "masters" {
name = "master-port-${count.index}"
count = "${var.masters_count}"

admin_state_up = "true"
network_id = "${openstack_networking_network_v2.openshift-private.id}"
security_group_ids = ["${openstack_networking_secgroup_v2.master.id}"]

fixed_ip {
"subnet_id" = "${openstack_networking_subnet_v2.masters.id}"
}
}

resource "openstack_networking_port_v2" "bootstrap_port" {
name = "bootstrap-port"

admin_state_up = "true"
network_id = "${openstack_networking_network_v2.openshift-private.id}"
security_group_ids = ["${openstack_networking_secgroup_v2.master.id}"]

fixed_ip {
"subnet_id" = "${openstack_networking_subnet_v2.masters.id}"
}
}

data "openstack_networking_network_v2" "external_network" {
name = "${var.external_network}"
external = true
}

resource "openstack_networking_router_v2" "openshift-external-router" {
name = "openshift-external-router"
admin_state_up = true
external_network_id = "${data.openstack_networking_network_v2.external_network.id}"
}

resource "openstack_networking_router_interface_v2" "masters_router_interface" {
router_id = "${openstack_networking_router_v2.openshift-external-router.id}"
subnet_id = "${openstack_networking_subnet_v2.masters.id}"
}

resource "openstack_networking_router_interface_v2" "workers_router_interface" {
router_id = "${openstack_networking_router_v2.openshift-external-router.id}"
subnet_id = "${openstack_networking_subnet_v2.workers.id}"
}
51 changes: 51 additions & 0 deletions data/data/openstack/topology/sg-lb.tf
Original file line number Diff line number Diff line change
@@ -0,0 +1,51 @@
resource "openstack_networking_secgroup_v2" "mcs" {
name = "mcs"
}

resource "openstack_networking_secgroup_rule_v2" "mcs_https" {
direction = "ingress"
ethertype = "IPv4"
protocol = "tcp"
port_range_min = 49500
port_range_max = 49500
remote_ip_prefix = "0.0.0.0/0"
security_group_id = "${openstack_networking_secgroup_v2.mcs.id}"
}

resource "openstack_networking_secgroup_v2" "api" {
name = "api"
}

resource "openstack_networking_secgroup_rule_v2" "api_https" {
direction = "ingress"
ethertype = "IPv4"
protocol = "tcp"
port_range_min = 6443
port_range_max = 6443
remote_ip_prefix = "0.0.0.0/0"
security_group_id = "${openstack_networking_secgroup_v2.api.id}"
}

resource "openstack_networking_secgroup_v2" "console" {
name = "console"
}

resource "openstack_networking_secgroup_rule_v2" "console_http" {
direction = "ingress"
ethertype = "IPv4"
protocol = "tcp"
port_range_min = 80
port_range_max = 80
remote_ip_prefix = "0.0.0.0/0"
security_group_id = "${openstack_networking_secgroup_v2.console.id}"
}

resource "openstack_networking_secgroup_rule_v2" "console_https" {
direction = "ingress"
ethertype = "IPv4"
protocol = "tcp"
port_range_min = 443
port_range_max = 443
remote_ip_prefix = "0.0.0.0/0"
security_group_id = "${openstack_networking_secgroup_v2.console.id}"
}
Loading