Infrastructure/ansible
1
0
Fork 0
Code Issues Pull requests 6 Projects Releases Packages Wiki Activity Actions

Merge branch 'master' of /git/ansible

Browse source
This commit is contained in:
Stephen Smoogen 2017-05-11 21:41:06 +00:00
commit aa3b266625
2 changed files with 14 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

22
roles/ansible-ansible-openshift-ansible/tasks/main.yml
View file

@ -20,19 +20,19 @@
src: "cluster-inventory.j2" src: "cluster-inventory.j2"
dest: "{{ openshift_ansible_path }}/{{ cluster_inventory_filename }}" dest: "{{ openshift_ansible_path }}/{{ cluster_inventory_filename }}"
#- name: run ansible - name: run ansible
# shell: "ansible-playbook {{ openshift_ansible_playbook }} -i {{ cluster_inventory_filename }}" shell: "ansible-playbook {{ openshift_ansible_playbook }} -i {{ cluster_inventory_filename }}"
# args: args:
# chdir: "{{ openshift_ansible_path }}" chdir: "{{ openshift_ansible_path }}"
# register: run_ansible_out register: run_ansible_out
#- name: display run ansible stdout_lines - name: display run ansible stdout_lines
# debug: debug:
# var: run_ansible_out.stdout_lines var: run_ansible_out.stdout_lines
#- name: display run ansible stderr - name: display run ansible stderr
# debug: debug:
# var: run_ansible_out.stderr var: run_ansible_out.stderr

6
roles/haproxy/templates/haproxy.cfg
View file

@ -430,9 +430,9 @@ listen mbs 0.0.0.0:10063
{% if env == "staging" %} {% if env == "staging" %}
listen os-master 0.0.0.0:10064 listen os-master 0.0.0.0:10064
balance hdr(appserver) 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-master01:443 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:443 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:443 check inter 10s rise 1 fall 2 ssl verify required ca-file /etc/haproxy/os-master.pem
option httpchk GET / option httpchk GET /
{% endif %} {% endif %}