Description of problem:
Nuage deployment with director fails because the current Kilo 7.3.1 overcloud-full image:

1. Contains version incompatible code in the Neutron Puppet Module (upstream Liberty instead of upstream Kilo)
2. Is Missing the Nuage Module

Specifically the following two files:
/etc/puppet/modules/neutron/lib/puppet/provider/neutron_plugin_nuage/ini_setting.rb
/etc/puppet/modules/neutron/lib/puppet/type/neutron_plugin_nuage.rb
should be replaced with the version from upstream Kilo
https://github.com/openstack/puppet-neutron/blob/stable/kilo/lib/puppet/provider/neutron_plugin_nuage/ini_setting.rb
https://github.com/openstack/puppet-neutron/blob/stable/kilo/lib/puppet/type/neutron_plugin_nuage.rb

And Nuage Module from https://github.com/nuagenetworks/NuagePuppetModules/tree/master/modules/nuage
should be installed at /etc/puppet/modules/nuage


Version-Release number of selected component (if applicable):
openstack-puppet-modules-2015.1.8-51.el7ost.noarch
overcloud-full-7.3.1-59.tar


How reproducible:
Always


Steps to Reproduce:
1. Deploy with Nuage support: openstack overcloud deploy --templates ~/templates \
--environment-file ~/templates/environments/network-isolation.yaml \
--environment-file ~/templates/environments/network-environment.yaml \
--environment-file ~/templates/environments/neutron-nuage-config.yaml \
--environment-file ~/templates/environments/nova-nuage-config.yaml \
--ntp-server 0.fedora.pool.ntp.org \
--neutron-network-type vxlan \
--neutron-tunnel-types vxlan

Actual results:
Deployment fails with Puppet related errors.


Expected results:
Deployment succeeds, Nuage integration gets configured


Additional info:
Implementing the changes described in this BZ, I could successfully deploy with Nuage integration.
The following is required in addition though:
- A Nuage environment VSD, VSC, VSG
- The templates are missing some parameters. I described this in a different BZ
- Remove parts of the Neutron and OpenVSwitch bits:
openvswitch
openstack-neutron-lbaas
openstack-neutron-ml2
openstack-neutron-openvswitch
python-openvswitch
openstack-neutron-lbaas
- Install the Nuage bits, I use the following:
nuage-metadata-agent-3.2.6-232.el7.x86_64.rpm
nuagenetlib-2015.1.3.2.6_228-nuage.noarch.rpm
nuage-openstack-heat-2015.1.1818-nuage.noarch.rpm
nuage-openstack-horizon-2015.1.1818-nuage.noarch.rpm
nuage-openstack-neutron-2015.1.1818-nuage.noarch.rpm
nuage-openstack-neutronclient-2015.1.1818-nuage.noarch.rpm
nuage-openvswitch-3.2.6-232.el7.x86_64.rpm
perl-JSON-2.59-2.el7.noarch.rpm
perl-Sys-Syslog-0.33-3.el7.x86_64.rpm
protobuf-2.5.0-7.el7.x86_64.rpm
protobuf-c-1.0.1-1.el7.x86_64.rpm
protobuf-compiler-2.5.0-7.el7.x86_64.rpm
pyserial-2.6-5.el7.noarch.rpm
python-setproctitle-1.1.6-5.el7.x86_64.rpm
python-twisted-core-12.2.0-4.el7.x86_64.rpm