diff options
Diffstat (limited to 'VNFs/DPPD-PROX/helper-scripts/rapid/stackdeployment.py')
-rwxr-xr-x | VNFs/DPPD-PROX/helper-scripts/rapid/stackdeployment.py | 60 |
1 files changed, 37 insertions, 23 deletions
diff --git a/VNFs/DPPD-PROX/helper-scripts/rapid/stackdeployment.py b/VNFs/DPPD-PROX/helper-scripts/rapid/stackdeployment.py index 525cff1a..7038ab66 100755 --- a/VNFs/DPPD-PROX/helper-scripts/rapid/stackdeployment.py +++ b/VNFs/DPPD-PROX/helper-scripts/rapid/stackdeployment.py @@ -75,7 +75,7 @@ class StackDeployment(object): for name in server_group_output: self.names.append(name) - def print_paramDict(self, user, push_gateway): + def print_paramDict(self, user, dataplane_subnet_mask): if not(len(self.dp_ips) == len(self.dp_macs) == len(self.mngmt_ips)): sys.exit() _ENV_FILE_DIR = os.path.dirname(os.path.realpath(__file__)) @@ -90,9 +90,11 @@ class StackDeployment(object): env_file.write('admin_ip = {}\n'.format(str(self.mngmt_ips[count]))) if type(self.dp_ips[count]) == list: for i, dp_ip in enumerate(self.dp_ips[count], start = 1): - env_file.write('dp_ip{} = {}\n'.format(i, str(dp_ip))) + env_file.write('dp_ip{} = {}/{}\n'.format(i, str(dp_ip), + dataplane_subnet_mask)) else: - env_file.write('dp_ip1 = {}\n'.format(str(self.dp_ips[count]))) + env_file.write('dp_ip1 = {}/{}\n'.format(str(self.dp_ips[count]), + dataplane_subnet_mask)) if type(self.dp_macs[count]) == list: for i, dp_mac in enumerate(self.dp_macs[count], start = 1): env_file.write('dp_mac{} = {}\n'.format(i, str(dp_mac))) @@ -100,23 +102,20 @@ class StackDeployment(object): env_file.write('dp_mac1 = {}\n'.format(str(self.dp_macs[count]))) env_file.write('\n') env_file.write('[ssh]\n') - env_file.write('key = {}\n'.format(self.private_key_filename)) + env_file.write('key = {}\n'.format(self.key_name)) env_file.write('user = {}\n'.format(user)) env_file.write('\n') env_file.write('[Varia]\n') env_file.write('vim = OpenStack\n') env_file.write('stack = {}\n'.format(self.stack.stack_name)) - if push_gateway: - env_file.write('pushgateway = {}\n'.format(push_gateway)) - def create_stack(self, stack_name, stack_file_path, param_file): + def create_stack(self, stack_name, stack_file_path, heat_parameters): files, template = template_utils.process_template_path(stack_file_path) - heat_parameters = open(param_file) - temp_params = yaml.load(heat_parameters,Loader=yaml.BaseLoader) - heat_parameters.close() - stack_created = self.heatclient.stacks.create(stack_name=stack_name, template=template, - parameters=temp_params["parameters"], files=files) - stack = self.heatclient.stacks.get(stack_created['stack']['id'], resolve_outputs=True) + stack_created = self.heatclient.stacks.create(stack_name = stack_name, + template = template, parameters = heat_parameters, + files = files) + stack = self.heatclient.stacks.get(stack_created['stack']['id'], + resolve_outputs=True) # Poll at 5 second intervals, until the status is no longer 'BUILD' while stack.stack_status == 'CREATE_IN_PROGRESS': print('waiting..') @@ -128,11 +127,22 @@ class StackDeployment(object): RapidLog.exception('Error in stack deployment') def create_key(self): - keypair = self.nova_client.keypairs.create(name=self.key_name) + if os.path.exists(self.key_name): + public_key_file = "{}.pub".format(self.key_name) + if not os.path.exists(public_key_file): + RapidLog.critical('Keypair {}.pub does not exist'.format( + self.key_name)) + with open(public_key_file, mode='rb') as public_file: + public_key = public_file.read() + else: + public_key = None + keypair = self.nova_client.keypairs.create(name = self.key_name, + public_key = public_key) # Create a file for writing that can only be read and written by owner - fp = os.open(self.private_key_filename, os.O_WRONLY | os.O_CREAT, 0o600) - with os.fdopen(fp, 'w') as f: - f.write(keypair.private_key) + if not os.path.exists(self.key_name): + fp = os.open(self.key_name, os.O_WRONLY | os.O_CREAT, 0o600) + with os.fdopen(fp, 'w') as f: + f.write(keypair.private_key) RapidLog.info('Keypair {} created'.format(self.key_name)) def IsDeployed(self, stack_name): @@ -150,14 +160,18 @@ class StackDeployment(object): return True return False - def deploy(self, stack_name, keypair_name, heat_template, heat_param): - self.key_name = keypair_name - self.private_key_filename = '{}.pem'.format(keypair_name) + def deploy(self, stack_name, heat_template, heat_param): + heat_parameters_file = open(heat_param) + heat_parameters = yaml.load(heat_parameters_file, + Loader=yaml.BaseLoader)['parameters'] + heat_parameters_file.close() + self.key_name = heat_parameters['PROX_key'] if not self.IsDeployed(stack_name): if not self.IsKey(): self.create_key() - self.stack = self.create_stack(stack_name, heat_template, heat_param) + self.stack = self.create_stack(stack_name, heat_template, + heat_parameters) - def generate_env_file(self, user = 'centos', push_gateway = None): + def generate_env_file(self, user = 'centos', dataplane_subnet_mask = '24'): self.generate_paramDict() - self.print_paramDict(user, push_gateway) + self.print_paramDict(user, dataplane_subnet_mask) |