[Doc] [FWaaS] Configuration of FWaaS v1 is confused

[miaoyuliang]

In the page of https://docs.openstack.org/neutron/latest/admin/fwaas-v1-scenario.html the configuration is confused.

The configration in step 1 is:
[fwaas]
driver = neutron_fwaas.services.firewall.drivers.linux.iptables_fwaas.IptablesFwaasDriver
enabled = True

But in the step 2, the configuration is:
[fwaas]
agent_version = v1
driver = iptables
enabled = True
conntrack_driver = conntrack

The "driver" is different, Although it works. And it confused user.

This bug tracker is for errors with the documentation, use the following as a template and remove or add fields as you see fit. Convert [ ] into [x] to check boxes:

- [ ] This doc is inaccurate in this way: ______
- [ ] This is a doc addition request.
- [ ] I have a fix to the document that I can paste below including example: input and output.

If you have a troubleshooting or support issue, use the following resources:

 - Ask OpenStack: http://ask.openstack.org
 - The mailing list: http://lists.openstack.org
 - IRC: 'openstack' channel on Freenode

-----------------------------------
Release: 13.0.0.0b3.dev44 on 2018-06-19 01:09
SHA: abbd534fdfa8ba64fa71648503810f6b543ddd6d
Source: https://git.openstack.org/cgit/openstack/neutron/tree/doc/source/admin/fwaas-v1-scenario.rst
URL: https://docs.openstack.org/neutron/latest/admin/fwaas-v1-scenario.html

[miaoyuliang (mylaliang)]

step 2 is about l3 agent,so only modify driver

[OpenStack Infra (hudson-openstack)]

Fix proposed to branch: master
Review: https://review.openstack.org/576337

[OpenStack Infra (hudson-openstack)]

Reviewed: https://review.openstack.org/576337
Committed: https://git.openstack.org/cgit/openstack/neutron/commit/?id=fe4bec79916c2c92932a4cb6be86515f719372ce
Submitter: Zuul
Branch: master

commit fe4bec79916c2c92932a4cb6be86515f719372ce
Author: miaoyuliang <email address hidden>
Date: Tue Jun 19 11:34:09 2018 -0400

    Fix fwaas v1 configuration doc

    Modify the fwaas v1 config about driver

    Change-Id: Id6821174a15838713435a499a258f6d37a9cad2a
    Closes-Bug: #1777547

[OpenStack Infra (hudson-openstack)]

Fix proposed to branch: stable/queens
Review: https://review.openstack.org/584317

[OpenStack Infra (hudson-openstack)]

Fix proposed to branch: stable/pike
Review: https://review.openstack.org/584318

[OpenStack Infra (hudson-openstack)]

Reviewed: https://review.openstack.org/584317
Committed: https://git.openstack.org/cgit/openstack/neutron/commit/?id=e5e82f4754dadf0273ecadfbc9f93c52febbda23
Submitter: Zuul
Branch: stable/queens

commit e5e82f4754dadf0273ecadfbc9f93c52febbda23
Author: miaoyuliang <email address hidden>
Date: Tue Jun 19 11:34:09 2018 -0400

    Fix fwaas v1 configuration doc

    Modify the fwaas v1 config about driver

    Change-Id: Id6821174a15838713435a499a258f6d37a9cad2a
    Closes-Bug: #1777547
    (cherry picked from commit fe4bec79916c2c92932a4cb6be86515f719372ce)

[OpenStack Infra (hudson-openstack)]

This issue was fixed in the openstack/neutron 13.0.0.0b3 development milestone.

[OpenStack Infra (hudson-openstack)]

Reviewed: https://review.openstack.org/584318
Committed: https://git.openstack.org/cgit/openstack/neutron/commit/?id=be7267a44f9a4752d245c332cd2eedaefff66915
Submitter: Zuul
Branch: stable/pike

commit be7267a44f9a4752d245c332cd2eedaefff66915
Author: miaoyuliang <email address hidden>
Date: Tue Jun 19 11:34:09 2018 -0400

    Fix fwaas v1 configuration doc

    Modify the fwaas v1 config about driver

    Change-Id: Id6821174a15838713435a499a258f6d37a9cad2a
    Closes-Bug: #1777547
    (cherry picked from commit fe4bec79916c2c92932a4cb6be86515f719372ce)

[OpenStack Infra (hudson-openstack)]

This issue was fixed in the openstack/neutron 12.0.4 release.

[OpenStack Infra (hudson-openstack)]

This issue was fixed in the openstack/neutron 11.0.6 release.