diff options
| author | Jason DeTiberus <jdetiber@redhat.com> | 2015-03-06 15:34:48 -0500 |
|---|---|---|
| committer | Jason DeTiberus <jdetiber@redhat.com> | 2015-03-06 16:02:32 -0500 |
| commit | ae3d2ae161ca6ee41b50e8e399dbbf887826d4af (patch) | |
| tree | 5c1c8b447eb75f4936c815496537d0db197c02b4 | |
| parent | 3aed7219448ab99377643c71d05f2a26b6e11c99 (diff) | |
| download | openshift-ae3d2ae161ca6ee41b50e8e399dbbf887826d4af.tar.gz openshift-ae3d2ae161ca6ee41b50e8e399dbbf887826d4af.tar.bz2 openshift-ae3d2ae161ca6ee41b50e8e399dbbf887826d4af.tar.xz openshift-ae3d2ae161ca6ee41b50e8e399dbbf887826d4af.zip | |
Fix issues with openshift_sdn_node
- Use openshift_hostname (set from openshift_common) instead of calculating it
again using the openshift_common variables
- Fix the task setting facts for openshift_sdn_node that was using references
to master instead
| -rw-r--r-- | roles/openshift_sdn_node/tasks/main.yml | 8 |
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 |