summaryrefslogtreecommitdiffstats
path: root/playbooks/common/openshift-node/config.yml
diff options
context:
space:
mode:
authorWesley Hearn <wesley.s.hearn@gmail.com>2015-08-28 14:00:23 -0400
committerWesley Hearn <wesley.s.hearn@gmail.com>2015-08-28 14:00:23 -0400
commit8dd04af47c574a0e4c98f5cab55283be04fa1683 (patch)
tree7fa25006f802a36feb8db5af2a2f7b60abba42ca /playbooks/common/openshift-node/config.yml
parent68223f205b6c4e6ea124ccc982cd9bbcba63ced6 (diff)
parent1b3fff6248fbd6788a26ee2b6c60f7731891c0f4 (diff)
downloadopenshift-8dd04af47c574a0e4c98f5cab55283be04fa1683.tar.gz
openshift-8dd04af47c574a0e4c98f5cab55283be04fa1683.tar.bz2
openshift-8dd04af47c574a0e4c98f5cab55283be04fa1683.tar.xz
openshift-8dd04af47c574a0e4c98f5cab55283be04fa1683.zip
Merge pull request #512 from sdodson/next
Merge in Atomic Enterprise work into master
Diffstat (limited to 'playbooks/common/openshift-node/config.yml')
-rw-r--r--playbooks/common/openshift-node/config.yml10
1 files changed, 5 insertions, 5 deletions
diff --git a/playbooks/common/openshift-node/config.yml b/playbooks/common/openshift-node/config.yml
index e0060a9a3..ba2f40d55 100644
--- a/playbooks/common/openshift-node/config.yml
+++ b/playbooks/common/openshift-node/config.yml
@@ -22,7 +22,7 @@
annotations: "{{ openshift_node_annotations | default(None) }}"
- name: Check status of node certificates
stat:
- path: "/etc/openshift/node/{{ item }}"
+ path: "{{ openshift.common.config_base }}/node/{{ item }}"
with_items:
- "system:node:{{ openshift.common.hostname }}.crt"
- "system:node:{{ openshift.common.hostname }}.key"
@@ -35,8 +35,8 @@
certs_missing: "{{ stat_result.results | map(attribute='stat.exists')
| list | intersect([false])}}"
node_subdir: node-{{ openshift.common.hostname }}
- config_dir: /etc/openshift/generated-configs/node-{{ openshift.common.hostname }}
- node_cert_dir: /etc/openshift/node
+ config_dir: "{{ openshift.common.config_base }}/generated-configs/node-{{ openshift.common.hostname }}"
+ node_cert_dir: "{{ openshift.common.config_base }}/node"
- name: Create temp directory for syncing certs
hosts: localhost
@@ -89,9 +89,9 @@
path: "{{ node_cert_dir }}"
state: directory
- # TODO: notify restart openshift-node
+ # TODO: notify restart node
# possibly test service started time against certificate/config file
- # timestamps in openshift-node to trigger notify
+ # timestamps in node to trigger notify
- name: Unarchive the tarball on the node
unarchive:
src: "{{ sync_tmpdir }}/{{ node_subdir }}.tgz"