x
/
fuel-plugin-contrail
Code Issues Proposed changes

Actualize package names for service_overrides 

Current names for tweaks::ubuntu_service_override don't match packages which
will be installed. That leads to those packages being installed before
tweaks::ubuntu_service_override.

Add set of additinal ubuntu_service_overrides

Also, default `require` for file resource is deleted to prevent
depenency cycles.

Change-Id: I5c34542009c75a9e7a17e465bb79e7f86db2d77f
This commit is contained in:
Pavel Chechetin 2016-12-13 00:40:34 -08:00 committed by Illia Polliul
parent ff84523d58
commit dc66701cee
4 changed files with 22 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
deployment_scripts/puppet/modules/contrail/manifests/analytics.pp
View File

@ -22,13 +22,18 @@ class contrail::analytics {
mode => '0644',
owner => root,
group => root,
require => Package['contrail-openstack-analytics'],
}
Exec { path => '/usr/bin:/usr/sbin:/bin:/sbin' }
tweaks::ubuntu_service_override { 'supervisor-analytics':
tweaks::ubuntu_service_override { 'contrail-openstack-analytics':
package_name => 'contrail-openstack-analytics',
service_name => 'supervisor-analytics',
}
tweaks::ubuntu_service_override { 'contrail-analytics':
package_name => 'contrail-analytics',
service_name => 'supervisor-analytics',
}
# Packages

9
deployment_scripts/puppet/modules/contrail/manifests/config.pp
View File

@ -29,11 +29,16 @@ class contrail::config {
mode => '0644',
owner => 'contrail',
group => 'contrail',
require => Package['contrail-openstack-config'],
}
tweaks::ubuntu_service_override { 'supervisor-config':
tweaks::ubuntu_service_override { 'contrail-openstack-config':
package_name => 'contrail-openstack-config',
service_name => 'supervisor-config',
}
tweaks::ubuntu_service_override { 'contrail-config':
package_name => 'contrail-config',
service_name => 'supervisor-config',
}
# Memcache

9
deployment_scripts/puppet/modules/contrail/manifests/control.pp
View File

@ -22,7 +22,6 @@ class contrail::control {
mode => '0644',
owner => 'contrail',
group => 'contrail',
require => Package['contrail-openstack-control'],
}
Exec {
@ -30,8 +29,14 @@ class contrail::control {
path => '/usr/bin:/bin:/sbin',
}
tweaks::ubuntu_service_override { 'supervisor-control':
tweaks::ubuntu_service_override { 'contrail-openstack-control':
package_name => 'contrail-openstack-control',
service_name => 'supervisor-control',
}
tweaks::ubuntu_service_override { 'contrail-control':
package_name => 'contrail-control',
service_name => 'supervisor-control',
}
# Packages

3
deployment_scripts/puppet/modules/contrail/manifests/database.pp
View File

@ -30,8 +30,7 @@ class contrail::database {
}
tweaks::ubuntu_service_override { 'contrail-database':
package_name => 'contrail-database-common',
service_name => 'contrail-database',
package_name => 'contrail-openstack-database',
}
sysctl::value { 'vm.swappiness':