diff options
Diffstat (limited to 'deploy')
37 files changed, 450 insertions, 527 deletions
diff --git a/deploy/cloud/configure_nodes.py b/deploy/cloud/configure_nodes.py index 20ecc1724..ea50307b1 100644 --- a/deploy/cloud/configure_nodes.py +++ b/deploy/cloud/configure_nodes.py @@ -45,9 +45,6 @@ class ConfigureNodes(object): exec_cmd('fuel node set --node-id %s --role %s --env %s' % (node_id, roles_blade[0], self.env_id)) - # Download the unmodified default deployment configuration, because we - # need it for the network config. - self.download_deployment_config() for node_id, roles_blade in self.node_id_roles_dict.iteritems(): # Modify node attributes self.download_attributes(node_id) @@ -56,13 +53,18 @@ class ConfigureNodes(object): # Modify interfaces configuration self.download_interface_config(node_id) self.modify_node_interface(node_id, roles_blade) - self.modify_node_network_schemes(node_id, roles_blade) self.upload_interface_config(node_id) + # Currently not used, we use default deployment facts + # which are generated by fuel based on type segmentation + # and network to nic assignment + # # Download our modified deployment configuration, which includes our # changes to network topology etc. - self.download_deployment_config() - self.upload_deployment_config() + #self.download_deployment_config() + #for node_id, roles_blade in self.node_id_roles_dict.iteritems(): + # self.modify_node_network_schemes(node_id, roles_blade) + #self.upload_deployment_config() def modify_node_network_schemes(self, node_id, roles_blade): log('Modify network transformations for node %s' % node_id) @@ -71,14 +73,14 @@ class ConfigureNodes(object): deployment_dir = '%s/deployment_%s' % ( self.yaml_config_dir, self.env_id) backup(deployment_dir) - for node_file in glob.glob(deployment_dir + '/*_%s.yaml' % node_id): - with io.open(node_file) as stream: - node = yaml.load(stream) + node_file = ('%s/%s.yaml' % (deployment_dir, node_id)) + with io.open(node_file) as stream: + node = yaml.load(stream) - node['network_scheme'].update(transformations) + node['network_scheme'].update(transformations) - with io.open(node_file, 'w') as stream: - yaml.dump(node, stream, default_flow_style=False) + with io.open(node_file, 'w') as stream: + yaml.dump(node, stream, default_flow_style=False) def download_deployment_config(self): log('Download deployment config for environment %s' % self.env_id) @@ -129,6 +131,22 @@ class ConfigureNodes(object): with open(attributes_yaml, 'w') as stream: yaml.dump(result_attributes, stream, default_flow_style=False) + # interface configuration can + # looks like this: + # + # interfaces_dpdk: + # ens3: + # - fuelweb_admin + # ens4: + # - storage + # - management + # ens5: + # - interface_properties: + # dpdk: + # enabled: true + # - private + # ens6: + # - public def modify_node_interface(self, node_id, roles_blade): log('Modify interface config for node %s' % node_id) interface_yaml = ('%s/node_%s/interfaces.yaml' @@ -150,11 +168,21 @@ class ConfigureNodes(object): for interface in interfaces: interface['assigned_networks'] = [] if interface['name'] in interface_config: - for net_name in interface_config[interface['name']]: + for prop in interface_config[interface['name']]: net = {} - net['id'] = net_name_id[net_name] - net['name'] = net_name - interface['assigned_networks'].append(net) + #net name + if isinstance(prop, six.string_types): + net['id'] = net_name_id[prop] + net['name'] = prop + interface['assigned_networks'].append(net) + #network properties + elif isinstance(prop, dict): + if not 'interface_properties' in prop: + log('Interface configuration contain unknow dict: %s' % prop) + continue + interface['interface_properties'] = \ + self._merge_dicts(interface.get('interface_properties', {}), + prop.get('interface_properties', {})) with io.open(interface_yaml, 'w') as stream: yaml.dump(interfaces, stream, default_flow_style=False) diff --git a/deploy/common.py b/deploy/common.py index 80832e201..07ad54372 100644 --- a/deploy/common.py +++ b/deploy/common.py @@ -74,13 +74,13 @@ def exec_cmd(cmd, check=True, attempts=1, delay=5, verbose=False, mask_args=[], if check: if return_code > 0: stderr = stderr.strip() - print "Failed command: " + str(masked_cmd) - print "Command returned response: " + str(stderr) - print "Command return code: " + str(return_code) + print("Failed command: " + str(masked_cmd)) + print("Command returned response: " + str(stderr)) + print("Command return code: " + str(return_code)) raise Exception(stderr) else: - print "Command: " + str(masked_cmd) - print str(response) + print("Command: " + str(masked_cmd)) + print(str(response)) return response return response, return_code diff --git a/deploy/config/dea_base.yaml b/deploy/config/dea_base.yaml index 0b8485ba0..c1a0606bc 100644 --- a/deploy/config/dea_base.yaml +++ b/deploy/config/dea_base.yaml @@ -636,43 +636,25 @@ settings: section: main universe multiverse suite: trusty type: deb - uri: http://archive.ubuntu.com/ubuntu/ + uri: http://10.20.0.2:8080/mirrors/ubuntu/ - name: ubuntu-updates priority: null section: main universe multiverse suite: trusty-updates type: deb - uri: http://archive.ubuntu.com/ubuntu/ + uri: http://10.20.0.2:8080/mirrors/ubuntu/ - name: ubuntu-security priority: null section: main universe multiverse suite: trusty-security type: deb - uri: http://archive.ubuntu.com/ubuntu/ + uri: http://10.20.0.2:8080/mirrors/ubuntu/ - name: mos priority: 1050 section: main restricted suite: mos9.0 type: deb uri: http://10.20.0.2:8080/mitaka-9.0/ubuntu/x86_64 - - name: mos-updates - priority: 1050 - section: main restricted - suite: mos9.0-updates - type: deb - uri: http://mirror.fuel-infra.org/mos-repos/ubuntu/9.0/ - - name: mos-security - priority: 1050 - section: main restricted - suite: mos9.0-security - type: deb - uri: http://mirror.fuel-infra.org/mos-repos/ubuntu/9.0/ - - name: mos-holdback - priority: 1100 - section: main restricted - suite: mos9.0-holdback - type: deb - uri: http://mirror.fuel-infra.org/mos-repos/ubuntu/9.0/ - name: Auxiliary priority: 1150 section: main restricted 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 985a2920c..32b2cfb22 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 @@ -25,42 +25,29 @@ interfaces_1: - private ens6: - public -transformations_1: - transformations: - - action: add-br - name: br-fw-admin - - action: add-br - name: br-mgmt - - action: add-br - name: br-storage - - action: add-br - name: br-ex - - action: add-br - name: br-floating - provider: ovs - - action: add-patch - bridges: - - br-floating - - br-ex - mtu: 65000 - provider: ovs - - action: add-br - name: br-mesh - - action: add-port - bridge: br-fw-admin - name: ens3 - - action: add-port - bridge: br-mgmt - name: ens4 - - action: add-port - bridge: br-storage - name: ens3.102 - - action: add-port - bridge: br-mesh - name: ens5.103 - - action: add-port - bridge: br-ex - name: ens6 +interfaces_dpdk: + ens3: + - fuelweb_admin + - storage + ens4: + - management + ens5: + - private + - interface_properties: + dpdk: + enabled: true + ens6: + - public +interfaces_vlan: + ens3: + - fuelweb_admin + - storage + ens4: + - management + ens5: + - private + ens6: + - public fuel: ADMIN_NETWORK: dhcp_pool_end: 10.20.0.254 diff --git a/deploy/config/labs/devel-pipeline/default/fuel/config/dha.yaml b/deploy/config/labs/devel-pipeline/default/fuel/config/dha.yaml index ad2f5ebde..0374c5d29 100644 --- a/deploy/config/labs/devel-pipeline/default/fuel/config/dha.yaml +++ b/deploy/config/labs/devel-pipeline/default/fuel/config/dha.yaml @@ -1,3 +1,12 @@ +############################################################################## +# Copyright (c) 2015 Ericsson AB and others. +# stefan.k.berg@ericsson.com +# jonas.bjurel@ericsson.com +# All rights reserved. This program and the accompanying materials +# are made available under the terms of the Apache License, Version 2.0 +# which accompanies this distribution, and is available at +# http://www.apache.org/licenses/LICENSE-2.0 +############################################################################## dha-pod-config-metadata: title: Deployment Hardware Adapter (DHA) for fuel development pipeline - default version version: 0.0.3 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 ce3b62af9..cb80e3855 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 @@ -25,42 +25,29 @@ interfaces_1: - private ens6: - public -transformations_1: - transformations: - - action: add-br - name: br-fw-admin - - action: add-br - name: br-mgmt - - action: add-br - name: br-storage - - action: add-br - name: br-ex - - action: add-br - name: br-floating - provider: ovs - - action: add-patch - bridges: - - br-floating - - br-ex - mtu: 65000 - provider: ovs - - action: add-br - name: br-mesh - - action: add-port - bridge: br-fw-admin - name: ens3 - - action: add-port - bridge: br-mgmt - name: ens4 - - action: add-port - bridge: br-storage - name: ens3.102 - - action: add-port - bridge: br-mesh - name: ens5.103 - - action: add-port - bridge: br-ex - name: ens6 +interfaces_dpdk: + ens3: + - fuelweb_admin + - storage + ens4: + - management + ens5: + - private + - interface_properties: + dpdk: + enabled: true + ens6: + - public +interfaces_vlan: + ens3: + - fuelweb_admin + - storage + ens4: + - management + ens5: + - private + ens6: + - public fuel: ADMIN_NETWORK: dhcp_pool_end: 10.20.0.254 diff --git a/deploy/config/labs/devel-pipeline/elx/fuel/config/dha.yaml b/deploy/config/labs/devel-pipeline/elx/fuel/config/dha.yaml index 3c246c11c..c2352f924 100644 --- a/deploy/config/labs/devel-pipeline/elx/fuel/config/dha.yaml +++ b/deploy/config/labs/devel-pipeline/elx/fuel/config/dha.yaml @@ -1,3 +1,12 @@ +############################################################################## +# Copyright (c) 2015 Ericsson AB and others. +# stefan.k.berg@ericsson.com +# jonas.bjurel@ericsson.com +# All rights reserved. This program and the accompanying materials +# are made available under the terms of the Apache License, Version 2.0 +# which accompanies this distribution, and is available at +# http://www.apache.org/licenses/LICENSE-2.0 +############################################################################## dha-pod-config-metadata: title: Deployment Hardware Adapter (DHA) for fuel development pipeline - Ericsson ELX version version: 0.0.3 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 736e9af3c..92cc0e616 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 @@ -25,42 +25,29 @@ interfaces_1: - private ens6: - public -transformations_1: - transformations: - - action: add-br - name: br-fw-admin - - action: add-br - name: br-mgmt - - action: add-br - name: br-storage - - action: add-br - name: br-ex - - action: add-br - name: br-floating - provider: ovs - - action: add-patch - bridges: - - br-floating - - br-ex - mtu: 65000 - provider: ovs - - action: add-br - name: br-mesh - - action: add-port - bridge: br-fw-admin - name: ens3 - - action: add-port - bridge: br-mgmt - name: ens4 - - action: add-port - bridge: br-storage - name: ens3.102 - - action: add-port - bridge: br-mesh - name: ens5.103 - - action: add-port - bridge: br-ex - name: ens6 +interfaces_dpdk: + ens3: + - fuelweb_admin + - storage + ens4: + - management + ens5: + - private + - interface_properties: + dpdk: + enabled: true + ens6: + - public +interfaces_vlan: + ens3: + - fuelweb_admin + - storage + ens4: + - management + ens5: + - private + ens6: + - public fuel: ADMIN_NETWORK: dhcp_pool_end: 10.20.0.254 diff --git a/deploy/config/labs/devel-pipeline/huawei-ch/fuel/config/dha.yaml b/deploy/config/labs/devel-pipeline/huawei-ch/fuel/config/dha.yaml index f2aeabd4c..d8f904362 100644 --- a/deploy/config/labs/devel-pipeline/huawei-ch/fuel/config/dha.yaml +++ b/deploy/config/labs/devel-pipeline/huawei-ch/fuel/config/dha.yaml @@ -1,3 +1,12 @@ +############################################################################## +# Copyright (c) 2015 Ericsson AB and others. +# stefan.k.berg@ericsson.com +# jonas.bjurel@ericsson.com +# All rights reserved. This program and the accompanying materials +# are made available under the terms of the Apache License, Version 2.0 +# which accompanies this distribution, and is available at +# http://www.apache.org/licenses/LICENSE-2.0 +############################################################################## dha-pod-config-metadata: title: Deployment Hardware Adapter (DHA) for fuel development pipeline - default version version: 0.0.4 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 eed982d01..ed7c63fac 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 @@ -25,42 +25,29 @@ interfaces_1: - private ens6: - public -transformations_1: - transformations: - - action: add-br - name: br-fw-admin - - action: add-br - name: br-mgmt - - action: add-br - name: br-storage - - action: add-br - name: br-ex - - action: add-br - name: br-floating - provider: ovs - - action: add-patch - bridges: - - br-floating - - br-ex - mtu: 65000 - provider: ovs - - action: add-br - name: br-mesh - - action: add-port - bridge: br-fw-admin - name: ens3 - - action: add-port - bridge: br-mgmt - name: ens4 - - action: add-port - bridge: br-storage - name: ens3.102 - - action: add-port - bridge: br-mesh - name: ens5.103 - - action: add-port - bridge: br-ex - name: ens6 +interfaces_dpdk: + ens3: + - fuelweb_admin + - storage + ens4: + - management + ens5: + - private + - interface_properties: + dpdk: + enabled: true + ens6: + - public +interfaces_vlan: + ens3: + - fuelweb_admin + - storage + ens4: + - management + ens5: + - private + ens6: + - public fuel: ADMIN_NETWORK: dhcp_pool_end: 10.20.0.254 diff --git a/deploy/config/labs/devel-pipeline/intel-sc/fuel/config/dha.yaml b/deploy/config/labs/devel-pipeline/intel-sc/fuel/config/dha.yaml index 3657285e8..837293950 100644 --- a/deploy/config/labs/devel-pipeline/intel-sc/fuel/config/dha.yaml +++ b/deploy/config/labs/devel-pipeline/intel-sc/fuel/config/dha.yaml @@ -1,3 +1,12 @@ +############################################################################## +# Copyright (c) 2015 Ericsson AB and others. +# stefan.k.berg@ericsson.com +# jonas.bjurel@ericsson.com +# All rights reserved. This program and the accompanying materials +# are made available under the terms of the Apache License, Version 2.0 +# which accompanies this distribution, and is available at +# http://www.apache.org/licenses/LICENSE-2.0 +############################################################################## dha-pod-config-metadata: title: Deployment Hardware Adapter (DHA) for fuel development pipeline - Intel Santa Clara, CA. USA version version: 0.0.1 diff --git a/deploy/config/plugins/fuel-bgpvpn_0.0.2.yaml b/deploy/config/plugins/fuel-bgpvpn_0.0.2.yaml index 21bcdf170..f7ab89b37 100644 --- a/deploy/config/plugins/fuel-bgpvpn_0.0.2.yaml +++ b/deploy/config/plugins/fuel-bgpvpn_0.0.2.yaml @@ -1,3 +1,11 @@ +############################################################################## +# Copyright (c) 2015 Ericsson AB and others. +# jonas.bjurel@ericsson.com +# All rights reserved. This program and the accompanying materials +# are made available under the terms of the Apache License, Version 2.0 +# which accompanies this distribution, and is available at +# http://www.apache.org/licenses/LICENSE-2.0 +############################################################################## plugin-config-metadata: title: BGPVPN fuel Plugin configuration template version: 0.2 diff --git a/deploy/config/plugins/fuel-bgpvpn_0.0.3.yaml b/deploy/config/plugins/fuel-bgpvpn_0.0.3.yaml index adca822fc..aeea9e450 100644 --- a/deploy/config/plugins/fuel-bgpvpn_0.0.3.yaml +++ b/deploy/config/plugins/fuel-bgpvpn_0.0.3.yaml @@ -1,3 +1,11 @@ +############################################################################## +# Copyright (c) 2015 Ericsson AB and others. +# jonas.bjurel@ericsson.com +# All rights reserved. This program and the accompanying materials +# are made available under the terms of the Apache License, Version 2.0 +# which accompanies this distribution, and is available at +# http://www.apache.org/licenses/LICENSE-2.0 +############################################################################## plugin-config-metadata: title: BGPVPN fuel Plugin configuration template version: 0.3 diff --git a/deploy/config/plugins/fuel-bgpvpn_0.9.0.yaml b/deploy/config/plugins/fuel-bgpvpn_0.9.0.yaml index bbdefaf6e..1aa1259ca 100644 --- a/deploy/config/plugins/fuel-bgpvpn_0.9.0.yaml +++ b/deploy/config/plugins/fuel-bgpvpn_0.9.0.yaml @@ -1,3 +1,11 @@ +############################################################################## +# Copyright (c) 2015 Ericsson AB and others. +# jonas.bjurel@ericsson.com +# All rights reserved. This program and the accompanying materials +# are made available under the terms of the Apache License, Version 2.0 +# which accompanies this distribution, and is available at +# http://www.apache.org/licenses/LICENSE-2.0 +############################################################################## plugin-config-metadata: title: BGPVPN fuel Plugin configuration template version: 0.9.0 diff --git a/deploy/deploy-config.py b/deploy/deploy-config.py index 436002d36..08cb36197 100644 --- a/deploy/deploy-config.py +++ b/deploy/deploy-config.py @@ -137,7 +137,6 @@ def merge_networks(list_1, list_2): return [new_nets.get(net.get('name'), net) for net in list_1] - def merge_dicts(dict1, dict2): for k in set(dict1).union(dict2): if k in dict1 and k in dict2: @@ -163,127 +162,6 @@ def merge_dicts(dict1, dict2): yield (k, dict1[k]) -setup_yaml() -kwargs = parse_arguments() - -# Generate final dea.yaml by merging following config files/fragments in revers priority order: -# "dea-base", "dea-pod-override", "deplyment-scenario/module-config-override" -# and "deployment-scenario/dea-override" -print('Generating final dea.yaml configuration....') - -# Fetch dea-base, extract and purge meta-data -print('Parsing dea-base from: ' + kwargs["dea_base_uri"] + "....") -response = urllib2.urlopen(kwargs["dea_base_uri"]) -dea_base_conf = yaml.load(response.read()) -dea_base_title = dea_base_conf['dea-base-config-metadata']['title'] -dea_base_version = dea_base_conf['dea-base-config-metadata']['version'] -dea_base_creation = dea_base_conf['dea-base-config-metadata']['created'] -dea_base_sha = sha_uri(kwargs["dea_base_uri"]) -dea_base_comment = dea_base_conf['dea-base-config-metadata']['comment'] -dea_base_conf.pop('dea-base-config-metadata') -final_dea_conf = dea_base_conf -dea_pod_override_nodes = None - -# Fetch dea-pod-override, extract and purge meta-data, merge with previous dea data structure -print('Parsing the dea-pod-override from: ' + kwargs["dea_pod_override_uri"] + "....") -response = urllib2.urlopen(kwargs["dea_pod_override_uri"]) -dea_pod_override_conf = yaml.load(response.read()) -if dea_pod_override_conf: - dea_pod_title = dea_pod_override_conf['dea-pod-override-config-metadata']['title'] - dea_pod_version = dea_pod_override_conf['dea-pod-override-config-metadata']['version'] - dea_pod_creation = dea_pod_override_conf['dea-pod-override-config-metadata']['created'] - dea_pod_sha = sha_uri(kwargs["dea_pod_override_uri"]) - dea_pod_comment = dea_pod_override_conf['dea-pod-override-config-metadata']['comment'] - print('Merging dea-base and dea-pod-override configuration ....') - dea_pod_override_conf.pop('dea-pod-override-config-metadata') - # Copy the list of original nodes, which holds info on their transformations - if 'nodes' in dea_pod_override_conf: - dea_pod_override_nodes = list(dea_pod_override_conf['nodes']) - if dea_pod_override_conf: - final_dea_conf = dict(merge_dicts(final_dea_conf, dea_pod_override_conf)) - -# Fetch deployment-scenario, extract and purge meta-data, merge deployment-scenario/ -# dea-override-configith previous dea data structure -print('Parsing deployment-scenario from: ' + kwargs["scenario"] + "....") - -response = urllib2.urlopen(kwargs["scenario_base_uri"] + "/scenario.yaml") -scenario_short_translation_conf = yaml.load(response.read()) -if kwargs["scenario"] in scenario_short_translation_conf: - scenario_uri = (kwargs["scenario_base_uri"] - + "/" - + scenario_short_translation_conf[kwargs["scenario"]]['configfile']) -else: - scenario_uri = kwargs["scenario_base_uri"] + "/" + kwargs["scenario"] -response = urllib2.urlopen(scenario_uri) -deploy_scenario_conf = yaml.load(response.read()) - -if deploy_scenario_conf: - deploy_scenario_title = deploy_scenario_conf['deployment-scenario-metadata']['title'] - deploy_scenario_version = deploy_scenario_conf['deployment-scenario-metadata']['version'] - deploy_scenario_creation = deploy_scenario_conf['deployment-scenario-metadata']['created'] - deploy_scenario_sha = sha_uri(scenario_uri) - deploy_scenario_comment = deploy_scenario_conf['deployment-scenario-metadata']['comment'] - deploy_scenario_conf.pop('deployment-scenario-metadata') -else: - print("Deployment scenario file not found or is empty") - print("Cannot continue, exiting ....") - sys.exit(1) - -dea_scenario_override_conf = deploy_scenario_conf["dea-override-config"] -if dea_scenario_override_conf: - print('Merging dea-base-, dea-pod-override- and deployment-scenario ' - 'configuration into final dea.yaml configuration....') - final_dea_conf = dict(merge_dicts(final_dea_conf, dea_scenario_override_conf)) - -# Fetch plugin-configuration configuration files, extract and purge meta-data, -# merge/append with previous dea data structure, override plugin-configuration with -# deploy-scenario/module-config-override -modules = [] -module_uris = [] -module_titles = [] -module_versions = [] -module_creations = [] -module_shas = [] -module_comments = [] -if deploy_scenario_conf["stack-extensions"]: - for module in deploy_scenario_conf["stack-extensions"]: - print('Loading configuration for module: ' - + module["module"] - + ' and merging it to final dea.yaml configuration....') - response = urllib2.urlopen(kwargs["plugins_uri"] - + '/' - + module["module-config-name"] - + '_' - + module["module-config-version"] - + '.yaml') - module_conf = yaml.load(response.read()) - modules.append(module["module"]) - module_uris.append(kwargs["plugins_uri"] - + '/' - + module["module-config-name"] - + '_' - + module["module-config-version"] - + '.yaml') - module_titles.append(str(module_conf['plugin-config-metadata']['title'])) - module_versions.append(str(module_conf['plugin-config-metadata']['version'])) - module_creations.append(str(module_conf['plugin-config-metadata']['created'])) - module_shas.append(sha_uri(kwargs["plugins_uri"] - + '/' - + module["module-config-name"] - + '_' - + module["module-config-version"] - + '.yaml')) - module_comments.append(str(module_conf['plugin-config-metadata']['comment'])) - module_conf.pop('plugin-config-metadata') - final_dea_conf['settings']['editable'].update(module_conf) - scenario_module_override_conf = module.get('module-config-override') - if scenario_module_override_conf: - dea_scenario_module_override_conf = {} - dea_scenario_module_override_conf['settings'] = {} - dea_scenario_module_override_conf['settings']['editable'] = {} - dea_scenario_module_override_conf['settings']['editable'][module["module"]] = scenario_module_override_conf - final_dea_conf = dict(merge_dicts(final_dea_conf, dea_scenario_module_override_conf)) - def get_node_ifaces_and_trans(nodes, nid): for node in nodes: if node['id'] == nid: @@ -294,117 +172,243 @@ def get_node_ifaces_and_trans(nodes, nid): return None -if dea_pod_override_nodes: - for node in final_dea_conf['nodes']: - data = get_node_ifaces_and_trans(dea_pod_override_nodes, node['id']) - if data: - print ("Honoring original interfaces and transformations for " - "node %d to %s, %s" % (node['id'], data[0], data[1])) - node['interfaces'] = data[0] - node['transformations'] = data[1] - -# Dump final dea.yaml including configuration management meta-data to argument provided -# directory -if not os.path.exists(kwargs["output_path"]): - os.makedirs(kwargs["output_path"]) -print('Dumping final dea.yaml to ' + kwargs["output_path"] + '/dea.yaml....') -with open(kwargs["output_path"] + '/dea.yaml', "w") as f: - f.write("\n".join([("title: DEA.yaml file automatically generated from the" - 'configuration files stated in the "configuration-files"' - "fragment below"), - "version: " + str(calendar.timegm(time.gmtime())), - "created: " + str(time.strftime("%d/%m/%Y")) + " " - + str(time.strftime("%H:%M:%S")), - "comment: none\n"])) - - f.write("\n".join(["configuration-files:", - " dea-base:", - " uri: " + kwargs["dea_base_uri"], - " title: " + str(dea_base_title), - " version: " + str(dea_base_version), - " created: " + str(dea_base_creation), - " sha1: " + str(dea_base_sha), - " comment: " + str(dea_base_comment) + "\n"])) - - f.write("\n".join([" pod-override:", - " uri: " + kwargs["dea_pod_override_uri"], - " title: " + str(dea_pod_title), - " version: " + str(dea_pod_version), - " created: " + str(dea_pod_creation), - " sha1: " + str(dea_pod_sha), - " comment: " + str(dea_pod_comment) + "\n"])) - - f.write("\n".join([" deployment-scenario:", - " uri: " + str(scenario_uri), - " title: " + str(deploy_scenario_title), - " version: " + str(deploy_scenario_version), - " created: " + str(deploy_scenario_creation), - " sha1: " + str(deploy_scenario_sha), - " comment: " + str(deploy_scenario_comment) + "\n"])) - - f.write(" plugin-modules:\n") - for k, _ in enumerate(modules): - f.write("\n".join([" - module: " + modules[k], - " uri: " + module_uris[k], - " title: " + module_titles[k], - " version: " + module_versions[k], - " created: " + module_creations[k], - " sha-1: " + module_shas[k], - " comment: " + module_comments[k] + "\n"])) - - yaml.dump(final_dea_conf, f, default_flow_style=False) - -# Load POD dha and override it with "deployment-scenario/dha-override-config" section -print('Generating final dha.yaml configuration....') -print('Parsing dha-pod yaml configuration....') -response = urllib2.urlopen(kwargs["dha_uri"]) -dha_pod_conf = yaml.load(response.read()) -dha_pod_title = dha_pod_conf['dha-pod-config-metadata']['title'] -dha_pod_version = dha_pod_conf['dha-pod-config-metadata']['version'] -dha_pod_creation = dha_pod_conf['dha-pod-config-metadata']['created'] -dha_pod_sha = sha_uri(kwargs["dha_uri"]) -dha_pod_comment = dha_pod_conf['dha-pod-config-metadata']['comment'] -dha_pod_conf.pop('dha-pod-config-metadata') -final_dha_conf = dha_pod_conf - -dha_scenario_override_conf = deploy_scenario_conf["dha-override-config"] -# Only virtual deploy scenarios can override dha.yaml since there -# is no way to programatically override a physical environment: -# wireing, IPMI set-up, etc. -# For Physical environments, dha.yaml overrides will be silently ignored -if dha_scenario_override_conf and (final_dha_conf['adapter'] == 'libvirt' - or final_dha_conf['adapter'] == 'esxi' - or final_dha_conf['adapter'] == 'vbox'): - print('Merging dha-pod and deployment-scenario override information to final dha.yaml configuration....') - final_dha_conf = dict(merge_dicts(final_dha_conf, dha_scenario_override_conf)) - -# Dump final dha.yaml to argument provided directory -print('Dumping final dha.yaml to ' + kwargs["output_path"] + '/dha.yaml....') -with open(kwargs["output_path"] + '/dha.yaml', "w") as f: - f.write("\n".join([("title: DHA.yaml file automatically generated from" - "the configuration files stated in the" - '"configuration-files" fragment below'), - "version: " + str(calendar.timegm(time.gmtime())), - "created: " + str(time.strftime("%d/%m/%Y")) + " " - + str(time.strftime("%H:%M:%S")), - "comment: none\n"])) - - f.write("configuration-files:\n") - - f.write("\n".join([" dha-pod-configuration:", - " uri: " + kwargs["dha_uri"], - " title: " + str(dha_pod_title), - " version: " + str(dha_pod_version), - " created: " + str(dha_pod_creation), - " sha-1: " + str(dha_pod_sha), - " comment: " + str(dha_pod_comment) + "\n"])) - - f.write("\n".join([" deployment-scenario:", - " uri: " + str(scenario_uri), - " title: " + str(deploy_scenario_title), - " version: " + str(deploy_scenario_version), - " created: " + str(deploy_scenario_creation), - " sha-1: " + str(deploy_scenario_sha), - " comment: " + str(deploy_scenario_comment) + "\n"])) - - yaml.dump(final_dha_conf, f, default_flow_style=False) + +def main(): + setup_yaml() + kwargs = parse_arguments() + + # Generate final dea.yaml by merging following config files/fragments in revers priority order: + # "dea-base", "dea-pod-override", "deplyment-scenario/module-config-override" + # and "deployment-scenario/dea-override" + print('Generating final dea.yaml configuration....') + + # Fetch dea-base, extract and purge meta-data + print('Parsing dea-base from: ' + kwargs["dea_base_uri"] + "....") + response = urllib2.urlopen(kwargs["dea_base_uri"]) + dea_base_conf = yaml.load(response.read()) + dea_base_title = dea_base_conf['dea-base-config-metadata']['title'] + dea_base_version = dea_base_conf['dea-base-config-metadata']['version'] + dea_base_creation = dea_base_conf['dea-base-config-metadata']['created'] + dea_base_sha = sha_uri(kwargs["dea_base_uri"]) + dea_base_comment = dea_base_conf['dea-base-config-metadata']['comment'] + dea_base_conf.pop('dea-base-config-metadata') + final_dea_conf = dea_base_conf + dea_pod_override_nodes = None + + # Fetch dea-pod-override, extract and purge meta-data, merge with previous dea data structure + print('Parsing the dea-pod-override from: ' + kwargs["dea_pod_override_uri"] + "....") + response = urllib2.urlopen(kwargs["dea_pod_override_uri"]) + dea_pod_override_conf = yaml.load(response.read()) + if dea_pod_override_conf: + dea_pod_title = dea_pod_override_conf['dea-pod-override-config-metadata']['title'] + dea_pod_version = dea_pod_override_conf['dea-pod-override-config-metadata']['version'] + dea_pod_creation = dea_pod_override_conf['dea-pod-override-config-metadata']['created'] + dea_pod_sha = sha_uri(kwargs["dea_pod_override_uri"]) + dea_pod_comment = dea_pod_override_conf['dea-pod-override-config-metadata']['comment'] + print('Merging dea-base and dea-pod-override configuration ....') + dea_pod_override_conf.pop('dea-pod-override-config-metadata') + # Copy the list of original nodes, which holds info on their transformations + if 'nodes' in dea_pod_override_conf: + dea_pod_override_nodes = list(dea_pod_override_conf['nodes']) + if dea_pod_override_conf: + final_dea_conf = dict(merge_dicts(final_dea_conf, dea_pod_override_conf)) + + # Fetch deployment-scenario, extract and purge meta-data, merge deployment-scenario/ + # dea-override-configith previous dea data structure + print('Parsing deployment-scenario from: ' + kwargs["scenario"] + "....") + + response = urllib2.urlopen(kwargs["scenario_base_uri"] + "/scenario.yaml") + scenario_short_translation_conf = yaml.load(response.read()) + if kwargs["scenario"] in scenario_short_translation_conf: + scenario_uri = (kwargs["scenario_base_uri"] + + "/" + + scenario_short_translation_conf[kwargs["scenario"]]['configfile']) + else: + scenario_uri = kwargs["scenario_base_uri"] + "/" + kwargs["scenario"] + response = urllib2.urlopen(scenario_uri) + deploy_scenario_conf = yaml.load(response.read()) + + if deploy_scenario_conf: + deploy_scenario_title = deploy_scenario_conf['deployment-scenario-metadata']['title'] + deploy_scenario_version = deploy_scenario_conf['deployment-scenario-metadata']['version'] + deploy_scenario_creation = deploy_scenario_conf['deployment-scenario-metadata']['created'] + deploy_scenario_sha = sha_uri(scenario_uri) + deploy_scenario_comment = deploy_scenario_conf['deployment-scenario-metadata']['comment'] + deploy_scenario_conf.pop('deployment-scenario-metadata') + else: + print("Deployment scenario file not found or is empty") + print("Cannot continue, exiting ....") + sys.exit(1) + + dea_scenario_override_conf = deploy_scenario_conf["dea-override-config"] + if dea_scenario_override_conf: + print('Merging dea-base-, dea-pod-override- and deployment-scenario ' + 'configuration into final dea.yaml configuration....') + final_dea_conf = dict(merge_dicts(final_dea_conf, dea_scenario_override_conf)) + + # Fetch plugin-configuration configuration files, extract and purge meta-data, + # merge/append with previous dea data structure, override plugin-configuration with + # deploy-scenario/module-config-override + modules = [] + module_uris = [] + module_titles = [] + module_versions = [] + module_creations = [] + module_shas = [] + module_comments = [] + if deploy_scenario_conf["stack-extensions"]: + for module in deploy_scenario_conf["stack-extensions"]: + print('Loading configuration for module: ' + + module["module"] + + ' and merging it to final dea.yaml configuration....') + response = urllib2.urlopen(kwargs["plugins_uri"] + + '/' + + module["module-config-name"] + + '_' + + module["module-config-version"] + + '.yaml') + module_conf = yaml.load(response.read()) + modules.append(module["module"]) + module_uris.append(kwargs["plugins_uri"] + + '/' + + module["module-config-name"] + + '_' + + module["module-config-version"] + + '.yaml') + module_titles.append(str(module_conf['plugin-config-metadata']['title'])) + module_versions.append(str(module_conf['plugin-config-metadata']['version'])) + module_creations.append(str(module_conf['plugin-config-metadata']['created'])) + module_shas.append(sha_uri(kwargs["plugins_uri"] + + '/' + + module["module-config-name"] + + '_' + + module["module-config-version"] + + '.yaml')) + module_comments.append(str(module_conf['plugin-config-metadata']['comment'])) + module_conf.pop('plugin-config-metadata') + final_dea_conf['settings']['editable'].update(module_conf) + scenario_module_override_conf = module.get('module-config-override') + if scenario_module_override_conf: + dea_scenario_module_override_conf = {} + dea_scenario_module_override_conf['settings'] = {} + dea_scenario_module_override_conf['settings']['editable'] = {} + dea_scenario_module_override_conf['settings']['editable'][module["module"]] = scenario_module_override_conf + final_dea_conf = dict(merge_dicts(final_dea_conf, dea_scenario_module_override_conf)) + + if dea_pod_override_nodes: + for node in final_dea_conf['nodes']: + data = get_node_ifaces_and_trans(dea_pod_override_nodes, node['id']) + if data: + print ("Honoring original interfaces and transformations for " + "node %d to %s, %s" % (node['id'], data[0], data[1])) + node['interfaces'] = data[0] + node['transformations'] = data[1] + + # Dump final dea.yaml including configuration management meta-data to argument provided + # directory + if not os.path.exists(kwargs["output_path"]): + os.makedirs(kwargs["output_path"]) + print('Dumping final dea.yaml to ' + kwargs["output_path"] + '/dea.yaml....') + with open(kwargs["output_path"] + '/dea.yaml', "w") as f: + f.write("\n".join([("title: DEA.yaml file automatically generated from the" + 'configuration files stated in the "configuration-files"' + "fragment below"), + "version: " + str(calendar.timegm(time.gmtime())), + "created: " + str(time.strftime("%d/%m/%Y")) + " " + + str(time.strftime("%H:%M:%S")), + "comment: none\n"])) + + f.write("\n".join(["configuration-files:", + " dea-base:", + " uri: " + kwargs["dea_base_uri"], + " title: " + str(dea_base_title), + " version: " + str(dea_base_version), + " created: " + str(dea_base_creation), + " sha1: " + str(dea_base_sha), + " comment: " + str(dea_base_comment) + "\n"])) + + f.write("\n".join([" pod-override:", + " uri: " + kwargs["dea_pod_override_uri"], + " title: " + str(dea_pod_title), + " version: " + str(dea_pod_version), + " created: " + str(dea_pod_creation), + " sha1: " + str(dea_pod_sha), + " comment: " + str(dea_pod_comment) + "\n"])) + + f.write("\n".join([" deployment-scenario:", + " uri: " + str(scenario_uri), + " title: " + str(deploy_scenario_title), + " version: " + str(deploy_scenario_version), + " created: " + str(deploy_scenario_creation), + " sha1: " + str(deploy_scenario_sha), + " comment: " + str(deploy_scenario_comment) + "\n"])) + + f.write(" plugin-modules:\n") + for k, _ in enumerate(modules): + f.write("\n".join([" - module: " + modules[k], + " uri: " + module_uris[k], + " title: " + module_titles[k], + " version: " + module_versions[k], + " created: " + module_creations[k], + " sha-1: " + module_shas[k], + " comment: " + module_comments[k] + "\n"])) + + yaml.dump(final_dea_conf, f, default_flow_style=False) + + # Load POD dha and override it with "deployment-scenario/dha-override-config" section + print('Generating final dha.yaml configuration....') + print('Parsing dha-pod yaml configuration....') + response = urllib2.urlopen(kwargs["dha_uri"]) + dha_pod_conf = yaml.load(response.read()) + dha_pod_title = dha_pod_conf['dha-pod-config-metadata']['title'] + dha_pod_version = dha_pod_conf['dha-pod-config-metadata']['version'] + dha_pod_creation = dha_pod_conf['dha-pod-config-metadata']['created'] + dha_pod_sha = sha_uri(kwargs["dha_uri"]) + dha_pod_comment = dha_pod_conf['dha-pod-config-metadata']['comment'] + dha_pod_conf.pop('dha-pod-config-metadata') + final_dha_conf = dha_pod_conf + + dha_scenario_override_conf = deploy_scenario_conf["dha-override-config"] + # Only virtual deploy scenarios can override dha.yaml since there + # is no way to programatically override a physical environment: + # wireing, IPMI set-up, etc. + # For Physical environments, dha.yaml overrides will be silently ignored + if dha_scenario_override_conf and (final_dha_conf['adapter'] == 'libvirt' + or final_dha_conf['adapter'] == 'esxi' + or final_dha_conf['adapter'] == 'vbox'): + print('Merging dha-pod and deployment-scenario override information to final dha.yaml configuration....') + final_dha_conf = dict(merge_dicts(final_dha_conf, dha_scenario_override_conf)) + + # Dump final dha.yaml to argument provided directory + print('Dumping final dha.yaml to ' + kwargs["output_path"] + '/dha.yaml....') + with open(kwargs["output_path"] + '/dha.yaml', "w") as f: + f.write("\n".join([("title: DHA.yaml file automatically generated from" + "the configuration files stated in the" + '"configuration-files" fragment below'), + "version: " + str(calendar.timegm(time.gmtime())), + "created: " + str(time.strftime("%d/%m/%Y")) + " " + + str(time.strftime("%H:%M:%S")), + "comment: none\n"])) + + f.write("configuration-files:\n") + + f.write("\n".join([" dha-pod-configuration:", + " uri: " + kwargs["dha_uri"], + " title: " + str(dha_pod_title), + " version: " + str(dha_pod_version), + " created: " + str(dha_pod_creation), + " sha-1: " + str(dha_pod_sha), + " comment: " + str(dha_pod_comment) + "\n"])) + + f.write("\n".join([" deployment-scenario:", + " uri: " + str(scenario_uri), + " title: " + str(deploy_scenario_title), + " version: " + str(deploy_scenario_version), + " created: " + str(deploy_scenario_creation), + " sha-1: " + str(deploy_scenario_sha), + " comment: " + str(deploy_scenario_comment) + "\n"])) + + yaml.dump(final_dha_conf, f, default_flow_style=False) + +if __name__ == '__main__': + main() diff --git a/deploy/scenario/README b/deploy/scenario/README index 3472f6630..e32262d0d 100644 --- a/deploy/scenario/README +++ b/deploy/scenario/README @@ -93,23 +93,18 @@ dea-override-config: - id: 1 interfaces: interfaces_1 role: mongo,controller,opendaylight - transformations: transformations_1 - id: 2 interfaces: interfaces_1 role: mongo,controller - transformations: transformations_1 - id: 3 interfaces: interfaces_1 role: mongo,controller - transformations: transformations_1 - id: 4 interfaces: interfaces_1 role: ceph-osd,compute - transformations: transformations_1 - id: 5 interfaces: interfaces_1 role: ceph-osd,compute - transformations: transformations_1 settings: editable: diff --git a/deploy/scenario/ha_heat_ceilometer_scenario.yaml b/deploy/scenario/ha_heat_ceilometer_scenario.yaml index 8ab5f9277..4051c478a 100644 --- a/deploy/scenario/ha_heat_ceilometer_scenario.yaml +++ b/deploy/scenario/ha_heat_ceilometer_scenario.yaml @@ -41,23 +41,18 @@ dea-override-config: - id: 1 interfaces: interfaces_1 role: controller - transformations: transformations_1 - id: 2 interfaces: interfaces_1 role: mongo, controller - transformations: transformations_1 - id: 3 interfaces: interfaces_1 role: ceph-osd,controller - transformations: transformations_1 - id: 4 interfaces: interfaces_1 role: ceph-osd,compute - transformations: transformations_1 - id: 5 interfaces: interfaces_1 role: ceph-osd,compute - transformations: transformations_1 dha-override-config: nodes: diff --git a/deploy/scenario/ha_nfv-kvm_heat_ceilometer_scenario.yaml b/deploy/scenario/ha_nfv-kvm_heat_ceilometer_scenario.yaml index 828569bb7..1217f7273 100644 --- a/deploy/scenario/ha_nfv-kvm_heat_ceilometer_scenario.yaml +++ b/deploy/scenario/ha_nfv-kvm_heat_ceilometer_scenario.yaml @@ -46,23 +46,18 @@ dea-override-config: - id: 1 interfaces: interfaces_1 role: controller,mongo - transformations: transformations_1 - id: 2 interfaces: interfaces_1 role: controller - transformations: transformations_1 - id: 3 interfaces: interfaces_1 role: controller - transformations: transformations_1 - id: 4 interfaces: interfaces_1 role: compute,ceph-osd - transformations: transformations_1 - id: 5 interfaces: interfaces_1 role: compute,ceph-osd - transformations: transformations_1 settings: editable: diff --git a/deploy/scenario/ha_nfv-ovs_heat_ceilometer_scenario.yaml b/deploy/scenario/ha_nfv-ovs_heat_ceilometer_scenario.yaml index 6ececba6c..51deb4e28 100644 --- a/deploy/scenario/ha_nfv-ovs_heat_ceilometer_scenario.yaml +++ b/deploy/scenario/ha_nfv-ovs_heat_ceilometer_scenario.yaml @@ -54,26 +54,21 @@ dea-override-config: net_segment_type: vlan nodes: - id: 1 - interfaces: interfaces_dpdk + interfaces: interfaces_vlan role: controller - transformations: transformations_vlan - id: 2 - interfaces: interfaces_dpdk + interfaces: interfaces_vlan role: mongo,controller - transformations: transformations_vlan - id: 3 - interfaces: interfaces_dpdk + interfaces: interfaces_vlan role: ceph-osd,controller - transformations: transformations_vlan - id: 4 interfaces: interfaces_dpdk role: ceph-osd,compute - transformations: transformations_dpdk attributes: attributes_1 - id: 5 interfaces: interfaces_dpdk role: ceph-osd,compute - transformations: transformations_dpdk attributes: attributes_1 attributes_1: @@ -82,7 +77,7 @@ dea-override-config: value: 128 nova: value: - '2048': 256 + '2048': 1024 network: networking_parameters: diff --git a/deploy/scenario/ha_odl-bgpvpn_scenario.yaml b/deploy/scenario/ha_odl-bgpvpn_scenario.yaml index 2257cbb70..7d52e77e2 100644 --- a/deploy/scenario/ha_odl-bgpvpn_scenario.yaml +++ b/deploy/scenario/ha_odl-bgpvpn_scenario.yaml @@ -59,23 +59,18 @@ dea-override-config: - id: 1 interfaces: interfaces_1 role: controller,opendaylight - transformations: transformations_1 - id: 2 interfaces: interfaces_1 role: mongo,controller - transformations: transformations_1 - id: 3 interfaces: interfaces_1 role: ceph-osd,controller - transformations: transformations_1 - id: 4 interfaces: interfaces_1 role: ceph-osd,compute - transformations: transformations_1 - id: 5 interfaces: interfaces_1 role: ceph-osd,compute - transformations: transformations_1 dha-override-config: diff --git a/deploy/scenario/ha_odl-l2_heat_ceilometer_scenario.yaml b/deploy/scenario/ha_odl-l2_heat_ceilometer_scenario.yaml index 0d16a3d65..90c89aedc 100644 --- a/deploy/scenario/ha_odl-l2_heat_ceilometer_scenario.yaml +++ b/deploy/scenario/ha_odl-l2_heat_ceilometer_scenario.yaml @@ -60,23 +60,18 @@ dea-override-config: - id: 1 interfaces: interfaces_1 role: controller,opendaylight - transformations: transformations_1 - id: 2 interfaces: interfaces_1 role: mongo,controller - transformations: transformations_1 - id: 3 interfaces: interfaces_1 role: ceph-osd,controller - transformations: transformations_1 - id: 4 interfaces: interfaces_1 role: ceph-osd,compute - transformations: transformations_1 - id: 5 interfaces: interfaces_1 role: ceph-osd,compute - transformations: transformations_1 dha-override-config: nodes: diff --git a/deploy/scenario/ha_odl-l2_sfc_heat_ceilometer_scenario.yaml b/deploy/scenario/ha_odl-l2_sfc_heat_ceilometer_scenario.yaml index a900720f9..e6aef2aba 100644 --- a/deploy/scenario/ha_odl-l2_sfc_heat_ceilometer_scenario.yaml +++ b/deploy/scenario/ha_odl-l2_sfc_heat_ceilometer_scenario.yaml @@ -76,23 +76,18 @@ dea-override-config: - id: 1 interfaces: interfaces_1 role: controller,opendaylight - transformations: transformations_1 - id: 2 interfaces: interfaces_1 role: mongo,controller - transformations: transformations_1 - id: 3 interfaces: interfaces_1 role: ceph-osd,controller - transformations: transformations_1 - id: 4 interfaces: interfaces_1 role: ceph-osd,compute - transformations: transformations_1 - id: 5 interfaces: interfaces_1 role: ceph-osd,compute - transformations: transformations_1 dha-override-config: nodes: - id: 1 diff --git a/deploy/scenario/ha_odl-l3_heat_ceilometer_scenario.yaml b/deploy/scenario/ha_odl-l3_heat_ceilometer_scenario.yaml index e222582d2..0dda3b3ca 100644 --- a/deploy/scenario/ha_odl-l3_heat_ceilometer_scenario.yaml +++ b/deploy/scenario/ha_odl-l3_heat_ceilometer_scenario.yaml @@ -66,23 +66,18 @@ dea-override-config: - id: 1 interfaces: interfaces_1 role: controller,opendaylight - transformations: transformations_1 - id: 2 interfaces: interfaces_1 role: mongo,controller - transformations: transformations_1 - id: 3 interfaces: interfaces_1 role: ceph-osd,controller - transformations: transformations_1 - id: 4 interfaces: interfaces_1 role: ceph-osd,compute - transformations: transformations_1 - id: 5 interfaces: interfaces_1 role: ceph-osd,compute - transformations: transformations_1 settings: editable: public_network_assignment: diff --git a/deploy/scenario/ha_onos_nofeature_heat_ceilometer_scenario.yaml b/deploy/scenario/ha_onos_nofeature_heat_ceilometer_scenario.yaml index cb46af569..f813458d0 100644 --- a/deploy/scenario/ha_onos_nofeature_heat_ceilometer_scenario.yaml +++ b/deploy/scenario/ha_onos_nofeature_heat_ceilometer_scenario.yaml @@ -67,23 +67,18 @@ dea-override-config: - id: 1 interfaces: interfaces_1 role: controller,onos - transformations: transformations_1 - id: 2 interfaces: interfaces_1 role: mongo,controller - transformations: transformations_1 - id: 3 interfaces: interfaces_1 role: ceph-osd,controller - transformations: transformations_1 - id: 4 interfaces: interfaces_1 role: ceph-osd,compute - transformations: transformations_1 - id: 5 interfaces: interfaces_1 role: ceph-osd,compute - transformations: transformations_1 settings: editable: public_network_assignment: diff --git a/deploy/scenario/ha_onos_sfc_heat_ceilometer_scenario.yaml b/deploy/scenario/ha_onos_sfc_heat_ceilometer_scenario.yaml index e9dd0e196..32fbfcf6c 100644 --- a/deploy/scenario/ha_onos_sfc_heat_ceilometer_scenario.yaml +++ b/deploy/scenario/ha_onos_sfc_heat_ceilometer_scenario.yaml @@ -47,23 +47,18 @@ dea-override-config: - id: 1 interfaces: interfaces_1 role: controller,onos - transformations: transformations_1 - id: 2 interfaces: interfaces_1 role: mongo,controller - transformations: transformations_1 - id: 3 interfaces: interfaces_1 role: ceph-osd,controller - transformations: transformations_1 - id: 4 interfaces: interfaces_1 role: ceph-osd,compute - transformations: transformations_1 - id: 5 interfaces: interfaces_1 role: ceph-osd,compute - transformations: transformations_1 settings: editable: public_network_assignment: diff --git a/deploy/scenario/ha_vlan_heat_ceilometer_scenario.yaml b/deploy/scenario/ha_vlan_heat_ceilometer_scenario.yaml index dc7868b56..d1d5191f0 100644 --- a/deploy/scenario/ha_vlan_heat_ceilometer_scenario.yaml +++ b/deploy/scenario/ha_vlan_heat_ceilometer_scenario.yaml @@ -45,23 +45,18 @@ dea-override-config: - id: 1 interfaces: interfaces_1 role: controller - transformations: transformations_1 - id: 2 interfaces: interfaces_1 role: mongo,controller - transformations: transformations_1 - id: 3 interfaces: interfaces_1 role: ceph-osd,controller - transformations: transformations_1 - id: 4 interfaces: interfaces_1 role: ceph-osd,compute - transformations: transformations_1 - id: 5 interfaces: interfaces_1 role: ceph-osd,compute - transformations: transformations_1 settings: editable: diff --git a/deploy/scenario/no-ha_heat_ceilometer_scenario.yaml b/deploy/scenario/no-ha_heat_ceilometer_scenario.yaml index c21585979..3dd5f841e 100644 --- a/deploy/scenario/no-ha_heat_ceilometer_scenario.yaml +++ b/deploy/scenario/no-ha_heat_ceilometer_scenario.yaml @@ -41,19 +41,15 @@ dea-override-config: - id: 1 interfaces: interfaces_1 role: mongo,controller - transformations: transformations_1 - id: 2 interfaces: interfaces_1 role: ceph-osd,compute - transformations: transformations_1 - id: 3 interfaces: interfaces_1 role: ceph-osd,compute - transformations: transformations_1 - id: 4 interfaces: interfaces_1 role: ceph-osd,compute - transformations: transformations_1 dha-override-config: # disks: diff --git a/deploy/scenario/no-ha_nfv-kvm_heat_ceilometer_scenario.yaml b/deploy/scenario/no-ha_nfv-kvm_heat_ceilometer_scenario.yaml index 779c6e14a..4661a263d 100644 --- a/deploy/scenario/no-ha_nfv-kvm_heat_ceilometer_scenario.yaml +++ b/deploy/scenario/no-ha_nfv-kvm_heat_ceilometer_scenario.yaml @@ -48,19 +48,15 @@ dea-override-config: - id: 1 interfaces: interfaces_1 role: mongo,controller - transformations: transformations_1 - id: 2 interfaces: interfaces_1 role: ceph-osd - transformations: transformations_1 - id: 3 interfaces: interfaces_1 role: compute - transformations: transformations_1 - id: 4 interfaces: interfaces_1 role: compute - transformations: transformations_1 settings: editable: diff --git a/deploy/scenario/no-ha_nfv-kvm_nfv-ovs_heat_ceilometer_scenario.yaml b/deploy/scenario/no-ha_nfv-kvm_nfv-ovs_heat_ceilometer_scenario.yaml index 56251215a..87364e83a 100644 --- a/deploy/scenario/no-ha_nfv-kvm_nfv-ovs_heat_ceilometer_scenario.yaml +++ b/deploy/scenario/no-ha_nfv-kvm_nfv-ovs_heat_ceilometer_scenario.yaml @@ -55,19 +55,15 @@ dea-override-config: - id: 1 interfaces: interfaces_1 role: mongo,controller - transformations: transformations_1 - id: 2 interfaces: interfaces_1 role: ceph-osd,compute - transformations: transformations_2 - id: 3 interfaces: interfaces_1 role: ceph-osd,compute - transformations: transformations_2 - id: 4 interfaces: interfaces_1 role: ceph-osd,compute - transformations: transformations_2 settings: editable: additional_components: 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 f7b69a50f..7ab76cbcf 100644 --- a/deploy/scenario/no-ha_nfv-ovs_heat_ceilometer_scenario.yaml +++ b/deploy/scenario/no-ha_nfv-ovs_heat_ceilometer_scenario.yaml @@ -54,23 +54,19 @@ dea-override-config: net_segment_type: vlan nodes: - id: 1 - interfaces: interfaces_dpdk + interfaces: interfaces_vlan role: mongo,controller - transformations: transformations_vlan - id: 2 interfaces: interfaces_dpdk role: ceph-osd,compute - transformations: transformations_dpdk attributes: attributes_1 - id: 3 interfaces: interfaces_dpdk role: ceph-osd,compute - transformations: transformations_dpdk attributes: attributes_1 - id: 4 interfaces: interfaces_dpdk role: ceph-osd,compute - transformations: transformations_dpdk attributes: attributes_1 attributes_1: @@ -79,7 +75,7 @@ dea-override-config: value: 128 nova: value: - '2048': 256 + '2048': 1024 network: networking_parameters: diff --git a/deploy/scenario/no-ha_odl-bgpvpn_scenario.yaml b/deploy/scenario/no-ha_odl-bgpvpn_scenario.yaml index 08b46feca..6f21ea2c8 100644 --- a/deploy/scenario/no-ha_odl-bgpvpn_scenario.yaml +++ b/deploy/scenario/no-ha_odl-bgpvpn_scenario.yaml @@ -60,19 +60,15 @@ dea-override-config: - id: 1 interfaces: interfaces_1 role: mongo,controller - transformations: transformations_1 - id: 2 interfaces: interfaces_1 role: ceph-osd,opendaylight - transformations: transformations_1 - id: 3 interfaces: interfaces_1 role: ceph-osd,compute - transformations: transformations_1 - id: 4 interfaces: interfaces_1 role: ceph-osd,compute - transformations: transformations_1 dha-override-config: # disks: diff --git a/deploy/scenario/no-ha_odl-l2_heat_ceilometer_scenario.yaml b/deploy/scenario/no-ha_odl-l2_heat_ceilometer_scenario.yaml index e90f7e720..f8787d780 100644 --- a/deploy/scenario/no-ha_odl-l2_heat_ceilometer_scenario.yaml +++ b/deploy/scenario/no-ha_odl-l2_heat_ceilometer_scenario.yaml @@ -61,19 +61,15 @@ dea-override-config: - id: 1 interfaces: interfaces_1 role: mongo,controller - transformations: transformations_1 - id: 2 interfaces: interfaces_1 role: ceph-osd,opendaylight - transformations: transformations_1 - id: 3 interfaces: interfaces_1 role: ceph-osd,compute - transformations: transformations_1 - id: 4 interfaces: interfaces_1 role: ceph-osd,compute - transformations: transformations_1 dha-override-config: # disks: diff --git a/deploy/scenario/no-ha_odl-l2_sfc_heat_ceilometer_scenario.yaml b/deploy/scenario/no-ha_odl-l2_sfc_heat_ceilometer_scenario.yaml index 218378de3..a8d9ed848 100644 --- a/deploy/scenario/no-ha_odl-l2_sfc_heat_ceilometer_scenario.yaml +++ b/deploy/scenario/no-ha_odl-l2_sfc_heat_ceilometer_scenario.yaml @@ -77,19 +77,15 @@ dea-override-config: - id: 1 interfaces: interfaces_1 role: mongo,controller - transformations: transformations_1 - id: 2 interfaces: interfaces_1 role: ceph-osd,opendaylight - transformations: transformations_1 - id: 3 interfaces: interfaces_1 role: ceph-osd,compute - transformations: transformations_1 - id: 4 interfaces: interfaces_1 role: ceph-osd,compute - transformations: transformations_1 dha-override-config: # disks: diff --git a/deploy/scenario/no-ha_odl-l3_heat_ceilometer_scenario.yaml b/deploy/scenario/no-ha_odl-l3_heat_ceilometer_scenario.yaml index 7fa7829f2..5f800abad 100644 --- a/deploy/scenario/no-ha_odl-l3_heat_ceilometer_scenario.yaml +++ b/deploy/scenario/no-ha_odl-l3_heat_ceilometer_scenario.yaml @@ -66,19 +66,15 @@ dea-override-config: - id: 1 interfaces: interfaces_1 role: mongo,controller - transformations: transformations_1 - id: 2 interfaces: interfaces_1 role: ceph-osd,opendaylight - transformations: transformations_1 - id: 3 interfaces: interfaces_1 role: ceph-osd,compute - transformations: transformations_1 - id: 4 interfaces: interfaces_1 role: ceph-osd,compute - transformations: transformations_1 settings: editable: public_network_assignment: diff --git a/deploy/scenario/no-ha_onos_nofeature_heat_ceilometer_scenario.yaml b/deploy/scenario/no-ha_onos_nofeature_heat_ceilometer_scenario.yaml index c6f07a73c..f5c00f0c9 100644 --- a/deploy/scenario/no-ha_onos_nofeature_heat_ceilometer_scenario.yaml +++ b/deploy/scenario/no-ha_onos_nofeature_heat_ceilometer_scenario.yaml @@ -68,19 +68,15 @@ dea-override-config: - id: 1 interfaces: interfaces_1 role: mongo,controller,onos - transformations: transformations_1 - id: 2 interfaces: interfaces_1 role: ceph-osd,compute - transformations: transformations_1 - id: 3 interfaces: interfaces_1 role: ceph-osd,compute - transformations: transformations_1 - id: 4 interfaces: interfaces_1 role: ceph-osd,compute - transformations: transformations_1 settings: editable: public_network_assignment: diff --git a/deploy/scenario/no-ha_onos_sfc_heat_ceilometer_scenario.yaml b/deploy/scenario/no-ha_onos_sfc_heat_ceilometer_scenario.yaml index 80d73b335..587346ef4 100644 --- a/deploy/scenario/no-ha_onos_sfc_heat_ceilometer_scenario.yaml +++ b/deploy/scenario/no-ha_onos_sfc_heat_ceilometer_scenario.yaml @@ -48,19 +48,15 @@ dea-override-config: - id: 1 interfaces: interfaces_1 role: mongo,controller,onos - transformations: transformations_1 - id: 2 interfaces: interfaces_1 role: ceph-osd,compute - transformations: transformations_1 - id: 3 interfaces: interfaces_1 role: ceph-osd,compute - transformations: transformations_1 - id: 4 interfaces: interfaces_1 role: ceph-osd,compute - transformations: transformations_1 settings: editable: public_network_assignment: diff --git a/deploy/scenario/no-ha_vlan_heat_ceilometer_scenario.yaml b/deploy/scenario/no-ha_vlan_heat_ceilometer_scenario.yaml index 5df530f42..567ea9867 100644 --- a/deploy/scenario/no-ha_vlan_heat_ceilometer_scenario.yaml +++ b/deploy/scenario/no-ha_vlan_heat_ceilometer_scenario.yaml @@ -45,19 +45,15 @@ dea-override-config: - id: 1 interfaces: interfaces_1 role: mongo,controller - transformations: transformations_1 - id: 2 interfaces: interfaces_1 role: ceph-osd,compute - transformations: transformations_1 - id: 3 interfaces: interfaces_1 role: ceph-osd,compute - transformations: transformations_1 - id: 4 interfaces: interfaces_1 role: ceph-osd,compute - transformations: transformations_1 settings: editable: additional_components: |