From 03560df291bb1d87077bdd01f751ac34d01d41f8 Mon Sep 17 00:00:00 2001 From: Patrick Uiterwijk Date: Thu, 11 May 2017 21:27:51 +0000 Subject: [PATCH 1/2] Run the playbook Signed-off-by: Patrick Uiterwijk --- .../tasks/main.yml | 22 +++++++++---------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/roles/ansible-ansible-openshift-ansible/tasks/main.yml b/roles/ansible-ansible-openshift-ansible/tasks/main.yml index bf1ef9b613..33637099d8 100644 --- a/roles/ansible-ansible-openshift-ansible/tasks/main.yml +++ b/roles/ansible-ansible-openshift-ansible/tasks/main.yml @@ -20,19 +20,19 @@ src: "cluster-inventory.j2" dest: "{{ openshift_ansible_path }}/{{ cluster_inventory_filename }}" -#- name: run ansible -# shell: "ansible-playbook {{ openshift_ansible_playbook }} -i {{ cluster_inventory_filename }}" -# args: -# chdir: "{{ openshift_ansible_path }}" -# register: run_ansible_out +- name: run ansible + shell: "ansible-playbook {{ openshift_ansible_playbook }} -i {{ cluster_inventory_filename }}" + args: + chdir: "{{ openshift_ansible_path }}" + register: run_ansible_out -#- name: display run ansible stdout_lines -# debug: -# var: run_ansible_out.stdout_lines +- name: display run ansible stdout_lines + debug: + var: run_ansible_out.stdout_lines -#- name: display run ansible stderr -# debug: -# var: run_ansible_out.stderr +- name: display run ansible stderr + debug: + var: run_ansible_out.stderr From 4a5126fb84004396ee1aa4604e4241fe161a6835 Mon Sep 17 00:00:00 2001 From: Patrick Uiterwijk Date: Thu, 11 May 2017 21:34:50 +0000 Subject: [PATCH 2/2] os api is moved to 443 Signed-off-by: Patrick Uiterwijk --- roles/haproxy/templates/haproxy.cfg | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/roles/haproxy/templates/haproxy.cfg b/roles/haproxy/templates/haproxy.cfg index 4c960699bf..f751f8dcd2 100644 --- a/roles/haproxy/templates/haproxy.cfg +++ b/roles/haproxy/templates/haproxy.cfg @@ -430,9 +430,9 @@ listen mbs 0.0.0.0:10063 {% if env == "staging" %} listen os-master 0.0.0.0:10064 balance hdr(appserver) - server os-master01 os-master01:8443 check inter 10s rise 1 fall 2 ssl verify required ca-file /etc/haproxy/os-master.pem - server os-master01 os-master02:8443 check inter 10s rise 1 fall 2 ssl verify required ca-file /etc/haproxy/os-master.pem - server os-master01 os-master02:8443 check inter 10s rise 1 fall 2 ssl verify required ca-file /etc/haproxy/os-master.pem + server os-master01 os-master01:443 check inter 10s rise 1 fall 2 ssl verify required ca-file /etc/haproxy/os-master.pem + server os-master01 os-master02:443 check inter 10s rise 1 fall 2 ssl verify required ca-file /etc/haproxy/os-master.pem + server os-master01 os-master02:443 check inter 10s rise 1 fall 2 ssl verify required ca-file /etc/haproxy/os-master.pem option httpchk GET / {% endif %}