summaryrefslogtreecommitdiffstats
path: root/roles
diff options
context:
space:
mode:
authorThomas Wiest <twiest@users.noreply.github.com>2015-03-06 16:12:42 -0500
committerThomas Wiest <twiest@users.noreply.github.com>2015-03-06 16:12:42 -0500
commit77008d93e094ab284d869c4bb61dbb06941fa84f (patch)
tree345028ae647e04f7e0854ff94421b70e8cdde1c2 /roles
parent73639efb5d745cfabb33b91c0ec9400837f41f15 (diff)
parentae3d2ae161ca6ee41b50e8e399dbbf887826d4af (diff)
downloadopenshift-77008d93e094ab284d869c4bb61dbb06941fa84f.tar.gz
openshift-77008d93e094ab284d869c4bb61dbb06941fa84f.tar.bz2
openshift-77008d93e094ab284d869c4bb61dbb06941fa84f.tar.xz
openshift-77008d93e094ab284d869c4bb61dbb06941fa84f.zip
Merge pull request #101 from detiber/SdnWhoops
Fix issues with openshift_sdn_node
Diffstat (limited to 'roles')
-rw-r--r--roles/openshift_sdn_node/tasks/main.yml8
1 files changed, 4 insertions, 4 deletions
diff --git a/roles/openshift_sdn_node/tasks/main.yml b/roles/openshift_sdn_node/tasks/main.yml
index 71bba2f92..ff05a6972 100644
--- a/roles/openshift_sdn_node/tasks/main.yml
+++ b/roles/openshift_sdn_node/tasks/main.yml
@@ -14,7 +14,7 @@
backrefs: yes
with_items:
- regex: '^(OPTIONS=)'
- line: '\1"-v={{ openshift_sdn_node_debug_level }} -hostname={{ openshift_bind_ip if openshift_hostname_workaround else ansible_fqdn }}"'
+ line: '\1"-v={{ openshift_sdn_node_debug_level }} -hostname={{ openshift_hostname }}"'
- regex: '^(MASTER_URL=)'
line: '\1"http://{{ openshift_master_ips | first }}:4001"'
- regex: '^(MINION_IP=)'
@@ -25,12 +25,12 @@
line: '\1"--insecure-registry=0.0.0.0/0 -b=lbr0 --mtu=1450 --selinux-enabled"'
notify: restart openshift-sdn-node
-- name: Set openshift-sdn-master facts
+- name: Set openshift-sdn-node facts
include: "{{ role_path | dirname }}/openshift_common/tasks/set_facts.yml"
facts:
- - section: sdn-master
+ - section: sdn-node
option: debug_level
- value: "{{ openshift_sdn_master_debug_level }}"
+ value: "{{ openshift_sdn_node_debug_level }}"
# fixme: Once the openshift_cluster playbook is published state should be started
# Always bounce service to pick up new credentials