summaryrefslogtreecommitdiff
path: root/dan
diff options
context:
space:
mode:
Diffstat (limited to 'dan')
-rw-r--r--dan/emc-master.yml1
-rw-r--r--dan/emc-stats.yml8
-rw-r--r--dan/k8s-emc.yml30
3 files changed, 13 insertions, 26 deletions
diff --git a/dan/emc-master.yml b/dan/emc-master.yml
index 412faf29..ffee64a8 100644
--- a/dan/emc-master.yml
+++ b/dan/emc-master.yml
@@ -5,3 +5,4 @@
- role: base
- role: sshd
- role: zsh
+ - role: emc-stats
diff --git a/dan/emc-stats.yml b/dan/emc-stats.yml
deleted file mode 100644
index aa4af19e..00000000
--- a/dan/emc-stats.yml
+++ /dev/null
@@ -1,8 +0,0 @@
----
-- name: Basic Setup
- hosts: emc-stats
- roles:
- - role: base
- - role: sshd
- - role: zsh
- - role: emc-stats
diff --git a/dan/k8s-emc.yml b/dan/k8s-emc.yml
index 600ab2a1..518604b0 100644
--- a/dan/k8s-emc.yml
+++ b/dan/k8s-emc.yml
@@ -1,23 +1,17 @@
---
-- name: setup cluster config
+- name: Basic Node Setup
hosts: k8s-emc
- gather_facts: no
- run_once: yes
- tasks:
- - name: create group for all kubernetes nodes
- loop: "{{ groups['k8s-emc'] }}"
- add_host:
- name: "{{ item }}"
- inventory_dir: "{{ inventory_dir }}"
- group: _kubernetes_nodes_
- changed_when: False
+ roles:
+ - role: base
+ - role: sshd
+ - role: zsh
- - name: create group for kubernetes master nodes
- loop: "{{ groups['k8s-emc-master'] }}"
- add_host:
- name: "{{ item }}"
- inventory_dir: "{{ inventory_dir }}"
- group: _kubernetes_masters_
- changed_when: False
+- import_playbook: ../common/kubernetes-cluster-layout.yml
+ vars:
+ kubernetes_cluster_layout:
+ nodes_group: k8s-emc
+ masters:
+ - emc-master
- import_playbook: ../common/kubernetes.yml
+- import_playbook: ../common/kubernetes-cleanup.yml