log_driver and log_opt moved to logging key.

[dbonev]

Moving log_driver and log_opt to a new logging key:

logging:
    driver:
    options:

Implements #2503

Signed-off-by: Dimitar Bonev dimitar.bonev@gmail.com

[aanand]

I'd prefer if we didn't perform mutation in a utility function like this, as long as there's a nice way to do it without. Maybe:

1. Move 'logging' out of DOCKER_CONFIG_OPTIONS and into ALLOWED_KEYS.
2. In in _get_container_create_options:

container_options.update(self.get_logging_options())

3. get_logging_options:

   def get_logging_options(self):
       logging_dict = self.options.get('logging', {})
       return {
           'log_driver': logging_dict.get('driver', ""),
           'log_opt': logging_dict.get('options', None),
       }

[aanand]

Nice, thanks. Ideally the logging key would only apply for users of the new file format, so this is blocking on #2421. You could implement it on top of that branch so that it's ready to go once that PR is merged.

[dbonev]

@aanand Thanks for the feedback.

I'd prefer if we didn't perform mutation in a utility function like this, as long as there's a nice way to do it without.

Note taken -- did it this way.

so this is blocking on #2421.

I'll make sure it applies cleanly on top of #2421 branch.
Thanks.