Plugin tasks updated

Contrail repo priorities adjusted.
Zookeeper config template updated.
Hiera override for OSTF nets template updated.

Change-Id: Iace1dac1ad785de6fdc7fbbe11d340c63bcc2cf5

deployment_scripts/puppet/manifests/common-repo.pp

@@ -12,28 +12,20 @@
 #    License for the specific language governing permissions and limitations
 #    under the License.
 
-notice('MODULAR: contrail/contrail-repo.pp')
+notice('MODULAR: contrail/common-repo.pp')
 
 case $operatingsystem
 {
-    CentOS:
-      {
-        yumrepo {'mos': priority => 1, exclude => 'python-thrift,nodejs'} # Contrail requires newer python-thrift and nodejs from it's repo
-        package {'yum-plugin-priorities': ensure => present }
-      }
+    CentOS: {
+      yumrepo {'mos': priority => 1, exclude => 'python-thrift,nodejs'} # Contrail requires newer python-thrift and nodejs from it's repo
+      package {'yum-plugin-priorities': ensure => present }
+    }
     Ubuntu: {
       file { '/etc/apt/preferences.d/contrail-3.0.0.pref':
         ensure => absent,
       }
-      case hiera('role') {
-        /contrail/: {
-          file { '/etc/apt/preferences.d/contrail-pin-100':
-            ensure => file,
-            source => 'puppet:///modules/contrail/contrail-pin-100',
-          }
-        }
-        default: {}
-      }
     }
     default: {}
 }
+
+

deployment_scripts/puppet/manifests/contrail-utils.pp

@@ -23,6 +23,10 @@ sysctl::value {
 
 case $operatingsystem {
   Ubuntu: {
+    file { '/etc/apt/preferences.d/contrail-pin-100':
+      ensure => file,
+      source => 'puppet:///modules/contrail/contrail-pin-100',
+    } ->
     exec { 'reinstall-tzdata':
       path    => '/bin:/sbin:/usr/bin:/usr/sbin',
       command => '/usr/bin/apt-get install -y --force-yes tzdata',

deployment_scripts/puppet/manifests/controller-hiera.pp

@@ -23,9 +23,6 @@ $plugin_yaml = "${plugin_name}.yaml"
 $contrail_plugin = hiera('contrail', undef)
 
 if ($contrail_plugin) {
-  $neutron_config  = hiera_hash('quantum_settings')
-  $nets            = $neutron_config['predefined_networks']
-
 
   file {'/etc/hiera/override':
     ensure  => directory,