summaryrefslogtreecommitdiffstats
path: root/apex/overcloud
diff options
context:
space:
mode:
authorTim Rozet <trozet@redhat.com>2017-09-12 17:32:56 -0400
committerTim Rozet <trozet@redhat.com>2017-11-06 04:35:02 +0000
commitb3c610b205f88dddb02cdac39638c52eafaaf82c (patch)
tree4826027e2d968e61c8024d972f3665ff3a8a09d7 /apex/overcloud
parent3c7556eb0734706f28588fb952eedea2d424c6d2 (diff)
Adds ability to deploy from upstream openstack
To deploy with upstream openstack branch, use new deploy setting 'os_version'. A default scenario file for nosdn with pike has been included in this patch. If 'os_version' is a version other than the default version for this OPNFV release, then upstream is used. In order to use upstream with the current OS version use '--upstream' argument to the deploy command, to force an upstream deployment. Also include '-e upstream-environment.yaml' to use default upstream deployment settings. Supports nosdn and odl-nofeature deployments. Change-Id: Ic07e308827b449637b4e86cdd086434e4de2fb69 Signed-off-by: Tim Rozet <trozet@redhat.com>
Diffstat (limited to 'apex/overcloud')
-rw-r--r--apex/overcloud/deploy.py68
1 files changed, 34 insertions, 34 deletions
diff --git a/apex/overcloud/deploy.py b/apex/overcloud/deploy.py
index 495743bd..3ddb5f40 100644
--- a/apex/overcloud/deploy.py
+++ b/apex/overcloud/deploy.py
@@ -93,10 +93,14 @@ def build_sdn_env_list(ds, sdn_map, env_list=None):
def create_deploy_cmd(ds, ns, inv, tmp_dir,
- virtual, env_file='opnfv-environment.yaml'):
+ virtual, env_file='opnfv-environment.yaml',
+ net_data=False):
logging.info("Creating deployment command")
- deploy_options = [env_file, 'network-environment.yaml']
+ deploy_options = ['network-environment.yaml']
+
+ if env_file:
+ deploy_options.append(env_file)
ds_opts = ds['deploy_options']
deploy_options += build_sdn_env_list(ds_opts, SDN_FILE_MAP)
@@ -133,6 +137,8 @@ def create_deploy_cmd(ds, ns, inv, tmp_dir,
cmd += " --control-scale {}".format(num_control)
cmd += " --compute-scale {}".format(num_compute)
cmd += ' --control-flavor control --compute-flavor compute'
+ if net_data:
+ cmd += ' --networks-file network_data.yaml'
logging.info("Deploy command set: {}".format(cmd))
with open(os.path.join(tmp_dir, 'deploy_command'), 'w') as fh:
@@ -356,7 +362,7 @@ def prep_env(ds, ns, inv, opnfv_env, net_env, tmp_dir):
perf = False
# Modify OPNFV environment
- # TODO: Change to build a dict and outputing yaml rather than parsing
+ # TODO: Change to build a dict and outputting yaml rather than parsing
for line in fileinput.input(tmp_opnfv_env, inplace=True):
line = line.strip('\n')
output_line = line
@@ -370,6 +376,14 @@ def prep_env(ds, ns, inv, opnfv_env, net_env, tmp_dir):
output_line += key_out
elif 'replace_public_key' in line:
output_line = " public_key: '{}'".format(public_key)
+ elif ((perf and perf_kern_comp) or ds_opts.get('rt_kvm')) and \
+ 'resource_registry' in line:
+ output_line = "resource_registry:\n" \
+ " OS::TripleO::NodeUserData: first-boot.yaml"
+ elif 'ComputeExtraConfigPre' in line and \
+ ds_opts['dataplane'] == 'ovs_dpdk':
+ output_line = ' OS::TripleO::ComputeExtraConfigPre: ' \
+ './ovs-dpdk-preconfig.yaml'
if ds_opts['sdn_controller'] == 'opendaylight' and \
'odl_vpp_routing_node' in ds_opts:
@@ -430,46 +444,32 @@ def prep_env(ds, ns, inv, opnfv_env, net_env, tmp_dir):
if perf_line:
output_line = (" {}:{}".format(cfg, perf_line))
- # kernel args
- # (FIXME) use compute's kernel settings for all nodes for now.
- if 'ComputeKernelArgs' in line and perf_kern_comp:
- kernel_args = ''
- for k, v in perf_kern_comp.items():
- kernel_args += "{}={} ".format(k, v)
- if kernel_args:
- output_line = " ComputeKernelArgs: '{}'".\
- format(kernel_args)
if ds_opts['dataplane'] == 'ovs_dpdk' and perf_ovs_comp:
for k, v in OVS_PERF_MAP.items():
if k in line and v in perf_ovs_comp:
output_line = " {}: '{}'".format(k, perf_ovs_comp[v])
+ # kernel args
+ # (FIXME) use compute's kernel settings for all nodes for now.
+ if perf_kern_comp:
+ if 'NovaSchedulerDefaultFilters' in line:
+ output_line = \
+ " NovaSchedulerDefaultFilters: 'RamFilter," \
+ "ComputeFilter,AvailabilityZoneFilter," \
+ "ComputeCapabilitiesFilter," \
+ "ImagePropertiesFilter,NUMATopologyFilter'"
+ elif 'ComputeKernelArgs' in line:
+ kernel_args = ''
+ for k, v in perf_kern_comp.items():
+ kernel_args += "{}={} ".format(k, v)
+ if kernel_args:
+ output_line = " ComputeKernelArgs: '{}'".\
+ format(kernel_args)
+
print(output_line)
logging.info("opnfv-environment file written to {}".format(tmp_opnfv_env))
- # Modify Network environment
- for line in fileinput.input(net_env, inplace=True):
- line = line.strip('\n')
- if 'ComputeExtraConfigPre' in line and \
- ds_opts['dataplane'] == 'ovs_dpdk':
- print(' OS::TripleO::ComputeExtraConfigPre: '
- './ovs-dpdk-preconfig.yaml')
- elif ((perf and perf_kern_comp) or ds_opts.get('rt_kvm')) and \
- 'resource_registry' in line:
- print("resource_registry:\n"
- " OS::TripleO::NodeUserData: first-boot.yaml")
- elif perf and perf_kern_comp and \
- 'NovaSchedulerDefaultFilters' in line:
- print(" NovaSchedulerDefaultFilters: 'RamFilter,"
- "ComputeFilter,AvailabilityZoneFilter,"
- "ComputeCapabilitiesFilter,ImagePropertiesFilter,"
- "NUMATopologyFilter'")
- else:
- print(line)
-
- logging.info("network-environment file written to {}".format(net_env))
-
def generate_ceph_key():
key = os.urandom(16)