Verified Commit 01c167d8 authored by Radim Peša's avatar Radim Peša
Browse files

several changes

parent df11efcd
......@@ -20,7 +20,7 @@ tf-apply:
cd tf && terraform apply
ansible-configure:
cd ansible && ansible-playbook --private-key=~/.ssh/tf-edirex/id_rsa --extra-vars "RANCHER_TOKEN=$ENV_RANCHER_TOKEN" k8s-dynamic.yml
cd ansible && ansible-playbook --private-key=~/.ssh/tf-edirex/id_rsa --extra-vars "RANCHER_TOKEN=${ENV_RANCHER_TOKEN}" k8s-dynamic.yml
tf-destroy:
cd tf && terraform init
......
......@@ -13,6 +13,10 @@
setup:
tasks:
# - name: Show token
# debug:
# var: "{{ RANCHER_TOKEN }}"
- name: upgrade
apt: upgrade=dist update_cache=yes
......@@ -30,7 +34,7 @@
hosts:
- "{{ hgroup | default('g_k8s-test') }}_master"
tasks:
- command: sudo docker run -d --privileged --restart=unless-stopped --net=host -v /etc/kubernetes:/etc/kubernetes -v /var/run:/var/run rancher/rancher-agent:v2.2.2 --server https://barn.ics.muni.cz --token "{{ RANCHER_TOKEN }}" --worker --etcd --controlplane
- command: sudo docker run -d --privileged --restart=unless-stopped --net=host -v /etc/kubernetes:/etc/kubernetes -v /var/run:/var/run rancher/rancher-agent:v2.2.2 --server https://rancher.edirex.ics.muni.cz --token "{{ RANCHER_TOKEN }}" --worker --etcd --controlplane
#- name: Start worker containers
# hosts:
......
......@@ -3,7 +3,7 @@ resource "openstack_compute_instance_v2" "k8s_cluster_master" {
count = "${var.k8s_master_node_count}"
name = "${var.k8s_cluster_name}-master-${count.index + 1}"
image_name = "${var.image_name}"
flavor_name = "standard.tiny"
flavor_name = "standard.medium"
key_pair = "${var.key_pair}"
security_groups = ["ingress_ssh", "allow_barn", "default", "allow_ingress_http_https"]
......
......@@ -42,9 +42,9 @@ variable "k8s_cluster_name" {
}
variable "k8s_master_node_count" {
default = "2"
default = "3"
}
variable "k8s_worker_node_count" {
default = "3"
default = "2"
}
Markdown is supported
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