diff options
3 files changed, 14 insertions, 5 deletions
diff --git a/deploy/adapters/ansible/roles/neutron-compute/tasks/main.yml b/deploy/adapters/ansible/roles/neutron-compute/tasks/main.yml index 93d9b078..9020ccae 100644 --- a/deploy/adapters/ansible/roles/neutron-compute/tasks/main.yml +++ b/deploy/adapters/ansible/roles/neutron-compute/tasks/main.yml @@ -27,7 +27,7 @@ - name: fix openstack neutron plugin config file shell: | - sed -i 's,plugins/openvswitch/ovs_neutron_plugin.ini,plugin.ini,g' /usr/lib/systemd/system/neutron-openvswitch-agent.service + sed -i 's,plugins/ml2/openvswitch_agent.ini,plugin.ini,g' /usr/lib/systemd/system/neutron-openvswitch-agent.service systemctl daemon-reload when: ansible_os_family == 'RedHat' diff --git a/deploy/adapters/ansible/roles/neutron-controller/tasks/neutron_config.yml b/deploy/adapters/ansible/roles/neutron-controller/tasks/neutron_config.yml index a73e27a9..d07e187c 100644 --- a/deploy/adapters/ansible/roles/neutron-controller/tasks/neutron_config.yml +++ b/deploy/adapters/ansible/roles/neutron-controller/tasks/neutron_config.yml @@ -7,6 +7,13 @@ # http://www.apache.org/licenses/LICENSE-2.0 ############################################################################## --- + +- name: fix openstack neutron plugin config file + shell: | + sed -i 's,plugins/ml2/openvswitch_agent.ini,plugin.ini,g' /usr/lib/systemd/system/neutron-openvswitch-agent.service + systemctl daemon-reload + when: ansible_os_family == 'RedHat' + - name: neutron-db-manage upgrade to Juno shell: neutron-db-manage --config-file=/etc/neutron/neutron.conf --config-file=/etc/neutron/plugins/ml2/ml2_conf.ini upgrade head register: result diff --git a/docs/configguide/installerconfig.rst b/docs/configguide/installerconfig.rst index 3d9269a4..932356cf 100644 --- a/docs/configguide/installerconfig.rst +++ b/docs/configguide/installerconfig.rst @@ -17,8 +17,9 @@ nodes. The audience of this document is assumed to have good knowledge in networking and Unix/Linux administration. +------------- Preconditions -============= +------------- Before starting the installation of the Brahmaputra release of OPNFV, some planning must be done. @@ -75,9 +76,9 @@ than or equal 3 servers, the Bare Metal deployment is recommended. The minimum n servers for Bare metal deployment is 3, 1 for JumpServer(Jumphost), 1 for controller, 1 for compute. - +------------------ Setup Requirements -================== +------------------ Jumphost Requirements --------------------- @@ -158,8 +159,9 @@ In order to execute a deployment, one must gather the following information: 3. MAC address of Control Plane / Provisioning interfaces of the Bare Metal nodes. +---------------------------------- Installation Guide (BM Deployment) -================================== +---------------------------------- Nodes Configuration (BM Deployment) ----------------------------------- |