Revision 031ca67d

b/kamaki/cli/commands/errors.py
81 81
                    if not client:
82 82
                        raise
83 83
                    url = getattr(client, 'base_url', '<empty>')
84
                    msg = 'Invalid service url %s' % url
84
                    msg = 'Invalid service URL %s' % url
85 85
                    raiseCLIError(ce, msg, details=[
86
                        'Check if authentication url is correct',
87
                        '  check current url:',
86
                        'Check if authentication URL is correct',
87
                        '  check current URL:',
88 88
                        '    /config get cloud.default.url',
89
                        '  set new auth. url:',
89
                        '  set new authentication URL:',
90 90
                        '    /config set cloud.default.url'] + CLOUDNAME)
91 91
                raise
92 92
        return _raise
......
115 115
            if not getattr(client, 'base_url', False):
116 116
                msg = 'Missing synnefo authentication URL'
117 117
                raise CLIError(msg, importance=3, details=[
118
                    'Check if authentication url is correct',
119
                        '  check current url:',
118
                    'Check if authentication URL is correct',
119
                        '  check current URL:',
120 120
                        '    /config get cloud.default.url',
121
                        '  set new auth. url:',
121
                        '  set new auth. URL:',
122 122
                        '    /config set cloud.default.url'] + CLOUDNAME)
123 123
            return r
124 124
        return _raise
b/kamaki/cli/errors.py
73 73

  
74 74
class CLIBaseUrlError(CLIError):
75 75
    def __init__(self, message='', details=[], importance=2, service=None):
76
        message = message or 'No url for %s' % service.lower()
76
        message = message or 'No URL for %s' % service.lower()
77 77
        details = details or [
78 78
            'Two options to resolve this:',
79 79
            '(Use the correct cloud name, instead of "default")',
......
83 83
            '  /config set cloud.default.token <t0k3n>',
84 84
            'B. (advanced users) Explicitly set a valid %s endpoint URL' % (
85 85
                service.upper()),
86
            'Note: url option has a higher priority, so delete it to',
86
            'Note: URL option has a higher priority, so delete it to',
87 87
            'make that work',
88 88
            '  /config delete cloud.default.url',
89 89
            '  /config set cloud.%s.url <%s_URL>' % (

Also available in: Unified diff