From cdc2e7d4fe6f9c823c6692838dd79482b1bcf0ec Mon Sep 17 00:00:00 2001 From: brant Date: Fri, 2 Mar 2018 11:30:55 +0800 Subject: [PATCH 1/4] Test-for-release-(do-not-merge) --- Test-for-release-(do-not-merge) | 1 + 1 file changed, 1 insertion(+) create mode 100644 Test-for-release-(do-not-merge) diff --git a/Test-for-release-(do-not-merge) b/Test-for-release-(do-not-merge) new file mode 100644 index 000000000..c96bff2e5 --- /dev/null +++ b/Test-for-release-(do-not-merge) @@ -0,0 +1 @@ +Test-for-release-(do-not-merge) \ No newline at end of file From 40d72d18659228486a8ef7dfdb539f0ca552ff51 Mon Sep 17 00:00:00 2001 From: brant Date: Fri, 2 Mar 2018 13:48:11 +0800 Subject: [PATCH 2/4] added [calico-rr] --- Test-for-release-(do-not-merge) | 1 - contrib/terraform/aws/templates/inventory.tpl | 3 +++ 2 files changed, 3 insertions(+), 1 deletion(-) delete mode 100644 Test-for-release-(do-not-merge) diff --git a/Test-for-release-(do-not-merge) b/Test-for-release-(do-not-merge) deleted file mode 100644 index c96bff2e5..000000000 --- a/Test-for-release-(do-not-merge) +++ /dev/null @@ -1 +0,0 @@ -Test-for-release-(do-not-merge) \ No newline at end of file diff --git a/contrib/terraform/aws/templates/inventory.tpl b/contrib/terraform/aws/templates/inventory.tpl index 2bb772549..5ef875543 100644 --- a/contrib/terraform/aws/templates/inventory.tpl +++ b/contrib/terraform/aws/templates/inventory.tpl @@ -25,3 +25,6 @@ kube-master [k8s-cluster:vars] ${elb_api_fqdn} + + +[calico-rr] \ No newline at end of file From 7c7b33a0f8a202af25485a83e0877a683663d32b Mon Sep 17 00:00:00 2001 From: brant Date: Fri, 2 Mar 2018 14:31:54 +0800 Subject: [PATCH 3/4] remove + groups['calico-rr'] --- cluster.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cluster.yml b/cluster.yml index 09f6043ad..1305ab450 100644 --- a/cluster.yml +++ b/cluster.yml @@ -26,7 +26,7 @@ setup: delegate_to: "{{item}}" delegate_facts: True - with_items: "{{ groups['k8s-cluster'] + groups['etcd'] + groups['calico-rr'] }}" + with_items: "{{ groups['k8s-cluster'] + groups['etcd'] }}" - hosts: k8s-cluster:etcd:calico-rr any_errors_fatal: "{{ any_errors_fatal | default(true) }}" From 739f6c78adbb0c58909b9a1aeb18feb1f40d344b Mon Sep 17 00:00:00 2001 From: brant Date: Fri, 2 Mar 2018 15:41:04 +0800 Subject: [PATCH 4/4] remove [calico-rr] --- contrib/terraform/aws/templates/inventory.tpl | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/contrib/terraform/aws/templates/inventory.tpl b/contrib/terraform/aws/templates/inventory.tpl index 5ef875543..20a8a69a6 100644 --- a/contrib/terraform/aws/templates/inventory.tpl +++ b/contrib/terraform/aws/templates/inventory.tpl @@ -24,7 +24,4 @@ kube-master [k8s-cluster:vars] -${elb_api_fqdn} - - -[calico-rr] \ No newline at end of file +${elb_api_fqdn} \ No newline at end of file