summaryrefslogtreecommitdiffstats
path: root/playbooks/common
diff options
context:
space:
mode:
authorScott Dodson <sdodson@redhat.com>2015-06-10 10:31:39 -0400
committerScott Dodson <sdodson@redhat.com>2015-06-16 15:52:44 -0400
commit7b316631a2b988318b47d3a50a7b66e3ff3fdbd2 (patch)
tree065562cf45a0fb03a6cd66844ee655188325685d /playbooks/common
parente903a6b5be49728e31756e5114f7c6ed2553747a (diff)
downloadopenshift-7b316631a2b988318b47d3a50a7b66e3ff3fdbd2.tar.gz
openshift-7b316631a2b988318b47d3a50a7b66e3ff3fdbd2.tar.bz2
openshift-7b316631a2b988318b47d3a50a7b66e3ff3fdbd2.tar.xz
openshift-7b316631a2b988318b47d3a50a7b66e3ff3fdbd2.zip
Update for RC2 changes
Remove openshift-deployer.kubeconfig from master template Sync config template Update enterprise image names Switch to node auto registration Add deployer to list of serviceAccountConfig.managedNames Move package installation before registering facts change default kubeconfig location Change system:openshift-client to system:openshift-master Rename node cert/key/kubeconfig per openshift/origin#3160 Update references to /var/lib/openshift/openshift.local.certificates
Diffstat (limited to 'playbooks/common')
-rw-r--r--playbooks/common/openshift-node/config.yml10
1 files changed, 6 insertions, 4 deletions
diff --git a/playbooks/common/openshift-node/config.yml b/playbooks/common/openshift-node/config.yml
index 9e642f3d3..2d2560db4 100644
--- a/playbooks/common/openshift-node/config.yml
+++ b/playbooks/common/openshift-node/config.yml
@@ -27,10 +27,12 @@
stat:
path: "{{ item }}"
with_items:
- - "/etc/openshift/node/node.key"
- - "/etc/openshift/node/node.kubeconfig"
+ - "/etc/openshift/node/system:node:{{ openshift.common.hostname }}.crt"
+ - "/etc/openshift/node/system:node:{{ openshift.common.hostname }}.key"
+ - "/etc/openshift/node/system:node:{{ openshift.common.hostname }}.kubeconfig"
- "/etc/openshift/node/ca.crt"
- "/etc/openshift/node/server.key"
+ - "/etc/openshift/node/server.crt"
register: stat_result
- set_fact:
certs_missing: "{{ stat_result.results | map(attribute='stat.exists')
@@ -50,7 +52,7 @@
register: mktemp
changed_when: False
-- name: Register nodes
+- name: Create node certificates
hosts: oo_first_master
vars:
nodes_needing_certs: "{{ hostvars
@@ -60,7 +62,7 @@
| oo_select_keys(groups['oo_nodes_to_config']) }}"
sync_tmpdir: "{{ hostvars.localhost.mktemp.stdout }}"
roles:
- - openshift_register_nodes
+ - openshift_node_certificates
post_tasks:
- name: Create a tarball of the node config directories
command: >