diff options
Diffstat (limited to 'fuel/deploy/cloud')
| -rw-r--r-- | fuel/deploy/cloud/configure_environment.py | 41 | ||||
| -rw-r--r-- | fuel/deploy/cloud/configure_network.py | 15 | ||||
| -rw-r--r-- | fuel/deploy/cloud/configure_nodes.py | 40 | ||||
| -rw-r--r-- | fuel/deploy/cloud/configure_settings.py | 12 | ||||
| -rw-r--r-- | fuel/deploy/cloud/deploy.py | 213 | ||||
| -rw-r--r-- | fuel/deploy/cloud/deployment.py | 60 |
6 files changed, 228 insertions, 153 deletions
diff --git a/fuel/deploy/cloud/configure_environment.py b/fuel/deploy/cloud/configure_environment.py index 2d68c1ba8..d0037d729 100644 --- a/fuel/deploy/cloud/configure_environment.py +++ b/fuel/deploy/cloud/configure_environment.py @@ -1,13 +1,6 @@ -############################################################################### -# Copyright (c) 2015 Ericsson AB and others. -# szilard.cserey@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 -############################################################################### - import common +import os +import shutil from configure_settings import ConfigureSettings from configure_network import ConfigureNetwork @@ -21,9 +14,6 @@ exec_cmd = common.exec_cmd parse = common.parse err = common.err log = common.log -delete = common.delete -create_dir_if_not_exists = common.create_dir_if_not_exists - class ConfigureEnvironment(object): @@ -31,6 +21,7 @@ class ConfigureEnvironment(object): self.env_id = None self.dea = dea self.yaml_config_dir = yaml_config_dir + self.env_name = self.dea.get_property('environment_name') self.release_id = release_id self.node_id_roles_dict = node_id_roles_dict self.required_networks = [] @@ -45,20 +36,21 @@ class ConfigureEnvironment(object): def configure_environment(self): log('Configure environment') - delete(self.yaml_config_dir) - create_dir_if_not_exists(self.yaml_config_dir) - env_name = self.dea.get_env_name() - env_mode = self.dea.get_env_mode() - env_net_segment_type = self.dea.get_env_net_segment_type() + if os.path.exists(self.yaml_config_dir): + log('Deleting existing config directory %s' % self.yaml_config_dir) + shutil.rmtree(self.yaml_config_dir) + log('Creating new config directory %s' % self.yaml_config_dir) + os.makedirs(self.yaml_config_dir) + + mode = self.dea.get_property('environment_mode') log('Creating environment %s release %s, mode %s, network-mode neutron' - ', net-segment-type %s' - % (env_name, self.release_id, env_mode, env_net_segment_type)) + ', net-segment-type vlan' % (self.env_name, self.release_id, mode)) exec_cmd('fuel env create --name %s --release %s --mode %s ' - '--network-mode neutron --net-segment-type %s' - % (env_name, self.release_id, env_mode, env_net_segment_type)) + '--network-mode neutron --net-segment-type vlan' + % (self.env_name, self.release_id, mode)) - if not self.env_exists(env_name): - err('Failed to create environment %s' % env_name) + if not self.env_exists(self.env_name): + err('Failed to create environment %s' % self.env_name) self.config_settings() self.config_network() self.config_nodes() @@ -76,3 +68,6 @@ class ConfigureEnvironment(object): nodes = ConfigureNodes(self.yaml_config_dir, self.env_id, self.node_id_roles_dict, self.dea) nodes.config_nodes() + + + diff --git a/fuel/deploy/cloud/configure_network.py b/fuel/deploy/cloud/configure_network.py index 00278949d..295eb90bd 100644 --- a/fuel/deploy/cloud/configure_network.py +++ b/fuel/deploy/cloud/configure_network.py @@ -1,13 +1,3 @@ -############################################################################### -# Copyright (c) 2015 Ericsson AB and others. -# szilard.cserey@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 -############################################################################### - - import common import yaml import io @@ -21,8 +11,6 @@ parse = common.parse err = common.err check_file_exists = common.check_file_exists log = common.log -backup = common.backup - class ConfigureNetwork(object): @@ -53,7 +41,6 @@ class ConfigureNetwork(object): network_yaml = ('%s/network_%s.yaml' % (self.yaml_config_dir, self.env_id)) check_file_exists(network_yaml) - backup(network_yaml) network_config = self.dea.get_property('network') @@ -71,4 +58,4 @@ class ConfigureNetwork(object): network.update(net_id[network['name']]) with io.open(network_yaml, 'w') as stream: - yaml.dump(network_config, stream, default_flow_style=False) + yaml.dump(network_config, stream, default_flow_style=False)
\ No newline at end of file diff --git a/fuel/deploy/cloud/configure_nodes.py b/fuel/deploy/cloud/configure_nodes.py index e76d222c0..4d1315a5c 100644 --- a/fuel/deploy/cloud/configure_nodes.py +++ b/fuel/deploy/cloud/configure_nodes.py @@ -1,13 +1,3 @@ -############################################################################### -# Copyright (c) 2015 Ericsson AB and others. -# szilard.cserey@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 -############################################################################### - - import common import yaml import io @@ -22,7 +12,6 @@ parse = common.parse err = common.err check_file_exists = common.check_file_exists log = common.log -backup = common.backup class ConfigureNodes(object): @@ -37,7 +26,7 @@ class ConfigureNodes(object): log('Configure nodes') for node_id, roles_blade in self.node_id_roles_dict.iteritems(): exec_cmd('fuel node set --node-id %s --role %s --env %s' - % (node_id, roles_blade[0], self.env_id)) + % (node_id, ','.join(roles_blade[0]), self.env_id)) self.download_deployment_config() for node_id, roles_blade in self.node_id_roles_dict.iteritems(): @@ -48,20 +37,22 @@ class ConfigureNodes(object): self.upload_deployment_config() def modify_node_network_schemes(self, node_id, roles_blade): - log('Modify network transformations for node %s' % node_id) + log('Modify node network transformations in environment %s' + % self.env_id) type = self.dea.get_node_property(roles_blade[1], 'transformations') - transformations = self.dea.get_property(type) - 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): + transformations = self.dea.get_transformations(type) + + for node_file in glob.glob('%s/deployment_%s/*_%s.yaml' + % (self.yaml_config_dir, self.env_id, + node_id)): with io.open(node_file) as stream: - node = yaml.load(stream) + node = yaml.load(stream) - node['network_scheme'].update(transformations) + node['network_scheme']['transformations'] = transformations with io.open(node_file, 'w') as stream: - yaml.dump(node, stream, default_flow_style=False) + yaml.dump(node, stream, default_flow_style=False) + def download_deployment_config(self): log('Download deployment config for environment %s' % self.env_id) @@ -88,7 +79,6 @@ class ConfigureNodes(object): interface_yaml = ('%s/node_%s/interfaces.yaml' % (self.yaml_config_dir, node_id)) check_file_exists(interface_yaml) - backup('%s/node_%s' % (self.yaml_config_dir, node_id)) with io.open(interface_yaml) as stream: interfaces = yaml.load(stream) @@ -96,10 +86,10 @@ class ConfigureNodes(object): net_name_id = {} for interface in interfaces: for network in interface['assigned_networks']: - net_name_id[network['name']] = network['id'] + net_name_id[network['name']] = network['id'] type = self.dea.get_node_property(roles_blade[1], 'interfaces') - interface_config = self.dea.get_property(type) + interface_config = self.dea.get_interfaces(type) for interface in interfaces: interface['assigned_networks'] = [] @@ -111,4 +101,4 @@ class ConfigureNodes(object): interface['assigned_networks'].append(net) with io.open(interface_yaml, 'w') as stream: - yaml.dump(interfaces, stream, default_flow_style=False) + yaml.dump(interfaces, stream, default_flow_style=False)
\ No newline at end of file diff --git a/fuel/deploy/cloud/configure_settings.py b/fuel/deploy/cloud/configure_settings.py index fa918fd3d..ac0afdc57 100644 --- a/fuel/deploy/cloud/configure_settings.py +++ b/fuel/deploy/cloud/configure_settings.py @@ -1,12 +1,3 @@ -############################################################################### -# Copyright (c) 2015 Ericsson AB and others. -# szilard.cserey@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 -############################################################################### - import common import yaml import io @@ -20,8 +11,6 @@ parse = common.parse err = common.err check_file_exists = common.check_file_exists log = common.log -backup = common.backup - class ConfigureSettings(object): @@ -51,7 +40,6 @@ class ConfigureSettings(object): settings_yaml = ('%s/settings_%s.yaml' % (self.yaml_config_dir, self.env_id)) check_file_exists(settings_yaml) - backup(settings_yaml) settings = self.dea.get_property('settings') diff --git a/fuel/deploy/cloud/deploy.py b/fuel/deploy/cloud/deploy.py index 705dda59c..c8714f8a6 100644 --- a/fuel/deploy/cloud/deploy.py +++ b/fuel/deploy/cloud/deploy.py @@ -1,17 +1,7 @@ -############################################################################### -# Copyright (c) 2015 Ericsson AB and others. -# szilard.cserey@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 -############################################################################### - - -import os +import time import yaml import io -import glob +import sys import common from dea import DeploymentEnvironmentAdapter @@ -29,79 +19,188 @@ parse = common.parse err = common.err check_file_exists = common.check_file_exists log = common.log -commafy = common.commafy -ArgParser = common.ArgParser - class Deploy(object): - def __init__(self, dea_file, blade_node_file, no_health_check): + def __init__(self, dea_file, macs_file): self.dea = DeploymentEnvironmentAdapter(dea_file) - self.blade_node_file = blade_node_file - self.no_health_check = no_health_check + self.macs_file = macs_file self.macs_per_blade = {} self.blades = self.dea.get_node_ids() - self.blade_node_dict = {} - self.node_roles_dict = {} + self.node_ids_dict = {} + self.node_id_roles_dict = {} + self.supported_release = None self.env_id = None - self.wanted_release = self.dea.get_property('wanted_release') - - def get_blade_node_mapping(self): - with io.open(self.blade_node_file, 'r') as stream: - self.blade_node_dict = yaml.load(stream) - - def assign_roles_to_cluster_node_ids(self): - self.node_roles_dict = {} - for blade, node in self.blade_node_dict.iteritems(): - roles = commafy(self.dea.get_node_role(blade)) - self.node_roles_dict[node] = (roles, blade) - - def configure_environment(self): + self.wanted_release = self.dea.get_wanted_release() + + def cleanup_fuel_environments(self, env_list): + WAIT_LOOP = 60 + SLEEP_TIME = 10 + for env in env_list: + log('Deleting environment %s' % env[E['id']]) + exec_cmd('fuel env --env %s --delete' % env[E['id']]) + all_env_erased = False + for i in range(WAIT_LOOP): + env_list = parse(exec_cmd('fuel env list')) + if env_list: + time.sleep(SLEEP_TIME) + else: + all_env_erased = True + break + if not all_env_erased: + err('Could not erase these environments %s' + % [(env[E['id']], env[E['status']]) for env in env_list]) + + def cleanup_fuel_nodes(self, node_list): + for node in node_list: + if node[N['status']] == 'discover': + log('Deleting node %s' % node[N['id']]) + exec_cmd('fuel node --node-id %s --delete-from-db' + % node[N['id']]) + exec_cmd('dockerctl shell cobbler cobbler system remove ' + '--name node-%s' % node[N['id']]) + + def check_previous_installation(self): + log('Check previous installation') + env_list = parse(exec_cmd('fuel env list')) + if env_list: + self.cleanup_fuel_environments(env_list) + node_list = parse(exec_cmd('fuel node list')) + if node_list: + self.cleanup_fuel_nodes(node_list) + + def check_supported_release(self): + log('Check supported release: %s' % self.wanted_release) release_list = parse(exec_cmd('fuel release -l')) for release in release_list: if release[R['name']] == self.wanted_release: + self.supported_release = release + break + if not self.supported_release: + err('This Fuel does not contain the following release: %s' + % self.wanted_release) + + def check_prerequisites(self): + log('Check prerequisites') + self.check_supported_release() + self.check_previous_installation() + + def get_mac_addresses(self): + with io.open(self.macs_file, 'r') as stream: + self.macs_per_blade = yaml.load(stream) + + def find_mac_in_dict(self, mac): + for blade, mac_list in self.macs_per_blade.iteritems(): + if mac in mac_list: + return blade + + def all_blades_discovered(self): + for blade, node_id in self.node_ids_dict.iteritems(): + if not node_id: + return False + return True + + def not_discovered_blades_summary(self): + summary = '' + for blade, node_id in self.node_ids_dict.iteritems(): + if not node_id: + summary += '\n[blade %s]' % blade + return summary + + def node_discovery(self, node_list, discovered_macs): + for node in node_list: + if (node[N['status']] == 'discover' and + node[N['online']] == 'True' and + node[N['mac']] not in discovered_macs): + discovered_macs.append(node[N['mac']]) + blade = self.find_mac_in_dict(node[N['mac']]) + if blade: + log('Blade %s discovered as Node %s with MAC %s' + % (blade, node[N['id']], node[N['mac']])) + self.node_ids_dict[blade] = node[N['id']] + + def discovery_waiting_loop(self, discovered_macs): + WAIT_LOOP = 180 + SLEEP_TIME = 10 + all_discovered = False + for i in range(WAIT_LOOP): + node_list = parse(exec_cmd('fuel node list')) + if node_list: + self.node_discovery(node_list, discovered_macs) + if self.all_blades_discovered(): + all_discovered = True break + else: + time.sleep(SLEEP_TIME) + return all_discovered + + def wait_for_discovered_blades(self): + log('Wait for discovered blades') + discovered_macs = [] + for blade in self.blades: + self.node_ids_dict[blade] = None + all_discovered = self.discovery_waiting_loop(discovered_macs) + if not all_discovered: + err('Not all blades have been discovered: %s' + % self.not_discovered_blades_summary()) + + def assign_roles_to_cluster_node_ids(self): + self.node_id_roles_dict = {} + for blade, node_id in self.node_ids_dict.iteritems(): + role_list = [] + role = self.dea.get_node_role(blade) + if role == 'controller': + role_list.extend(['controller', 'mongo']) + elif role == 'compute': + role_list.extend(['compute']) + self.node_id_roles_dict[node_id] = (role_list, blade) + + def configure_environment(self): config_env = ConfigureEnvironment(self.dea, YAML_CONF_DIR, - release[R['id']], - self.node_roles_dict) + self.supported_release[R['id']], + self.node_id_roles_dict) config_env.configure_environment() self.env_id = config_env.env_id def deploy_cloud(self): dep = Deployment(self.dea, YAML_CONF_DIR, self.env_id, - self.node_roles_dict, self.no_health_check) + self.node_id_roles_dict) dep.deploy() def deploy(self): - - self.get_blade_node_mapping() - + self.get_mac_addresses() + self.check_prerequisites() + self.wait_for_discovered_blades() self.assign_roles_to_cluster_node_ids() - self.configure_environment() - self.deploy_cloud() +def usage(): + print ''' + Usage: + python deploy.py <dea_file> <macs_file> -def parse_arguments(): - parser = ArgParser(prog='python %s' % __file__) - parser.add_argument('-nh', dest='no_health_check', action='store_true', - default=False, - help='Don\'t run health check after deployment') - parser.add_argument('dea_file', action='store', - help='Deployment Environment Adapter: dea.yaml') - parser.add_argument('blade_node_file', action='store', - help='Blade Node mapping: blade_node.yaml') - args = parser.parse_args() - check_file_exists(args.dea_file) - check_file_exists(args.blade_node_file) - return (args.dea_file, args.blade_node_file, args.no_health_check) + Example: + python deploy.py dea.yaml macs.yaml + ''' +def parse_arguments(): + if len(sys.argv) != 3: + log('Incorrect number of arguments') + usage() + sys.exit(1) + dea_file = sys.argv[-2] + macs_file = sys.argv[-1] + check_file_exists(dea_file) + check_file_exists(macs_file) + return dea_file, macs_file def main(): - dea_file, blade_node_file, no_health_check = parse_arguments() - deploy = Deploy(dea_file, blade_node_file, no_health_check) + + dea_file, macs_file = parse_arguments() + + deploy = Deploy(dea_file, macs_file) deploy.deploy() if __name__ == '__main__': - main() + main()
\ No newline at end of file diff --git a/fuel/deploy/cloud/deployment.py b/fuel/deploy/cloud/deployment.py index 90f24fd0b..cf56c3630 100644 --- a/fuel/deploy/cloud/deployment.py +++ b/fuel/deploy/cloud/deployment.py @@ -1,13 +1,3 @@ -############################################################################### -# Copyright (c) 2015 Ericsson AB and others. -# szilard.cserey@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 -############################################################################### - - import common import os import shutil @@ -29,13 +19,42 @@ log = common.log class Deployment(object): - def __init__(self, dea, yaml_config_dir, env_id, node_id_roles_dict, - no_health_check): + def __init__(self, dea, yaml_config_dir, env_id, node_id_roles_dict): self.dea = dea self.yaml_config_dir = yaml_config_dir self.env_id = env_id self.node_id_roles_dict = node_id_roles_dict - self.no_health_check = no_health_check + + def download_deployment_info(self): + log('Download deployment info for environment %s' % self.env_id) + deployment_dir = '%s/deployment_%s' \ + % (self.yaml_config_dir, self.env_id) + if os.path.exists(deployment_dir): + shutil.rmtree(deployment_dir) + exec_cmd('fuel --env %s deployment --default --dir %s' + % (self.env_id, self.yaml_config_dir)) + + def upload_deployment_info(self): + log('Upload deployment info for environment %s' % self.env_id) + exec_cmd('fuel --env %s deployment --upload --dir %s' + % (self.env_id, self.yaml_config_dir)) + + def config_opnfv(self): + log('Configure OPNFV settings on environment %s' % self.env_id) + opnfv_compute = self.dea.get_opnfv('compute') + opnfv_controller = self.dea.get_opnfv('controller') + self.download_deployment_info() + for node_file in glob.glob('%s/deployment_%s/*.yaml' + % (self.yaml_config_dir, self.env_id)): + with io.open(node_file) as stream: + node = yaml.load(stream) + if node['role'] == 'compute': + node.update(opnfv_compute) + else: + node.update(opnfv_controller) + with io.open(node_file, 'w') as stream: + yaml.dump(node, stream, default_flow_style=False) + self.upload_deployment_info() def run_deploy(self): WAIT_LOOP = 180 @@ -56,8 +75,7 @@ class Deployment(object): if env[0][E['status']] == 'operational': ready = True break - elif (env[0][E['status']] == 'error' - or env[0][E['status']] == 'stopped'): + elif env[0][E['status']] == 'error': break else: time.sleep(SLEEP_TIME) @@ -84,14 +102,12 @@ class Deployment(object): def health_check(self): log('Now running sanity and smoke health checks') - r = exec_cmd('fuel health --env %s --check sanity,smoke --force' - % self.env_id) - log(r) - if 'failure' in r: - err('Healthcheck failed!') + exec_cmd('fuel health --env %s --check sanity,smoke --force' + % self.env_id) + log('Health checks passed !') def deploy(self): + self.config_opnfv() self.run_deploy() self.verify_node_status() - if not self.no_health_check: - self.health_check() + self.health_check()
\ No newline at end of file |