Merge branch 'development' of github.com:sborenst/ansible_agnostic_deployer...

jbride

2018-08-30 9d3658941e9c4113038476a6fd5739fbe2a569ed

Merge branch 'development' of github.com:sborenst/ansible_agnostic_deployer into development

 ansible/configs/ocp-workshop/post_software.yml

@@ -717,7 +717,7 @@
  vars:
    zabbix_auto_registration_keyword: OCP Host
  tasks:
    - when: install_zabbix_bool
    - when: install_zabbix|bool
      include_role:
        name: "{{ ANSIBLE_REPO_PATH }}/roles/zabbix-client"
  tags:

 ansible/configs/rhte-ocp-workshop/post_software.yml

@@ -719,7 +719,7 @@
  vars:
    zabbix_auto_registration_keyword: OCP Host
  tasks:
    - when: install_zabbix_bool
    - when: install_zabbix|bool
      include_role:
        name: "{{ ANSIBLE_REPO_PATH }}/roles/zabbix-client"
  tags:

 ansible/roles/infra-ec2-template-create/tasks/main.yml

@@ -42,7 +42,10 @@
      register: cloudformation_out
      until: >-
        cloudformation_out is succeeded
        or cloudformation_out.output in ["Stack CREATE complete", "Stack is already up-to-date."]
        or (
          'output' in cloudformation_out
          and cloudformation_out.output in ["Stack CREATE complete", "Stack is already up-to-date."]
        )
      retries: "{{ cloudformation_retries | default(3) }}"
      delay: "{{ cloudformation_retry_delay | default(30) }}"
      ignore_errors: yes