Comment 6 for bug 1742796

Reviewed: https://review.openstack.org/536970
Committed: https://git.openstack.org/cgit/openstack/puppet-neutron/commit/?id=efc93049aa5c548f71f41375396d1fab76a908c7
Submitter: Zuul
Branch: stable/ocata

commit efc93049aa5c548f71f41375396d1fab76a908c7
Author: Sandhya Dasu <email address hidden>
Date: Thu Jan 11 16:17:41 2018 -0500

    New configuration being added for Cisco UCSM ML2 driver

    Cisco UCSM ML2 driver now accepts the following new configuration
    parameters:
    1. ucsm_https_verify
    2. sp_template_list
    3. vnic_template_list

    Conflicts:
            manifests/plugins/ml2/cisco/ucsm.pp
            spec/classes/neutron_plugins_ml2_cisco_ucsm_spec.rb

    Change-Id: I974c51a4bee4dc2e084cea809b3f93978d09c63b
    Closes-Bug: #1742796
    (cherry picked from commit b61e1f5e337fcd9fb198ee8568157d28cf1d8bf6)