SM Parallel provision throws duplicate declaration errors

[Nitish Krishna Kaveri]

During parallel provision of Contrail, following errors were seen:

Feb 2 04:19:54 nodeg21 puppet-agent[2633]: Could not retrieve catalog from remote server: Error 400 on SERVER: Duplicate declaration: Contrail::Lib::Augeas_conf_set[log4j.rootLogger] is already declared in file /etc/puppet/environments/ubuntu14kilo2709/modules/contrail/manifests/database/config.pp:146; cannot redeclare at /etc/puppet/environments/ubuntu14kilo2709/modules/contrail/manifests/config/config.pp:217 on node nodeg21.englab.juniper.net

Feb 2 04:23:31 nodeg33 puppet-agent[9196]: Could not retrieve catalog from remote server: Error 400 on SERVER: Duplicate declaration: Openstack::Resources::Database[neutron] is already declared in file /etc/puppet/environments/ubuntu14kilo2709/modules/contrail/manifests/profile/openstack_controller.pp:59; cannot redeclare at /etc/puppet/environments/ubuntu14kilo2709/modules/contrail/manifests/profile/neutron/server.pp:4 on node nodeg33.englab.juniper.net

Feb 2 04:26:51 nodeg33 puppet-agent[15539]: Could not retrieve catalog from remote server: Error 400 on SERVER: Duplicate declaration: Package[neutron-server] is already declared in file /etc/puppet/environments/ubuntu14kilo2709/modules/contrail/manifests/profile/openstack_controller.pp:61; cannot redeclare at /etc/puppet/environments/ubuntu14kilo2709/modules/neutron/manifests/server.pp:297 on node nodeg33.englab.juniper.net

[OpenContrail Admin (ci-admin-f)]

Review in progress for https://review.opencontrail.org/16807
Submitter: Nitish Krishna Kaveri (<email address hidden>)

[OpenContrail Admin (ci-admin-f)]

Reviewed: https://review.opencontrail.org/16807
Committed: http://github.org/Juniper/contrail-puppet/commit/8575d05827d5e2a68f0ede4fdeaaaed5855450dc
Submitter: Zuul
Branch: master

commit 8575d05827d5e2a68f0ede4fdeaaaed5855450dc
Author: nitishkrishna <email address hidden>
Date: Tue Feb 2 21:20:39 2016 -0800

Closes-Bug: #1541112 - Duplicate declaration errors in SM Kilo parallel provision

Three duplication declarations fixed:
1. Augeas conf set changed as it used key as title.
2. Two conflicting Resources called in config only if node not same as openstack node
3. Augeas conf ins modified as it might cause duplicate declaration if inserting same key in two files

Patch 2:
Missed out define of host_roles in neutron/server.pp

Patch 3:
Chnaged augeas_conf_ins to avoid duplicate declaration

Change-Id: I58681efa940be5803e653a5ef0aa986f2971f796