Sieben has proposed merging ~remy-leone/cloud-init:dict_litteral into cloud-init:master.
Requested reviews: cloud-init commiters (cloud-init-dev) For more details, see: https://code.launchpad.net/~remy-leone/cloud-init/+git/cloud-init/+merge/340238 -- Your team cloud-init commiters is requested to review the proposed merge of ~remy-leone/cloud-init:dict_litteral into cloud-init:master.
diff --git a/cloudinit/config/cc_phone_home.py b/cloudinit/config/cc_phone_home.py index 878069b..d838707 100644 --- a/cloudinit/config/cc_phone_home.py +++ b/cloudinit/config/cc_phone_home.py @@ -95,10 +95,8 @@ def handle(name, cfg, cloud, log, args): if post_list == "all": post_list = POST_LIST_ALL - all_keys = {} - all_keys['instance_id'] = cloud.get_instance_id() - all_keys['hostname'] = cloud.get_hostname() - all_keys['fqdn'] = cloud.get_hostname(fqdn=True) + all_keys = {'instance_id': cloud.get_instance_id(), 'hostname': cloud.get_hostname(), + 'fqdn': cloud.get_hostname(fqdn=True)} pubkeys = { 'pub_key_dsa': '/etc/ssh/ssh_host_dsa_key.pub', diff --git a/cloudinit/distros/net_util.py b/cloudinit/distros/net_util.py index 1ce1aa7..d9d827c 100644 --- a/cloudinit/distros/net_util.py +++ b/cloudinit/distros/net_util.py @@ -113,8 +113,7 @@ def translate_network(settings): dev_name = dev if not dev_name: continue - iface_info = {} - iface_info['ipv6'] = {} + iface_info = {'ipv6': {}} if len(iface_details) >= 3: proto_type = iface_details[2].strip().lower() # Seems like this can be 'loopback' which we don't diff --git a/cloudinit/netinfo.py b/cloudinit/netinfo.py index 993b26c..f447bad 100644 --- a/cloudinit/netinfo.py +++ b/cloudinit/netinfo.py @@ -87,9 +87,7 @@ def netdev_info(empty=""): def route_info(): (route_out, _err) = util.subp(["netstat", "-rn"], rcs=[0, 1]) - routes = {} - routes['ipv4'] = [] - routes['ipv6'] = [] + routes = {'ipv4': [], 'ipv6': []} entries = route_out.splitlines()[1:] for line in entries: diff --git a/cloudinit/sources/DataSourceAzure.py b/cloudinit/sources/DataSourceAzure.py index 4bcbf3a..da81ad1 100644 --- a/cloudinit/sources/DataSourceAzure.py +++ b/cloudinit/sources/DataSourceAzure.py @@ -336,8 +336,7 @@ class DataSourceAzure(sources.DataSource): if len(missing): LOG.warning("Did not find files, but going on: %s", missing) - metadata = {} - metadata['public-keys'] = key_value or pubkeys_from_crt_files(fp_files) + metadata = {'public-keys': key_value or pubkeys_from_crt_files(fp_files)} return metadata def _get_data(self): diff --git a/cloudinit/sources/DataSourceEc2.py b/cloudinit/sources/DataSourceEc2.py index 21e9ef8..bb331fb 100644 --- a/cloudinit/sources/DataSourceEc2.py +++ b/cloudinit/sources/DataSourceEc2.py @@ -536,8 +536,7 @@ def convert_ec2_metadata_network_config(network_md, macs_to_nics=None, nic_metadata = macs_metadata.get(mac) if not nic_metadata: continue # Not a physical nic represented in metadata - nic_cfg = {'type': 'physical', 'name': nic_name, 'subnets': []} - nic_cfg['mac_address'] = mac + nic_cfg = {'type': 'physical', 'name': nic_name, 'subnets': [], 'mac_address': mac} if (nic_name == fallback_nic or nic_metadata.get('public-ipv4s') or nic_metadata.get('local-ipv4s')): nic_cfg['subnets'].append({'type': 'dhcp4'}) diff --git a/cloudinit/sources/DataSourceGCE.py b/cloudinit/sources/DataSourceGCE.py index 2da34a9..4c91191 100644 --- a/cloudinit/sources/DataSourceGCE.py +++ b/cloudinit/sources/DataSourceGCE.py @@ -162,9 +162,8 @@ def read_md(address=None, platform_check=True): if address is None: address = MD_V1_URL - ret = {'meta-data': None, 'user-data': None, - 'success': False, 'reason': None} - ret['platform_reports_gce'] = platform_reports_gce() + ret = {'meta-data': None, 'user-data': None, 'success': False, 'reason': None, + 'platform_reports_gce': platform_reports_gce()} if platform_check and not ret['platform_reports_gce']: ret['reason'] = "Not running on GCE." diff --git a/cloudinit/sources/helpers/openstack.py b/cloudinit/sources/helpers/openstack.py index 26f3168..7900572 100644 --- a/cloudinit/sources/helpers/openstack.py +++ b/cloudinit/sources/helpers/openstack.py @@ -215,30 +215,26 @@ class BaseReader(object): util.load_json, root_types=(dict, list) + six.string_types) def datafiles(version): - files = {} - files['metadata'] = ( + files = {'metadata': ( # File path to read self._path_join("openstack", version, 'meta_data.json'), # Is it required? True, # Translator function (applied after loading) util.load_json, - ) - files['userdata'] = ( + ), 'userdata': ( self._path_join("openstack", version, 'user_data'), False, lambda x: x, - ) - files['vendordata'] = ( + ), 'vendordata': ( self._path_join("openstack", version, 'vendor_data.json'), False, load_json_anytype, - ) - files['networkdata'] = ( + ), 'networkdata': ( self._path_join("openstack", version, 'network_data.json'), False, load_json_anytype, - ) + )} return files results = {
_______________________________________________ Mailing list: https://launchpad.net/~cloud-init-dev Post to : cloud-init-dev@lists.launchpad.net Unsubscribe : https://launchpad.net/~cloud-init-dev More help : https://help.launchpad.net/ListHelp