Fix integration jobs
- Add missing sudos (and remove needless ones) - Don't carry sudo environment, we can add it back if it becomes necessary - Fix permission errors when exporting command output to files - Increase ulimit, we'd run into too many open files in the gate - Add some relevant logfiles to help troubleshoot issues - Re-export path to ensure common file paths are included - Don't assume "ip" is installed, it's provided by iproute - Don't assume "restorecon" is installed, it's provided by policycoreutils - Don't run packstack twice (--allinone will trigger a run even if -gen-answer-file is used, so switch to using --default-password instead) - Use symlink for defaults.yaml instead of common.yaml - Handled Hiera cleanup - Use debug mode in scenarios - Fix tempest subunit retrieval with sudo Co-Authored-By: Martin Magr <mmagr@redhat.com> Co-Authored-By: David Moreau Simard <dms@redhat.com> Change-Id: I7a363308cd9df981c0a1680171b9b2f2b95dd29e
This commit is contained in:
committed by
David Moreau Simard
parent
8741eb74ed
commit
f5c884883a
@@ -24,9 +24,9 @@ controller = Controller()
|
||||
|
||||
PUPPET_DIR = os.path.join(basedefs.DIR_PROJECT_DIR, "puppet")
|
||||
PUPPET_TEMPLATE_DIR = os.path.join(PUPPET_DIR, "templates")
|
||||
HIERA_DEFAULTS_YAML = os.path.join(basedefs.HIERADATA_DIR, "defaults.yaml")
|
||||
# For compatibility with hiera >= 3.0
|
||||
HIERA_COMMON_YAML = os.path.join(basedefs.HIERADATA_DIR, "common.yaml")
|
||||
# For compatibility with hiera < 3.0
|
||||
HIERA_DEFAULTS_YAML = os.path.join(basedefs.HIERADATA_DIR, "defaults.yaml")
|
||||
|
||||
|
||||
class ManifestFiles(object):
|
||||
@@ -90,11 +90,11 @@ def prependManifestFile(manifest_name, data, marker=''):
|
||||
|
||||
def generateHieraDataFile():
|
||||
os.mkdir(basedefs.HIERADATA_DIR, 0o700)
|
||||
with open(HIERA_DEFAULTS_YAML, 'w') as outfile:
|
||||
with open(HIERA_COMMON_YAML, 'w') as outfile:
|
||||
outfile.write(yaml.dump(controller.CONF,
|
||||
explicit_start=True,
|
||||
default_flow_style=False))
|
||||
os.symlink(HIERA_DEFAULTS_YAML, HIERA_COMMON_YAML)
|
||||
os.symlink(os.path.basename(HIERA_COMMON_YAML), HIERA_DEFAULTS_YAML)
|
||||
|
||||
|
||||
def createFirewallResources(hiera_key, default_value='{}'):
|
||||
|
||||
Reference in New Issue
Block a user