summaryrefslogtreecommitdiffstats
path: root/roles/openshift_node/tasks
diff options
context:
space:
mode:
authorThomas Wiest <twiest@users.noreply.github.com>2015-03-02 07:52:55 -0500
committerThomas Wiest <twiest@users.noreply.github.com>2015-03-02 07:52:55 -0500
commite836cad9b4703e62ffbe6867d00b4a346529b145 (patch)
tree7ed6204309094c8da39f6acfdad98c832cdc6b1e /roles/openshift_node/tasks
parent40d4af7d2760ec625155c726962615a79f4ce114 (diff)
parentecb5264b0009b5f8951181b49ccb18ec5150f4cc (diff)
downloadopenshift-e836cad9b4703e62ffbe6867d00b4a346529b145.tar.gz
openshift-e836cad9b4703e62ffbe6867d00b4a346529b145.tar.bz2
openshift-e836cad9b4703e62ffbe6867d00b4a346529b145.tar.xz
openshift-e836cad9b4703e62ffbe6867d00b4a346529b145.zip
Merge pull request #84 from detiber/commonbugfixes
Bugfixes for openshift-common related changes
Diffstat (limited to 'roles/openshift_node/tasks')
-rw-r--r--roles/openshift_node/tasks/main.yml9
1 files changed, 4 insertions, 5 deletions
diff --git a/roles/openshift_node/tasks/main.yml b/roles/openshift_node/tasks/main.yml
index e103daa83..ca357c782 100644
--- a/roles/openshift_node/tasks/main.yml
+++ b/roles/openshift_node/tasks/main.yml
@@ -19,9 +19,6 @@
- name: Store OpenShift Master credentials
local_action: command /usr/bin/rsync --compress --archive --rsh 'ssh -S none -o StrictHostKeyChecking=no -o UserKnownHostsFile=/dev/null' {{ mktemp.stdout }}/ root@{{ openshift_public_ip }}:/var/lib/openshift/openshift.local.certificates/admin
ignore_errors: yes
- # fixme: Once the openshift_cluster playbook is published state should be started
- # Always bounce service to pick up new credentials
- notify: restart openshift-node
- local_action: file name={{ mktemp.stdout }} state=absent
@@ -34,10 +31,12 @@
lineinfile:
dest: /etc/sysconfig/openshift-node
regexp: '^OPTIONS='
- line: "OPTIONS=\"--master=http://{{ openshift_master_ips[0] }}:8080 --loglevel={{ openshift_node_debug_level }}\""
+ line: "OPTIONS=\"--master=https://{{ openshift_master_ips[0] }}:8443 --loglevel={{ openshift_node_debug_level }}\""
notify:
- restart openshift-node
+# fixme: Once the openshift_cluster playbook is published state should be started
+# Always bounce service to pick up new credentials
- name: Start and enable openshift-node
- service: name=openshift-node enabled=yes state=started
+ service: name=openshift-node enabled=yes state=restarted
when: not openshift_node_manage_service_externally