summaryrefslogtreecommitdiffstats
path: root/playbooks/openshift-master/private/tasks
diff options
context:
space:
mode:
authorMichael Gugino <mgugino@redhat.com>2017-12-18 16:13:36 -0500
committerMichael Gugino <mgugino@redhat.com>2017-12-20 10:13:51 -0500
commite6c159afb4ba39a7266c750d43d6a5e911cc8f21 (patch)
tree99cb6240e59a7118b2b4c9be603efc7eaeaf4679 /playbooks/openshift-master/private/tasks
parenta5de165b8e7113631a30ef0e4a20b5f74db073f0 (diff)
downloadopenshift-e6c159afb4ba39a7266c750d43d6a5e911cc8f21.tar.gz
openshift-e6c159afb4ba39a7266c750d43d6a5e911cc8f21.tar.bz2
openshift-e6c159afb4ba39a7266c750d43d6a5e911cc8f21.tar.xz
openshift-e6c159afb4ba39a7266c750d43d6a5e911cc8f21.zip
Remove openshift.common.{is_atomic|is_containerized}
We set these variables using facts in init, no need to duplicate the logic all around the codebase.
Diffstat (limited to 'playbooks/openshift-master/private/tasks')
-rw-r--r--playbooks/openshift-master/private/tasks/wire_aggregator.yml4
1 files changed, 2 insertions, 2 deletions
diff --git a/playbooks/openshift-master/private/tasks/wire_aggregator.yml b/playbooks/openshift-master/private/tasks/wire_aggregator.yml
index 4f55d5c82..59e2b515c 100644
--- a/playbooks/openshift-master/private/tasks/wire_aggregator.yml
+++ b/playbooks/openshift-master/private/tasks/wire_aggregator.yml
@@ -21,7 +21,7 @@
# TODO: this currently has a bug where hostnames are required
- name: Creating First Master Aggregator signer certs
command: >
- {{ hostvars[groups.oo_first_master.0].openshift.common.client_binary }} adm ca create-signer-cert
+ {{ hostvars[groups.oo_first_master.0]['first_master_client_binary'] }} adm ca create-signer-cert
--cert=/etc/origin/master/front-proxy-ca.crt
--key=/etc/origin/master/front-proxy-ca.key
--serial=/etc/origin/master/ca.serial.txt
@@ -84,7 +84,7 @@
- block:
- name: Create first master api-client config for Aggregator
command: >
- {{ hostvars[groups.oo_first_master.0].openshift.common.client_binary }} adm create-api-client-config
+ {{ hostvars[groups.oo_first_master.0]['first_master_client_binary'] }} adm create-api-client-config
--certificate-authority=/etc/origin/master/front-proxy-ca.crt
--signer-cert=/etc/origin/master/front-proxy-ca.crt
--signer-key=/etc/origin/master/front-proxy-ca.key