summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJhon Honce <jhonce@redhat.com>2015-02-20 14:36:48 -0700
committerJhon Honce <jhonce@redhat.com>2015-02-20 14:36:48 -0700
commit8e299557333c7d35368d12a030344e676bbed831 (patch)
treee8969dc8558507512f665174f5229917f83c9450
parent551dccac66421664a87de523c0e3cc2a6392beb9 (diff)
parentfd4d628907438ecb6372590d7ed67016b9e00de1 (diff)
downloadopenshift-8e299557333c7d35368d12a030344e676bbed831.tar.gz
openshift-8e299557333c7d35368d12a030344e676bbed831.tar.bz2
openshift-8e299557333c7d35368d12a030344e676bbed831.tar.xz
openshift-8e299557333c7d35368d12a030344e676bbed831.zip
Merge pull request #75 from jwhonce/wip/ssl
Fix SSL support between master and node(s)
-rw-r--r--playbooks/gce/openshift-node/launch.yml10
-rw-r--r--roles/openshift_node/tasks/main.yml3
2 files changed, 12 insertions, 1 deletions
diff --git a/playbooks/gce/openshift-node/launch.yml b/playbooks/gce/openshift-node/launch.yml
index f2800b061..935599efd 100644
--- a/playbooks/gce/openshift-node/launch.yml
+++ b/playbooks/gce/openshift-node/launch.yml
@@ -45,3 +45,13 @@
# Apply the configs, separate so that just the configs can be run by themselves
- include: config.yml
+
+# Always bounce service to pick up new credentials
+#- name: "Restart instances"
+# hosts: oo_hosts_to_config
+# connection: ssh
+# user: root
+# tasks:
+# - debug: var=groups.oo_hosts_to_config
+# - name: Restart OpenShift
+# service: name=openshift-node enabled=yes state=restarted
diff --git a/roles/openshift_node/tasks/main.yml b/roles/openshift_node/tasks/main.yml
index deff80a3d..8a0694905 100644
--- a/roles/openshift_node/tasks/main.yml
+++ b/roles/openshift_node/tasks/main.yml
@@ -37,8 +37,9 @@
- name: Save firewalld port for OpenShift
firewalld: port=10250/tcp permanent=true state=enabled
+ # fixme: Once the openshift_cluster playbook is published state should be started
# Always bounce service to pick up new credentials
- name: Enable OpenShift
- service: name=openshift-node enabled=yes state=started
+ service: name=openshift-node enabled=yes state=restarted
- local_action: file name={{ mktemp.stdout }} state=absent