diff options
| author |   Tim Rozet <trozet@redhat.com> | 2017-08-29 11:23:39 -0400 |
|---|---|---|
| committer | Tim Rozet <trozet@redhat.com> | 2017-09-11 16:14:18 -0400 |
| commit | 48cd7b87e201ccdaa73ee82fd591ec447961e7aa (patch) | |
| tree | 2505ecde3b34f8d49cc8acacf3030d526bfa7d4b /apex | |
| parent | 23be56d9f0801cbc065accf77a850bcc106c1e84 (diff) | |
Updates SFC to use nitrogen
Also fixes issue where openvswitch NSH rpm was not getting installed
because we needed to downgrade now that default OVS is 2.7 and NSH OVS
is 2.6.1
Change-Id: I1b639ca80214032e93aacb3332e9588d49e74127
Signed-off-by: Tim Rozet <trozet@redhat.com>
Diffstat (limited to 'apex')
| -rw-r--r-- | apex/overcloud/config.py | 3 | ||||
| -rw-r--r-- | apex/overcloud/overcloud_deploy.py | 6 |
2 files changed, 6 insertions, 3 deletions
diff --git a/apex/overcloud/config.py b/apex/overcloud/config.py index acec5323..e48b254f 100644 --- a/apex/overcloud/config.py +++ b/apex/overcloud/config.py @@ -62,6 +62,9 @@ def create_nic_template(network_settings, deploy_settings, role, template_dir, nets['tenant']['nic_mapping'][role]['interface-options'] =\ ds['performance'][role.title()]['vpp']['interface-options'] + if role == 'controller' and ds.get('sfc', None): + ext_net = 'interface' + template_output = template.render( nets=nets, role=role, diff --git a/apex/overcloud/overcloud_deploy.py b/apex/overcloud/overcloud_deploy.py index 60652146..d37d73ca 100644 --- a/apex/overcloud/overcloud_deploy.py +++ b/apex/overcloud/overcloud_deploy.py @@ -30,7 +30,7 @@ from cryptography.hazmat.backends import default_backend as \ SDN_FILE_MAP = { 'opendaylight': { - 'sfc': 'opendaylight_sfc.yaml', + 'sfc': 'neutron-sfc-opendaylight.yaml', 'vpn': 'neutron-bgpvpn-opendaylight.yaml', 'gluon': 'gluon.yaml', 'vpp': { @@ -220,7 +220,7 @@ def prep_image(ds, img, tmp_dir, root_pw=None): {con.VIRT_RUN_CMD: "yum -y install " "/root/ovs/rpm/rpmbuild/RPMS/x86_64/" "{}".format(OVS_NSH_KMOD_RPM)}, - {con.VIRT_RUN_CMD: "yum upgrade -y " + {con.VIRT_RUN_CMD: "yum downgrade -y " "/root/ovs/rpm/rpmbuild/RPMS/x86_64/" "{}".format(OVS_NSH_RPM)} ]) @@ -236,7 +236,7 @@ def prep_image(ds, img, tmp_dir, root_pw=None): virt_cmds.extend([ {con.VIRT_RUN_CMD: "yum -y remove opendaylight"}, {con.VIRT_RUN_CMD: "yum -y install /root/{}/*".format( - con.DEFAULT_ODL_VERSION)}, + ds_opts['odl_version'])}, {con.VIRT_RUN_CMD: "rm -rf /etc/puppet/modules/opendaylight"}, {con.VIRT_RUN_CMD: "cd /etc/puppet/modules && tar xzf " "/root/puppet-opendaylight-" |