summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorFedor Zhadaev <fzhadaev@mirantis.com>2017-01-17 08:22:55 +0000
committerGerrit Code Review <gerrit@opnfv.org>2017-01-17 08:22:55 +0000
commit8ec262f614f54b3389daeeb19936edf144428eab (patch)
tree465b34858c940274ac7197dfa0d911481824874a
parentcd71962af0d7dc2c024317094a6a12594c8bea12 (diff)
parenta1c044d290aedb0dd5fd447b550e40a9cd3f61f8 (diff)
Merge "Enable dpdk property on interface"
-rw-r--r--deploy/cloud/configure_nodes.py18
-rw-r--r--deploy/config/labs/devel-pipeline/default/fuel/config/dea-pod-override.yaml3
-rw-r--r--deploy/config/labs/devel-pipeline/elx/fuel/config/dea-pod-override.yaml3
-rw-r--r--deploy/config/labs/devel-pipeline/huawei-ch/fuel/config/dea-pod-override.yaml3
-rw-r--r--deploy/config/labs/devel-pipeline/intel-sc/fuel/config/dea-pod-override.yaml3
5 files changed, 17 insertions, 13 deletions
diff --git a/deploy/cloud/configure_nodes.py b/deploy/cloud/configure_nodes.py
index f9f65afb5..eabec397c 100644
--- a/deploy/cloud/configure_nodes.py
+++ b/deploy/cloud/configure_nodes.py
@@ -142,7 +142,8 @@ class ConfigureNodes(object):
# ens5:
# - interface_properties:
# dpdk:
- # enabled: true
+ # enabled:
+ # value: true
# - private
# ens6:
# - public
@@ -169,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)
@@ -198,4 +199,3 @@ class ConfigureNodes(object):
continue
result[k] = copy.deepcopy(v)
return result
-
diff --git a/deploy/config/labs/devel-pipeline/default/fuel/config/dea-pod-override.yaml b/deploy/config/labs/devel-pipeline/default/fuel/config/dea-pod-override.yaml
index 32b2cfb22..852b363d4 100644
--- a/deploy/config/labs/devel-pipeline/default/fuel/config/dea-pod-override.yaml
+++ b/deploy/config/labs/devel-pipeline/default/fuel/config/dea-pod-override.yaml
@@ -35,7 +35,8 @@ interfaces_dpdk:
- private
- interface_properties:
dpdk:
- enabled: true
+ enabled:
+ value: true
ens6:
- public
interfaces_vlan:
diff --git a/deploy/config/labs/devel-pipeline/elx/fuel/config/dea-pod-override.yaml b/deploy/config/labs/devel-pipeline/elx/fuel/config/dea-pod-override.yaml
index cb80e3855..150d4ed06 100644
--- a/deploy/config/labs/devel-pipeline/elx/fuel/config/dea-pod-override.yaml
+++ b/deploy/config/labs/devel-pipeline/elx/fuel/config/dea-pod-override.yaml
@@ -35,7 +35,8 @@ interfaces_dpdk:
- private
- interface_properties:
dpdk:
- enabled: true
+ enabled:
+ value: true
ens6:
- public
interfaces_vlan:
diff --git a/deploy/config/labs/devel-pipeline/huawei-ch/fuel/config/dea-pod-override.yaml b/deploy/config/labs/devel-pipeline/huawei-ch/fuel/config/dea-pod-override.yaml
index 92cc0e616..be80b9724 100644
--- a/deploy/config/labs/devel-pipeline/huawei-ch/fuel/config/dea-pod-override.yaml
+++ b/deploy/config/labs/devel-pipeline/huawei-ch/fuel/config/dea-pod-override.yaml
@@ -35,7 +35,8 @@ interfaces_dpdk:
- private
- interface_properties:
dpdk:
- enabled: true
+ enabled:
+ value: true
ens6:
- public
interfaces_vlan:
diff --git a/deploy/config/labs/devel-pipeline/intel-sc/fuel/config/dea-pod-override.yaml b/deploy/config/labs/devel-pipeline/intel-sc/fuel/config/dea-pod-override.yaml
index ed7c63fac..35a2201cf 100644
--- a/deploy/config/labs/devel-pipeline/intel-sc/fuel/config/dea-pod-override.yaml
+++ b/deploy/config/labs/devel-pipeline/intel-sc/fuel/config/dea-pod-override.yaml
@@ -35,7 +35,8 @@ interfaces_dpdk:
- private
- interface_properties:
dpdk:
- enabled: true
+ enabled:
+ value: true
ens6:
- public
interfaces_vlan: