Merge pull request #348 from rsmitty/master

updated admission controllers for >1.2 Kubernetes

roles/kubernetes/master/templates/kube-apiserver.j2

@@ -33,7 +33,7 @@ KUBE_ETCD_SERVERS="--etcd_servers={% for host in groups['etcd'] %}http://{{ host
 KUBE_API_ADDRESS="--bind-address={{ ip | default(ansible_default_ipv4.address) }}"
 
 # default admission control policies
-KUBE_ADMISSION_CONTROL="--admission_control=NamespaceLifecycle,NamespaceExists,LimitRanger,SecurityContextDeny,ServiceAccount,ResourceQuota"
+KUBE_ADMISSION_CONTROL="--admission-control=NamespaceLifecycle,LimitRanger,ServiceAccount,ResourceQuota"
 
 # RUNTIME API CONFIGURATION (e.g. enable extensions)
 KUBE_RUNTIME_CONFIG="{% if kube_api_runtime_config is defined %}{% for conf in kube_api_runtime_config %}--runtime-config={{ conf }} {% endfor %}{% endif %}"