openstack/fuel-library
Code Issues Proposed changes

Add .gitreview

Browse Source 
The following commit strings match github.com/Mirantis/fuel.git commits:
687a554eb9b6ae4dcc114f34e9690e601b40610c
63e529bb9ff04814120e6606e5491497e6e9c99e
e6919d95b3ff9be8c42f10cbe63e94d8b8b2cd41
67a0eca8e94ad30c0ebc704b6d58c7282f514fa8
2adedd194a41476d5cf6500943acef6181b9f600
ec5a34c06f682e6b3c7a1748eb0cd9ed8d40efad
506eb60589dd82a58fcfd1cd303a71b81405dcd5
5794eb0f4d1ba47fc59a8f3952bdadb365448cc3
ddfac2319d9b422d17bc77cc84d2fe518af65a00
a3cabba18b23d6f7dd409f18629033e7d8c58afb
332eb9e2d2f213069afb3e085a392170047561be
f139e9f9b560e9408eb92a6d91f5913de5b24ea7
662b8c4b7d4576c75aff7d299a2d480613a67e2e
6d4eb37594755a8006d1b10b3cec157ebbbe5f54
f0a3ad894cf8b701d8058e017ba9af3ccd4c60be
baf91010aa0ea7ee95550c2656eba7c83b5ec7f4
0e012cc5578446c0c14459d1c8874e19d3499f38
fcc5641ceedecb148de88c0e73d51d5b83a0ad70
0f4c285e05a5fed6b5a00d098f5459aee9450d15
e22ca9e058c1abf20be1535d621d1179c7bf9552
e986f16ec22ad24afe0781825dfc1687c4d01b15
89aaf0976e42bd4143d393bd81f695cbe9d8fac2

add ordering

Fix bug with auto_assignment for Savanna + Neutron

[nailgun] New node naming convention in ssh.config

The slave nodes are called node-NN now istead of slave-NN.

	Flush IPs on all interfaces that are members of a bond

	- This is needed to prevent the situation when Puppet
	is trying to assign an IP to bond, which is already in
	use on some of bonded interfaces.

Revert "Merge pull request #877 from alexeyklimenok/master"

This reverts commit a3cabba18b23d6f7dd409f18629033e7d8c58afb, reversing
changes made to 332eb9e2d2f213069afb3e085a392170047561be.

use name from params.pp

cpufreq tuning for compute nodes

pseudo package for Centos w/ 4.0

rebase

Update venv-ostf dependency for Havana

Update versions for next dependencies:
* python-novaclient
* python-cinderclient
* python-heatclient
* python-muranoclient
* python-ceilometerclient
* oslo.config
* six
* requests

Delete installation of next unused in OSTF clients:
* python-quantumclient
* python-glanceclient

Closes-bug bug/1250862

Make cs_commit before service always

Remove obsolete corosync::cleanup  resource usage

Cs_commit ordering for dhcp and metadata

1. fix dhcp commit order collector
2. set metadata commit order before service

Change-Id: I06fbe2153b34f66b0d5a4a694e30410e1aff068a
This commit is contained in:
Andrey Korolyov 2013-12-10 17:36:47 +04:00 committed by Gerrit Code Review
parent 25287e8a02
commit 75f65ccaac
14 changed files with 84 additions and 86 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
deployment/puppet/ceilometer/manifests/agent/central.pp
View File

@ -110,8 +110,6 @@ class ceilometer::agent::central (
cs_shadow { $res_name: cib => $cib_name }
cs_commit { $res_name: cib => $cib_name }
::corosync::cleanup{ $res_name: }
service { 'ceilometer-agent-central':
ensure => $service_ensure,
name => $res_name,
@ -121,9 +119,6 @@ class ceilometer::agent::central (
provider => "pacemaker",
}
Cs_commit[$res_name] -> ::Corosync::Cleanup[$res_name]
Cs_commit[$res_name] ~> ::Corosync::Cleanup[$res_name]
Cs_shadow[$res_name] ->
Cs_resource[$res_name] ->
Cs_commit[$res_name] ->

3
deployment/puppet/cluster/manifests/haproxy.pp
View File

@ -22,8 +22,7 @@ class cluster::haproxy (
Anchor['haproxy'] -> Cs_shadow["$cib_name"]
corosync::cleanup {"clone_$cib_name": }
Cs_commit[$cib_name] ~> Corosync::Cleanup["clone_$cib_name"] -> Service['haproxy']
Cs_commit[$cib_name] -> Service['haproxy']
file {'haproxy-ocf':
path=>'/usr/lib/ocf/resource.d/mirantis/haproxy',

3
deployment/puppet/cluster/manifests/virtual_ip.pp
View File

@ -23,10 +23,7 @@ define cluster::virtual_ip (
cs_shadow { $cib_name: cib => $cib_name }
cs_commit { $cib_name: cib => $cib_name }
::corosync::cleanup { $vip_name: }
Cs_commit[$cib_name] -> ::Corosync::Cleanup[$vip_name]
Cs_commit[$cib_name] ~> ::Corosync::Cleanup[$vip_name]
cs_resource { $vip_name:
ensure => present,

3
deployment/puppet/galera/manifests/init.pp
View File

@ -146,9 +146,8 @@ class galera (
cs_shadow { $res_name: cib => $cib_name }
cs_commit { $res_name: cib => $cib_name }
::corosync::cleanup { "clone_$res_name": }
Cs_commit["$res_name"] ~> Corosync::Cleanup["clone_$res_name"] -> Service["mysql"]
Cs_commit["$res_name"] -> Service["mysql"]
cs_resource { "$res_name":
ensure => present,

4
deployment/puppet/heat/manifests/engine.pp
View File

@ -63,8 +63,6 @@ class heat::engine (
cib => $service_name,
}
corosync::cleanup { $service_name : }
cs_resource { $service_name :
ensure => present,
cib => $service_name,
@ -78,7 +76,7 @@ class heat::engine (
},
}
Heat_config<||> -> File['heat-engine-ocf'] -> Cs_shadow[$service_name] -> Cs_resource[$service_name] -> Cs_commit[$service_name] ~> Corosync::Cleanup[$service_name] -> Service['heat-engine']
Heat_config<||> -> File['heat-engine-ocf'] -> Cs_shadow[$service_name] -> Cs_resource[$service_name] -> Cs_commit[$service_name] -> Service['heat-engine']
}

4
deployment/puppet/mysql/manifests/server.pp
View File

@ -82,10 +82,6 @@ class mysql::server (
$allowed_hosts = '%'
#$allowed_hosts = 'localhost'
::corosync::cleanup{"p_${service_name}": }
Cs_commit['mysql']->::Corosync::Cleanup["p_${service_name}"]
Cs_commit['mysql']~>::Corosync::Cleanup["p_${service_name}"]
::Corosync::Cleanup["p_${service_name}"] -> Service['mysql']
create_resources( 'class', { 'mysql::config' => $config_hash })
Class['mysql::config'] -> Cs_resource["p_${service_name}"]

21
deployment/puppet/nailgun/files/venv-ostf.txt
View File

@ -22,7 +22,7 @@ logutils==0.3.3
netaddr==0.7.10
nose==1.3.0
ordereddict==1.1
oslo.config==1.1.1
oslo.config==1.2.0
paramiko==1.10.1
pbr==0.5.21
pecan==0.3.0
@ -32,20 +32,19 @@ psycopg2==2.5.1
pyOpenSSL==0.13
pycrypto==2.6
pyparsing==1.5.7
python-cinderclient==1.0.4
python-heatclient==0.2.2
python-glanceclient==0.9.0
python-keystoneclient==0.2.4
python-cinderclient==1.0.6
python-ceilometerclient==1.0.6
python-heatclient==0.2.5
python-keystoneclient==0.4.1
python-mimeparse==0.1.4
python-muranoclient==0.2
python-novaclient==2.12.0
python-savannaclient==0.2.2
python-quantumclient==2.2.3
requests==1.2.3
python-muranoclient==0.2.11
python-novaclient==2.15.0
python-savannaclient==0.3
requests==1.1
setuptools-git==1.0
simplegeneric==0.8.1
simplejson==3.3.0
six==1.3.0
six==1.4.1
stevedore==0.10
testresources==0.2.7
testtools==0.9.32

2
deployment/puppet/nailgun/templates/root_ssh_config.erb
View File

@ -1,4 +1,4 @@
Host slave-* controller-* compute-* storage-* 10.* 192.168.* 172.30.* 172.31.* 172.2?.* 172.1?.*
Host node-* controller-* compute-* storage-* 10.* 192.168.* 172.30.* 172.31.* 172.2?.* 172.1?.*
CheckHostIP no
IdentityFile ~/.ssh/bootstrap.rsa
IdentityFile ~/.ssh/id_rsa

33
deployment/puppet/neutron/manifests/agents/dhcp.pp
View File

@ -11,22 +11,6 @@ class neutron::agents::dhcp (
) {
include 'neutron::params'
if $::operatingsystem == 'Ubuntu' {
file { '/etc/init/neutron-dhcp-agent.override':
replace => 'no',
ensure => 'present',
content => 'manual',
mode => 644,
} -> Package['neutron-dhcp-agent']
if $service_provider != 'pacemaker' {
Package['neutron-dhcp-agent'] ->
exec { 'rm-neutron-dhcp-override':
path => '/sbin:/bin:/usr/bin:/usr/sbin',
command => "rm -f /etc/init/neutron-dhcp-agent.override",
}
}
}
if $::neutron::params::dhcp_agent_package {
Package['neutron'] -> Package['neutron-dhcp-agent']
@ -38,6 +22,22 @@ class neutron::agents::dhcp (
} else {
$dhcp_agent_package = $::neutron::params::package_name
}
if $::operatingsystem == 'Ubuntu' {
file { '/etc/init/neutron-dhcp-agent.override':
replace => 'no',
ensure => 'present',
content => 'manual',
mode => 644,
} -> Package<| title=="$dhcp_agent_package" |>
if $service_provider != 'pacemaker' {
Package<| title=="$dhcp_agent_package" |> ->
exec { 'rm-neutron-dhcp-override':
path => '/sbin:/bin:/usr/bin:/usr/sbin',
command => "rm -f /etc/init/neutron-dhcp-agent.override",
}
}
}
include 'neutron::waist_setup'
@ -230,6 +230,7 @@ class neutron::agents::dhcp (
Anchor['neutron-dhcp-agent'] ->
Cs_resource<| title=="p_${::neutron::params::dhcp_agent_service}" |> ->
Cs_commit <| title== 'dhcp' |> ->
Service['neutron-dhcp-service'] ->
Anchor['neutron-dhcp-agent-done']

33
deployment/puppet/neutron/manifests/agents/l3.pp
View File

@ -13,22 +13,6 @@ class neutron::agents::l3 (
anchor {'neutron-l3': }
Service<| title=='neutron-server' |> -> Anchor['neutron-l3']
if $::operatingsystem == 'Ubuntu' {
file { '/etc/init/neutron-l3-agent.override':
replace => 'no',
ensure => 'present',
content => 'manual',
mode => 644,
} -> Package['neutron-l3']
if $service_provider != 'pacemaker' {
Package['neutron-l3'] ->
exec { 'rm-neutron-l3-override':
path => '/sbin:/bin:/usr/bin:/usr/sbin',
command => "rm -f /etc/init/neutron-l3-agent.override",
}
}
}
if $::neutron::params::l3_agent_package {
$l3_agent_package = 'neutron-l3'
@ -41,6 +25,22 @@ class neutron::agents::l3 (
} else {
$l3_agent_package = $::neutron::params::package_name
}
if $::operatingsystem == 'Ubuntu' {
file { '/etc/init/neutron-l3-agent.override':
replace => 'no',
ensure => 'present',
content => 'manual',
mode => 644,
} -> Package<| title == "$l3_agent_package" |>
if $service_provider != 'pacemaker' {
Package<| title == "$l3_agent_package" |> ->
exec { 'rm-neutron-l3-override':
path => '/sbin:/bin:/usr/bin:/usr/sbin',
command => "rm -f /etc/init/neutron-l3-agent.override",
}
}
}
include 'neutron::waist_setup'
@ -205,6 +205,7 @@ class neutron::agents::l3 (
Anchor['neutron-l3'] ->
Service['neutron-l3-init_stopped'] ->
Cs_resource["p_${::neutron::params::l3_agent_service}"] ->
Cs_commit['l3']->
Service['neutron-l3'] ->
Anchor['neutron-l3-done']

1
deployment/puppet/neutron/manifests/agents/metadata.pp
View File

@ -137,6 +137,7 @@ class neutron::agents::metadata (
Anchor['neutron-metadata-agent'] ->
Service['neutron-metadata-agent__disabled'] ->
Cs_resource["$res_name"] ->
Cs_commit["$cib_name"] ->
Service["$res_name"] ->
Anchor['neutron-metadata-agent-done']
}

2
deployment/puppet/neutron/manifests/agents/ovs.pp
View File

@ -157,6 +157,7 @@ class neutron::agents::ovs (
Service['neutron-ovs-agent_stopped'] ->
Exec<| title=='neutron-ovs-agent_stopped' |> ->
Cs_resource["p_${::neutron::params::ovs_agent_service}"] ->
Cs_commit['ovs'] ->
Service['neutron-ovs-agent']
service { 'neutron-ovs-agent':
@ -201,6 +202,7 @@ class neutron::agents::ovs (
}
}
default: {
Package["$ovs_agent_package"] ->
service { 'neutron-ovs-cleanup':
name => 'neutron-ovs-cleanup',
enable => true,

32
deployment/puppet/nova/manifests/compute/libvirt.pp
View File

@ -8,23 +8,16 @@ class nova::compute::libvirt (
if $::osfamily == 'RedHat' {
# yumrepo {'CentOS-Base':
# name => 'updates',
# priority => 10,
# before => [Package['libvirt']]
# }->
# package { 'qemu':
# ensure => present,
# }
exec { 'symlink-qemu-kvm':
command => "/bin/ln -sf /usr/libexec/qemu-kvm /usr/bin/qemu-system-x86_64",
}
stdlib::safe_package {'dnsmasq-utils':}
package { 'cpufreq-init':
ensure => present;
}
package { 'avahi':
ensure => present;
} ->
@ -51,6 +44,23 @@ class nova::compute::libvirt (
}
if $::operatingsystem == 'Ubuntu' {
package { 'cpufrequtils':
ensure => present;
}
file { '/etc/default/cpufrequtils':
content => "GOVERNOR=\"performance\" \n",
require => Package['cpufrequtils'],
notify => Service['cpufrequtils'],
}
service { 'cpufrequtils':
name => 'cpufrequtils',
enable => true,
ensure => true,
}
}
Service['libvirt'] -> Service['nova-compute']
if($::nova::params::compute_package_name and $::operatingsystem=='Ubuntu') {

6
deployment/puppet/savanna/manifests/dashboard.pp
View File

@ -22,15 +22,15 @@ class savanna::dashboard (
if $use_neutron {
$use_neutron_value = 'True'
$floating_ips_value = 'False'
} else {
$use_neutron_value = 'False'
}
if $use_floating_ips {
$floating_ips_value = 'True'
} else {
$floating_ips_value = 'False'
}
$use_neutron_value = 'False'
}
File_line {
ensure => $line_ensure,