Empty task.yaml

Change-Id: Id0d4f1f0b31fcbc94b09fcd5a00ae5cf3d503da4
Signed-off-by: Illia Polliul <ipolliul@mirantis.com>

deployment_scripts/puppet/manifests/common-repo.pp

@@ -17,24 +17,6 @@ notice('MODULAR: contrail/common-repo.pp')
 $settings = hiera('contrail', {})
 $plugin_version = $settings['metadata']['plugin_version']
 
-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 }
-    }
-    Ubuntu: {
-      file { "/etc/apt/preferences.d/contrail-${plugin_version}.pref":
-        ensure => absent,
-      }
-      apt::pin { 'dependency-fix':
-        explanation => 'Temporary fix for contrail analytics',
-        packages    => 'libperl5.18',
-        priority    => 1400,
-        version     => '5.18.2-2ubuntu1.1',
-      }
-    }
-    default: {}
+file { "/etc/apt/preferences.d/contrail-${plugin_version}.pref":
+  ensure => absent,
 }
-
-

deployment_tasks.yaml

@@ -133,6 +133,20 @@
       type: parallel
 
 # Tasks
+#############
+#0. Remove apt pin for Contrail plugin repo
+#############
+- id: common-repo
+  type: puppet
+  version: 2.0.0
+  requires: [setup_repositories]
+  required_for: [tools]
+  role: ['/.*/']
+  parameters:
+    puppet_manifest: "puppet/manifests/common-repo.pp"
+    puppet_modules: "puppet/modules:/etc/puppet/modules"
+    timeout: 120
+
 #############
 #1. Install Contrail utils, java
 #############

tasks.yaml

@@ -1,8 +1 @@
-# Remove apt pin for Contrail repo
-- role: '*'
-  type: puppet
-  stage: pre_deployment
-  parameters:
-    puppet_manifest: puppet/manifests/common-repo.pp
-    puppet_modules: puppet/modules:/etc/puppet/modules
-    timeout: 720
+[]