C12s/c12s-kubespray
3
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Added Terraform variables for SSH user which depends on given AWS AMI, removed commented ssh_args and control_path settings in Ansible config to be able to connect through Bastion Host

Browse source
This commit is contained in:
Maikel Mertens 2017-08-16 13:10:29 +02:00
parent 9a3c6f236d
commit f52994b7d6
4 changed files with 24 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
ansible.cfg
View file

@ -1,7 +1,7 @@
[ssh_connection]
pipelining=True
#ssh_args = -F ./ssh-bastion.conf -o ControlMaster=auto -o ControlPersist=30m
#control_path = ~/.ssh/ansible-%%r@%%h:%%p
ssh_args = -F ./ssh-bastion.conf -o ControlMaster=auto -o ControlPersist=30m
control_path = ~/.ssh/ansible-%%r@%%h:%%p
[defaults]
host_key_checking=False
gathering = smart

13
contrib/terraform/aws/create-infrastructure.tf
View file

@ -164,17 +164,16 @@ data "template_file" "inventory" {
template = "${file("${path.module}/templates/inventory.tpl")}"
vars {
public_ip_address_bastion = "${join("\n",formatlist("bastion ansible_ssh_host=%s" , aws_instance.bastion-server.*.public_ip))}"
connection_strings_master = "${join("\n",formatlist("%s ansible_ssh_host=%s",aws_instance.k8s-master.*.tags.Name, aws_instance.k8s-master.*.private_ip))}"
connection_strings_node = "${join("\n", formatlist("%s ansible_ssh_host=%s", aws_instance.k8s-worker.*.tags.Name, aws_instance.k8s-worker.*.private_ip))}"
connection_strings_etcd = "${join("\n",formatlist("%s ansible_ssh_host=%s", aws_instance.k8s-etcd.*.tags.Name, aws_instance.k8s-etcd.*.private_ip))}"
public_ip_address_bastion = "${join("\n",formatlist("bastion ansible_ssh_host=%s ansible_ssh_user=%s", aws_instance.bastion-server.*.public_ip, var.aws_bastion_ssh_user))}"
connection_strings_master = "${join("\n",formatlist("%s ansible_ssh_host=%s ansible_ssh_user=%s", aws_instance.k8s-master.*.tags.Name, aws_instance.k8s-master.*.private_ip, var.aws_cluster_ssh_user))}"
connection_strings_node = "${join("\n", formatlist("%s ansible_ssh_host=%s ansible_ssh_user=%s", aws_instance.k8s-worker.*.tags.Name, aws_instance.k8s-worker.*.private_ip, var.aws_cluster_ssh_user))}"
connection_strings_etcd = "${join("\n",formatlist("%s ansible_ssh_host=%s ansible_ssh_user=%s", aws_instance.k8s-etcd.*.tags.Name, aws_instance.k8s-etcd.*.private_ip, var.aws_cluster_ssh_user))}"
list_master = "${join("\n",aws_instance.k8s-master.*.tags.Name)}"
list_node = "${join("\n",aws_instance.k8s-worker.*.tags.Name)}"
list_etcd = "${join("\n",aws_instance.k8s-etcd.*.tags.Name)}"
elb_api_fqdn = "apiserver_loadbalancer_domain_name=\"${module.aws-elb.aws_elb_api_fqdn}\""
elb_api_fqdn = "apiserver_loadbalancer_domain_name=\"${lower("${module.aws-elb.aws_elb_api_fqdn}")}\""
elb_api_port = "loadbalancer_apiserver.port=${var.aws_elb_api_port}"
kube_insecure_apiserver_address = "kube_apiserver_insecure_bind_address: ${var.kube_insecure_apiserver_address}"
kube_insecure_apiserver_address = "kube_apiserver_insecure_bind_address=${var.kube_insecure_apiserver_address}"
}
}

10
contrib/terraform/aws/terraform.tfvars
View file

@ -1,19 +1,21 @@
#Global Vars
aws_cluster_name = "devtest"
#VPC Vars
aws_vpc_cidr_block = "10.250.192.0/18"
aws_cidr_subnets_private = ["10.250.192.0/20","10.250.208.0/20"]
aws_cidr_subnets_public = ["10.250.224.0/20","10.250.240.0/20"]
aws_avail_zones = ["eu-central-1a","eu-central-1b"]
#Bastion Host
aws_bastion_ami = "ami-5900cc36"
aws_bastion_size = "t2.small"
aws_bastion_ssh_user = "admin"
#Kubernetes Cluster
aws_kube_master_num = 3
aws_kube_master_size = "t2.medium"
@ -23,9 +25,13 @@ aws_etcd_size = "t2.medium"
aws_kube_worker_num = 4
aws_kube_worker_size = "t2.medium"
# Refer to: https://coreos.com/os/docs/latest/booting-on-ec2.html
aws_cluster_ami = "ami-903df7ff"
aws_cluster_ssh_user = "core"
#Settings AWS ELB
aws_elb_api_port = 443
k8s_secure_api_port = 443
kube_insecure_apiserver_address = 0.0.0.0

9
contrib/terraform/aws/variables.tf
View file

@ -22,7 +22,6 @@ variable "aws_cluster_name" {
//AWS VPC Variables
variable "aws_vpc_cidr_block" {
description = "CIDR Block for VPC"
}
@ -51,6 +50,9 @@ variable "aws_bastion_ami" {
variable "aws_bastion_size" {
description = "EC2 Instance Size of Bastion Host"
}
variable "aws_bastion_ssh_user" {
description = "Default SSH username for Bastion Host, depends on selected AMI"
}
/*
* AWS EC2 Settings
@ -84,6 +86,11 @@ variable "aws_kube_worker_size" {
variable "aws_cluster_ami" {
description = "AMI ID for Kubernetes Cluster"
}
variable "aws_cluster_ssh_user" {
description = "Default SSH username for Kubernetes Cluster, depends on selected AMI"
}
/*
* AWS ELB Settings
*