Deprecated code removed

According to the latest changes in fuel 6.1 we don't need this code
anymore. It was a part of our backlog.
Minor refactoring.

Closes-bug: 1440124

Change-Id: Ifa6180005b1aa58de1625a0b29238f6ceabd552e

.gitignore

@@ -5,8 +5,6 @@ repositories/centos/*
 repositories/ubuntu/*
 deployment_scripts/puppet/modules/inifile
 deployment_scripts/puppet/modules/stdlib
-deployment_scripts/puppet/modules/contrail/files/opencontrail
 build.sh
-*.fp
 *.rpm
 

deployment_scripts/puppet/manifests/site-compute-post.pp

@@ -4,13 +4,6 @@ include contrail
 case $operatingsystem {
   Ubuntu: {
 
-    apt::source { 'contrail-from-fuel-master':
-      location    => "http://${contrail::master_ip}:8080/plugins/contrail-${contrail::plugin_version}/repositories/ubuntu/",
-      release     => '',
-      repos       => '/',
-      include_src => false,
-    } ->
-
     class { 'contrail::package':
       install => ['contrail-openstack-vrouter','contrail-vrouter-dkms','iproute2','haproxy','libatm1'],
       remove  => ['openvswitch-common','openvswitch-datapath-lts-saucy-dkms','openvswitch-switch','nova-network','nova-api'],

deployment_scripts/puppet/manifests/site-compute-pre.pp

@@ -1,8 +0,0 @@
-# Remove automatically installed plugin's repo.
-# Some packages conflicts with default repo on openstack-controller nodes
-file {'remove-plugin-aptsource':
-  # TODO!
-  #path => '/etc/apt/sources.list.d/contrail-{plugin_version}.list',
-  ensure => absent,
-  path => '/etc/apt/sources.list.d/contrail-1.0.0.list',
-}

deployment_scripts/puppet/manifests/site-contrail-pre.pp

@@ -16,6 +16,7 @@ case $operatingsystem
         ->
         exec {'add_default_gw':
             command => "/sbin/ip route add default via ${contrail::master_ip}",
+            before  => Class['Contrail::Package'],
         }
         #####################################
       }
@@ -45,6 +46,4 @@ class { 'contrail::ssh':
 class { 'contrail::package':
   install        => $pkgs,
   pip_install    => $pip_pkgs,
-  require         => Exec['add_default_gw']
-
 }

deployment_scripts/puppet/modules/contrail/templates/ubuntu-ifcfg-vhost0.erb

@@ -1,5 +1,5 @@
 auto vhost0
 iface vhost0 inet static
-address <%= scope.lookupvar('contrail::address') %>/<%= scope.lookupvar('contrail::netmask') %>
+address <%= scope.lookupvar('contrail::address') %>/<%= scope.lookupvar('contrail::netmask_short') %>
 network_name contrail
 

tasks.yaml

@@ -68,13 +68,6 @@
     puppet_manifest: puppet/manifests/site-controller-post.pp
     puppet_modules: puppet/modules:/etc/puppet/modules
     timeout: 720
-- role: ['compute']
-  stage: pre_deployment
-  type: puppet
-  parameters:
-    puppet_manifest: puppet/manifests/site-compute-pre.pp
-    puppet_modules: puppet/modules:/etc/puppet/modules
-    timeout: 720
 - role: ['compute']
   stage: post_deployment
   type: puppet