← Back to branch summary

~andreserl/maas/packaging_1.9.0rc1

« back to all changes in this revision

Viewing changes to debian/maas-region-controller-min.apport

[r=andreserl][bug=][author=allenap] Use new local configuration support for the cluster.

Show diffs side-by-side

added added

removed removed

Lines of Context:
debian/maas-region-controller-min.apport
36
36
 
37
37
def add_info(report, ui):
38
38
    response = ui.yesno(
39
 
        "The contents of your /etc/maas/regiond.conf, "
40
 
        "/etc/maas/pserv.yaml files may help developers diagnose your bug "
41
 
        "more quickly.  However, it may contain sensitive information.  Do "
42
 
        "you want to include it in your bug report?")
 
39
        "The contents of /etc/maas/regiond.conf and /etc/maas/clusterd.conf "
 
40
        "may help developers diagnose your bug more quickly. However, it may "
 
41
        "contain sensitive information. Do you want to include it in your bug "
 
42
        "report?")
43
43
 
44
 
    if response is None:  # user cancelled
 
44
    if response is None:
 
45
        # The user cancelled.
45
46
        raise StopIteration
46
47
    elif response is True:
 
48
        # The user agreed to include the configuration files.
47
49
        attach_conffiles(report, 'maas')
48
50
        attach_file_if_exists(
49
51
            report, '/etc/maas/regiond.conf', 'MAASRegionConfig')
 
52
        attach_file_if_exists(
 
53
            report, '/etc/maas/clusterd.conf', 'MAASClusterConfig')
 
54
    else:
 
55
        # The user declined to include the configuration files.
 
56
        pass
50
57
 
51
58
    # Attaching log files (Upstart).
52
59
    attach_file_if_exists(