Merge "Fix haproxy firewall rules"
This commit is contained in:
commit
9f7fbe0678
|
@ -430,6 +430,12 @@ outputs:
|
|||
docker_puppet_process_count: DOCKER_PUPPET_PROCESS_COUNT
|
||||
docker_puppet_mount_host_puppet: DOCKER_PUPPET_MOUNT_HOST_PUPPET
|
||||
tasks:
|
||||
- name: Write the config_step hieradata for the deploy step {{step}} tasks
|
||||
copy:
|
||||
content: "{{ '{{' }} dict(step=step|int) | to_json {{ '}}' }}"
|
||||
dest: /etc/puppet/hieradata/config_step.json
|
||||
force: true
|
||||
mode: '0600'
|
||||
{%- for role in roles %}
|
||||
- import_tasks: {{role.name}}/deploy_steps_tasks.yaml
|
||||
when: tripleo_role_name == '{{role.name}}'
|
||||
|
|
|
@ -284,9 +284,8 @@ outputs:
|
|||
when: step|int == 1
|
||||
shell: |
|
||||
set +e
|
||||
export FACTER_step=1
|
||||
puppet apply {{ puppet_debug }} --detailed-exitcodes --summarize --color=false \
|
||||
--modulepath {{ puppet_modulepath }} --tags {{ puppet_tags }} -e {{ puppet_execute }}
|
||||
--modulepath '{{ puppet_modulepath }}' --tags '{{ puppet_tags }}' -e '{{ puppet_execute }}'
|
||||
rc=$?
|
||||
set -e
|
||||
set +ux
|
||||
|
@ -296,8 +295,8 @@ outputs:
|
|||
exit $rc
|
||||
vars:
|
||||
puppet_execute: include ::tripleo::profile::base::haproxy
|
||||
puppet_tags: 'tripleo::firewall::rule'
|
||||
puppet_modulepath: '/etc/puppet/modules:/opt/stack/puppet-modules:/usr/share/openstack-puppet/modules'
|
||||
puppet_tags: tripleo::firewall::rule
|
||||
puppet_modulepath: /etc/puppet/modules:/opt/stack/puppet-modules:/usr/share/openstack-puppet/modules
|
||||
puppet_debug:
|
||||
if:
|
||||
- puppet_debug_enabled
|
||||
|
|
|
@ -335,9 +335,8 @@ outputs:
|
|||
when: step|int == 2
|
||||
shell: |
|
||||
set +e
|
||||
export FACTER_step=2
|
||||
puppet apply {{ puppet_debug }} --detailed-exitcodes --summarize --color=false \
|
||||
--modulepath {{ puppet_modulepath }} --tags {{ puppet_tags }} -e {{ puppet_execute }}
|
||||
--modulepath '{{ puppet_modulepath }}' --tags '{{ puppet_tags }}' -e '{{ puppet_execute }}'
|
||||
rc=$?
|
||||
set -e
|
||||
set +ux
|
||||
|
@ -346,9 +345,9 @@ outputs:
|
|||
fi
|
||||
exit $rc
|
||||
vars:
|
||||
puppet_execute: include ::tripleo::profile::pacemaker::haproxy
|
||||
puppet_tags: 'tripleo::firewall::rule'
|
||||
puppet_modulepath: '/etc/puppet/modules:/opt/stack/puppet-modules:/usr/share/openstack-puppet/modules'
|
||||
puppet_execute: include ::tripleo::profile::base::haproxy
|
||||
puppet_tags: tripleo::firewall::rule
|
||||
puppet_modulepath: /etc/puppet/modules:/opt/stack/puppet-modules:/usr/share/openstack-puppet/modules
|
||||
puppet_debug:
|
||||
if:
|
||||
- puppet_debug_enabled
|
||||
|
|
Loading…
Reference in New Issue