diff options
| -rw-r--r-- | apex/overcloud/config.py | 3 | ||||
| -rw-r--r-- | docs/release/installation/baremetal.rst | 4 | ||||
| -rw-r--r-- | docs/release/installation/virtual.rst | 2 |
3 files changed, 3 insertions, 6 deletions
diff --git a/apex/overcloud/config.py b/apex/overcloud/config.py index a7f7d848..b0cbb18b 100644 --- a/apex/overcloud/config.py +++ b/apex/overcloud/config.py @@ -66,9 +66,6 @@ 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/docs/release/installation/baremetal.rst b/docs/release/installation/baremetal.rst index f607107f..6f852cac 100644 --- a/docs/release/installation/baremetal.rst +++ b/docs/release/installation/baremetal.rst @@ -88,7 +88,7 @@ Install Bare Metal Jump Host ``sudo yum install https://repos.fedorapeople.org/repos/openstack/openstack-ocata/rdo-release-ocata-3.noarch.rpm`` ``sudo yum install epel-release`` - ``sudo curl -o /etc/yum/repos.d/opnfv-apex.repo http://artifacts.opnfv.org/apex/euphrates/opnfv-apex.repo`` + ``sudo curl -o /etc/yum.repos.d/opnfv-apex.repo http://artifacts.opnfv.org/apex/euphrates/opnfv-apex.repo`` The RDO Project release repository is needed to install OpenVSwitch, which is a dependency of opnfv-apex. If you do not have external connectivity to @@ -224,7 +224,7 @@ Follow the steps below to execute: network_settings.yaml allows you to customize your networking topology. Note it can also be useful to run the command with the ``--debug`` argument which will enable a root login on the overcloud nodes with - password: 'opnfv-apex'. It is also useful in some cases to surround the + password: 'opnfvapex'. It is also useful in some cases to surround the deploy command with ``nohup``. For example: ``nohup <deploy command> &``, will allow a deployment to continue even if ssh access to the Jump Host is lost during deployment. diff --git a/docs/release/installation/virtual.rst b/docs/release/installation/virtual.rst index 9336b8e7..2da8ccf6 100644 --- a/docs/release/installation/virtual.rst +++ b/docs/release/installation/virtual.rst @@ -80,7 +80,7 @@ Follow the steps below to execute: -n network_settings.yaml -d deploy_settings.yaml`` Note it can also be useful to run the command with the ``--debug`` argument which will enable a root login on the overcloud nodes with - password: 'opnfv-apex'. It is also useful in some cases to surround the + password: 'opnfvapex'. It is also useful in some cases to surround the deploy command with ``nohup``. For example: ``nohup <deploy command> &``, will allow a deployment to continue even if ssh access to the Jump Host is lost during deployment. |