diff options
Diffstat (limited to 'deploy/cloud')
| -rw-r--r-- | deploy/cloud/configure_nodes.py | 19 | ||||
| -rw-r--r-- | deploy/cloud/deploy.py | 3 | ||||
| -rw-r--r-- | deploy/cloud/deployment.py | 5 |
3 files changed, 9 insertions, 18 deletions
diff --git a/deploy/cloud/configure_nodes.py b/deploy/cloud/configure_nodes.py index ea50307b1..eabec397c 100644 --- a/deploy/cloud/configure_nodes.py +++ b/deploy/cloud/configure_nodes.py @@ -8,7 +8,6 @@ ############################################################################### import copy -import glob import io import six @@ -143,7 +142,8 @@ class ConfigureNodes(object): # ens5: # - interface_properties: # dpdk: - # enabled: true + # enabled: + # value: true # - private # ens6: # - public @@ -170,19 +170,19 @@ class ConfigureNodes(object): if interface['name'] in interface_config: for prop in interface_config[interface['name']]: net = {} - #net name + # net name if isinstance(prop, six.string_types): net['id'] = net_name_id[prop] net['name'] = prop interface['assigned_networks'].append(net) - #network properties + # network properties elif isinstance(prop, dict): - if not 'interface_properties' in prop: - log('Interface configuration contain unknow dict: %s' % prop) + if 'interface_properties' not in prop: + log('Interface configuration contains unknown dict: %s' % prop) continue - interface['interface_properties'] = \ - self._merge_dicts(interface.get('interface_properties', {}), - prop.get('interface_properties', {})) + interface['attributes'] = self._merge_dicts( + interface.get('attributes', {}), + prop.get('interface_properties', {})) with io.open(interface_yaml, 'w') as stream: yaml.dump(interfaces, stream, default_flow_style=False) @@ -199,4 +199,3 @@ class ConfigureNodes(object): continue result[k] = copy.deepcopy(v) return result - diff --git a/deploy/cloud/deploy.py b/deploy/cloud/deploy.py index e00934bd9..dac2fe8dd 100644 --- a/deploy/cloud/deploy.py +++ b/deploy/cloud/deploy.py @@ -8,9 +8,6 @@ ############################################################################### -import yaml -import io - from dea import DeploymentEnvironmentAdapter from configure_environment import ConfigureEnvironment from deployment import Deployment diff --git a/deploy/cloud/deployment.py b/deploy/cloud/deployment.py index 5dd026318..28bcfdf1d 100644 --- a/deploy/cloud/deployment.py +++ b/deploy/cloud/deployment.py @@ -13,15 +13,10 @@ import json from common import ( N, - E, exec_cmd, - run_proc, - run_proc_wait_terminated, - run_proc_kill, parse, err, log, - delete, ) SEARCH_TEXT = '(err)' |