From 238f6b69deed6c31e504a4b5c5d902030de3f83d Mon Sep 17 00:00:00 2001 From: Scott Lowe Date: Tue, 24 Apr 2018 11:47:04 -0600 Subject: [PATCH] Clean up files Remove template.yml (functionality folder into etcd.yml). Remove bootstrap.yml (functionality folded into etcd.yml). Signed-off-by: Scott Lowe --- etcd/etcdv3-ansible-aws-tf/bootstrap.yml | 11 ----------- etcd/etcdv3-ansible-aws-tf/etcd.yml | 8 ++++++++ etcd/etcdv3-ansible-aws-tf/template.yml | 19 ------------------- 3 files changed, 8 insertions(+), 30 deletions(-) delete mode 100644 etcd/etcdv3-ansible-aws-tf/bootstrap.yml delete mode 100644 etcd/etcdv3-ansible-aws-tf/template.yml diff --git a/etcd/etcdv3-ansible-aws-tf/bootstrap.yml b/etcd/etcdv3-ansible-aws-tf/bootstrap.yml deleted file mode 100644 index 606f25e..0000000 --- a/etcd/etcdv3-ansible-aws-tf/bootstrap.yml +++ /dev/null @@ -1,11 +0,0 @@ ---- -- hosts: "all" - become: true - gather_facts: false - - tasks: - - name: "Install Python" - raw: "apt-get -y -q install python" - - - name: "Gather facts" - setup: diff --git a/etcd/etcdv3-ansible-aws-tf/etcd.yml b/etcd/etcdv3-ansible-aws-tf/etcd.yml index c100daf..76fe3d2 100644 --- a/etcd/etcdv3-ansible-aws-tf/etcd.yml +++ b/etcd/etcdv3-ansible-aws-tf/etcd.yml @@ -1,4 +1,12 @@ --- +- hosts: "all" + become: true + gather_facts: false + + tasks: + - name: "Install Python" + raw: "apt-get -y -q install python" + - hosts: "tag_role_etcd" become: true vars: diff --git a/etcd/etcdv3-ansible-aws-tf/template.yml b/etcd/etcdv3-ansible-aws-tf/template.yml deleted file mode 100644 index d601992..0000000 --- a/etcd/etcdv3-ansible-aws-tf/template.yml +++ /dev/null @@ -1,19 +0,0 @@ ---- -- hosts: all - vars: - apiAdvertiseAddress: 192.168.100.100 - etcdServer1: 192.168.100.200 - etcdServer2: 192.168.100.201 - etcdServer3: 192.168.100.202 - podSubnet: 172.24.0.0/16 - serviceSubnet: 10.0.0.0/16 - k8sVersion: 1.9.6 - cloudProvider: aws - kubeadmToken: 8fcc26.83ab1665d9142018 - apiServerCertSANs: apiserver.cluster.io - - tasks: - - name: Render etcd.conf template - template: - src: etcd.conf.j2 - dest: etcd.conf