← Back to branch summary

~fo0bar/turku/turku-agent-encoding

« back to all changes in this revision

Viewing changes to turku_agent/update_config.py

  • Committer: Ryan Finnie
  • Date: 2019-04-22 01:19:36 UTC
  • Revision ID: ryan.finnie@canonical.com-20190422011936-04wxzzmi9da361x1
Remove early legacy config migrations/mitigations

Show diffs side-by-side

added added

removed removed

Lines of Context:
turku_agent/update_config.py
105
105
 
106
106
    api_out = {}
107
107
    if ('api_auth_name' in config) and ('api_auth_secret' in config):
 
108
        # name/secret style
108
109
        api_out['auth'] = {
109
110
            'name': config['api_auth_name'],
110
111
            'secret': config['api_auth_secret'],
111
112
        }
112
113
    else:
113
 
        # XXX legacy
 
114
        # nameless secret style
114
115
        api_out['auth'] = config['api_auth']
115
116
 
116
117
    # Merge the following options into the machine section
154
155
        return 1
155
156
    restart_services()
156
157
 
157
 
    from .utils import migrate_configs
158
 
    migrate_configs(config)
159
 
 
160
158
    lock.close()