diff options
| author |   Tim Rozet <trozet@redhat.com> | 2016-10-10 17:11:20 -0400 |
|---|---|---|
| committer | Tim Rozet <trozet@redhat.com> | 2016-11-11 10:43:32 -0500 |
| commit | e8b6d6debe2b056b404fc353f54b67364b58c59d (patch) | |
| tree | 759d2a9c2794c6cbc223c251e30520c3d573a4c5 /lib | |
| parent | 4e2424a3802fc541a9b21ad53981b4725ed70320 (diff) | |
Migrate to stable/newton
os-odl_l2_nofeature is now deprecated since new netvirt only supports
odl_l3.
JIRA: APEX-299
Change-Id: I3557ecb85fa4cd11bba96aa9410e56a8e8cceb00
Signed-off-by: Tim Rozet <trozet@redhat.com>
Diffstat (limited to 'lib')
| -rwxr-xr-x | lib/overcloud-deploy-functions.sh | 6 | ||||
| -rw-r--r-- | lib/python/apex/network_environment.py | 6 |
2 files changed, 7 insertions, 5 deletions
diff --git a/lib/overcloud-deploy-functions.sh b/lib/overcloud-deploy-functions.sh index 2066f15a..1a363e69 100755 --- a/lib/overcloud-deploy-functions.sh +++ b/lib/overcloud-deploy-functions.sh @@ -15,9 +15,7 @@ function overcloud_deploy { local num_control_nodes if [[ "${#deploy_options_array[@]}" -eq 0 || "${deploy_options_array['sdn_controller']}" == 'opendaylight' ]]; then - if [ "${deploy_options_array['sdn_l3']}" == 'True' ]; then - DEPLOY_OPTIONS+=" -e /usr/share/openstack-tripleo-heat-templates/environments/opendaylight_l3.yaml" - elif [ "${deploy_options_array['sfc']}" == 'True' ]; then + if [ "${deploy_options_array['sfc']}" == 'True' ]; then DEPLOY_OPTIONS+=" -e /usr/share/openstack-tripleo-heat-templates/environments/opendaylight_sfc.yaml" elif [ "${deploy_options_array['vpn']}" == 'True' ]; then DEPLOY_OPTIONS+=" -e /usr/share/openstack-tripleo-heat-templates/environments/opendaylight_sdnvpn.yaml" @@ -26,7 +24,7 @@ function overcloud_deploy { elif [ "${deploy_options_array['vpn']}" == 'true' ]; then DEPLOY_OPTIONS+=" -e /usr/share/openstack-tripleo-heat-templates/environments/opendaylight_sdnvpn.yaml" else - DEPLOY_OPTIONS+=" -e /usr/share/openstack-tripleo-heat-templates/environments/opendaylight.yaml" + DEPLOY_OPTIONS+=" -e /usr/share/openstack-tripleo-heat-templates/environments/neutron-opendaylight-l3.yaml" fi SDN_IMAGE=opendaylight if [ "${deploy_options_array['sfc']}" == 'True' ]; then diff --git a/lib/python/apex/network_environment.py b/lib/python/apex/network_environment.py index 5cb2d0cd..ae5c602c 100644 --- a/lib/python/apex/network_environment.py +++ b/lib/python/apex/network_environment.py @@ -22,6 +22,7 @@ from .common.constants import ( PRE_CONFIG_DIR ) +HEAT_NONE = 'OS::Heat::None' PORTS = '/ports' # Resources defined by <resource name>: <prefix> EXTERNAL_RESOURCES = {'OS::TripleO::Network::External': None, @@ -196,7 +197,7 @@ class NetworkEnvironment(dict): if prefix is None: prefix = '' m = re.split('%s/\w+\.yaml' % prefix, self[reg][key]) - if m is not None: + if m is not None and len(m) > 1: self.tht_dir = m[0] break if not self.tht_dir: @@ -205,6 +206,9 @@ class NetworkEnvironment(dict): def _config_resource_reg(self, resources, postfix): for key, prefix in resources.items(): if prefix is None: + if postfix == '/noop.yaml': + self[reg][key] = HEAT_NONE + continue prefix = '' self[reg][key] = self.tht_dir + prefix + postfix |