diff options
| author |   Alexandru Avadanii <Alexandru.Avadanii@enea.com> | 2017-01-25 11:37:06 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <gerrit@opnfv.org> | 2017-01-25 11:37:06 +0000 |
| commit | 1906a373372b7ddd7eeb181dbe69b204b209e584 (patch) | |
| tree | 00510efa67e8f16ce2774aabd999f5ca4d6b70fb | |
| parent | e522b746bab985850cf3349d8070cc75251c1d05 (diff) | |
| parent | 778001089eba56b2cec5cd87a24cce4f16039773 (diff) | |
Merge "Upload interfaces config before attributes"
| -rw-r--r-- | deploy/cloud/configure_nodes.py | 21 | ||||
| -rw-r--r-- | deploy/scenario/no-ha_nfv-ovs_heat_ceilometer_scenario.yaml | 3 |
2 files changed, 8 insertions, 16 deletions
diff --git a/deploy/cloud/configure_nodes.py b/deploy/cloud/configure_nodes.py index eabec397c..a50973af6 100644 --- a/deploy/cloud/configure_nodes.py +++ b/deploy/cloud/configure_nodes.py @@ -32,27 +32,20 @@ class ConfigureNodes(object): def config_nodes(self): log('Configure nodes') - # Super dirty fix since Fuel 7 requires user defined roles to be - # assigned before anything else (BUG fixed in Fuel 8)! + # Assign nodes to environment with given roles for node_id, roles_blade in self.node_id_roles_dict.iteritems(): - if "opendaylight" in roles_blade[0] or "onos" in roles_blade[0] or "contrail" in roles_blade[0]: - exec_cmd('fuel node set --node-id %s --role %s --env %s' - % (node_id, roles_blade[0], self.env_id)) + exec_cmd('fuel node set --node-id %s --role %s --env %s' + % (node_id, roles_blade[0], self.env_id)) for node_id, roles_blade in self.node_id_roles_dict.iteritems(): - if "opendaylight" not in roles_blade[0] and "onos" not in roles_blade[0] and "contrail" not in roles_blade[0]: - exec_cmd('fuel node set --node-id %s --role %s --env %s' - % (node_id, roles_blade[0], self.env_id)) - - for node_id, roles_blade in self.node_id_roles_dict.iteritems(): - # Modify node attributes - self.download_attributes(node_id) - self.modify_node_attributes(node_id, roles_blade) - self.upload_attributes(node_id) # Modify interfaces configuration self.download_interface_config(node_id) self.modify_node_interface(node_id, roles_blade) self.upload_interface_config(node_id) + # Modify node attributes + self.download_attributes(node_id) + self.modify_node_attributes(node_id, roles_blade) + self.upload_attributes(node_id) # Currently not used, we use default deployment facts # which are generated by fuel based on type segmentation diff --git a/deploy/scenario/no-ha_nfv-ovs_heat_ceilometer_scenario.yaml b/deploy/scenario/no-ha_nfv-ovs_heat_ceilometer_scenario.yaml index 3436e74f9..ba3c57901 100644 --- a/deploy/scenario/no-ha_nfv-ovs_heat_ceilometer_scenario.yaml +++ b/deploy/scenario/no-ha_nfv-ovs_heat_ceilometer_scenario.yaml @@ -76,8 +76,7 @@ dea-override-config: attributes_1: hugepages: dpdk: - value: 256 - min: 256 + value: 1024 nova: value: '2048': 1024 |