Browse Source

Merge "Improve facter cache reliability"

tags/1.4.0
Zuul 1 month ago
committed by Gerrit Code Review
parent
commit
ffa3dbc25c
3 changed files with 6 additions and 3 deletions
  1. +1
    -0
      tripleo_ansible/roles/tripleo_puppet_cache/defaults/main.yml
  2. +1
    -1
      tripleo_ansible/roles/tripleo_puppet_cache/molecule/default/prepare.yml
  3. +4
    -2
      tripleo_ansible/roles/tripleo_puppet_cache/tasks/main.yml

+ 1
- 0
tripleo_ansible/roles/tripleo_puppet_cache/defaults/main.yml View File

@@ -21,6 +21,7 @@
tripleo_puppet_cache_base_dir: /var/lib/container-puppet/puppetlabs
tripleo_puppet_cache_config: |
facts : {
blocklist: [ "EC2" ],
ttls: [
{ "kernel" : 8 hour },
{ "memory" : 8 hour },


+ 1
- 1
tripleo_ansible/roles/tripleo_puppet_cache/molecule/default/prepare.yml View File

@@ -19,7 +19,7 @@
hosts: all
vars:
required_packages:
- puppet
- facter
- rsync
roles:
- role: test_deps


+ 4
- 2
tripleo_ansible/roles/tripleo_puppet_cache/tasks/main.yml View File

@@ -80,13 +80,15 @@
become: true
check_mode: false
shell: facter --config "{{ tripleo_puppet_cache_base_dir }}/facter.conf"
retries: 5
delay: 5
no_log: true
failed_when: false
register: _facter_cache_run

- name: Facter error output when failed
- name: Failed deployment if facter fails
check_mode: false
debug:
fail:
msg: "{{ _facter_cache_run.stderr }}"
when: _facter_cache_run.rc != 0



Loading…
Cancel
Save