Merge pull request #1064 from kubernetes-incubator/rework_vars

cluster.yml

docs/calico_peer_example/new-york.yml

docs/calico_peer_example/paris.yml

inventory/group_vars/calico-rr.yml

inventory/group_vars/k8s-cluster.yml

inventory/group_vars/kube-master.yml

reset.yml

roles/kargo-defaults/defaults/main.yaml

roles/kargo-defaults/tasks/main.yaml

tests/testcases/030_check-network.yml

upgrade-cluster.yml