Merge pull request #2407 from brant4test/PR

remove + groups['calico-rr']

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) }}"

contrib/terraform/aws/templates/inventory.tpl

@@ -24,4 +24,4 @@ kube-master
 
 
 [k8s-cluster:vars]
-${elb_api_fqdn}
+${elb_api_fqdn}