openstack/fuel-library
Code Issues Proposed changes

Change references to Mirantis to Fuel in OCF pathes

Browse Source 
Change-Id: I594a6a7ade6029689232d2946acc28b9dd3b835c
Closes-Bug: 1402610
This commit is contained in:
Bartłomiej Piotrowski 2015-01-19 09:10:23 +01:00
parent 5edc8396cb
commit c09228d03a
17 changed files with 31 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
deployment/puppet/cluster/manifests/corosync/cs_service.pp
View File

@ -25,7 +25,7 @@ define cluster::corosync::cs_service (
# OCF script for pacemaker # OCF script for pacemaker
file { $ocf_script : file { $ocf_script :
path => "/usr/lib/ocf/resource.d/mirantis/${ocf_script}", path => "/usr/lib/ocf/resource.d/fuel/${ocf_script}",
mode => '0755', mode => '0755',
owner => root, owner => root,
group => root, group => root,
@ -36,7 +36,7 @@ define cluster::corosync::cs_service (
cs_resource { "p_${service_name}": cs_resource { "p_${service_name}":
ensure => present, ensure => present,
primitive_class => 'ocf', primitive_class => 'ocf',
provided_by => 'mirantis', provided_by => 'fuel',
primitive_type => $ocf_script, primitive_type => $ocf_script,
complex_type => $csr_complex_type, complex_type => $csr_complex_type,
ms_metadata => $csr_ms_metadata, ms_metadata => $csr_ms_metadata,

6
deployment/puppet/cluster/manifests/haproxy_ocf.pp
View File

@ -10,20 +10,20 @@ class cluster::haproxy_ocf (
$service_name = 'p_haproxy' $service_name = 'p_haproxy'
file {'haproxy-ocf': file {'haproxy-ocf':
path =>'/usr/lib/ocf/resource.d/mirantis/ns_haproxy', path =>'/usr/lib/ocf/resource.d/fuel/ns_haproxy',
mode => '0755', mode => '0755',
owner => root, owner => root,
group => root, group => root,
source => 'puppet:///modules/cluster/ocf/ns_haproxy', source => 'puppet:///modules/cluster/ocf/ns_haproxy',
} }
Anchor['haproxy'] -> File['haproxy-ocf'] Anchor['haproxy'] -> File['haproxy-ocf']
File<| title == 'ocf-mirantis-path' |> -> File['haproxy-ocf'] File<| title == 'ocf-fuel-path' |> -> File['haproxy-ocf']
if $primary_controller { if $primary_controller {
cs_resource { $service_name: cs_resource { $service_name:
ensure => present, ensure => present,
primitive_class => 'ocf', primitive_class => 'ocf',
provided_by => 'mirantis', provided_by => 'fuel',
primitive_type => 'ns_haproxy', primitive_type => 'ns_haproxy',
complex_type => 'clone', complex_type => 'clone',
ms_metadata => { ms_metadata => {

12
deployment/puppet/cluster/manifests/init.pp
View File

@ -20,18 +20,18 @@ class cluster (
unicast_addresses => $unicast_addresses unicast_addresses => $unicast_addresses
} }
} }
file { 'ocf-mirantis-path': file { 'ocf-fuel-path':
ensure => directory, ensure => directory,
path =>'/usr/lib/ocf/resource.d/mirantis', path =>'/usr/lib/ocf/resource.d/fuel',
recurse => true, recurse => true,
owner => root, owner => root,
group => root, group => root,
} }
Package['corosync'] -> File['ocf-mirantis-path'] Package['corosync'] -> File['ocf-fuel-path']
Package<| title == 'pacemaker' |> -> File['ocf-mirantis-path'] Package<| title == 'pacemaker' |> -> File['ocf-fuel-path']
file { 'ns-ipaddr2-ocf': file { 'ns-ipaddr2-ocf':
path =>'/usr/lib/ocf/resource.d/mirantis/ns_IPaddr2', path =>'/usr/lib/ocf/resource.d/fuel/ns_IPaddr2',
mode => '0755', mode => '0755',
owner => root, owner => root,
group => root, group => root,
@ -39,7 +39,7 @@ class cluster (
} }
Package['pacemaker'] -> File['ns-ipaddr2-ocf'] Package['pacemaker'] -> File['ns-ipaddr2-ocf']
File<| title == 'ocf-mirantis-path' |> -> File['ns-ipaddr2-ocf'] File<| title == 'ocf-fuel-path' |> -> File['ns-ipaddr2-ocf']
} }
# #

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

@ -25,7 +25,7 @@ define cluster::virtual_ip (
cs_resource { $vip_name: cs_resource { $vip_name:
ensure => present, ensure => present,
primitive_class => 'ocf', primitive_class => 'ocf',
provided_by => 'mirantis', provided_by => 'fuel',
primitive_type => 'ns_IPaddr2', primitive_type => 'ns_IPaddr2',
parameters => { parameters => {
'nic' => $vip[nic], 'nic' => $vip[nic],

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

@ -168,7 +168,7 @@ class galera (
cs_resource { "p_${service_name}": cs_resource { "p_${service_name}":
ensure => present, ensure => present,
primitive_class => 'ocf', primitive_class => 'ocf',
provided_by => 'mirantis', provided_by => 'fuel',
primitive_type => 'mysql-wss', primitive_type => 'mysql-wss',
complex_type => 'clone', complex_type => 'clone',
parameters => { parameters => {
@ -201,14 +201,14 @@ class galera (
} }
file { 'mysql-wss-ocf': file { 'mysql-wss-ocf':
path => '/usr/lib/ocf/resource.d/mirantis/mysql-wss', path => '/usr/lib/ocf/resource.d/fuel/mysql-wss',
mode => '0755', mode => '0755',
owner => root, owner => root,
group => root, group => root,
source => 'puppet:///modules/galera/ocf/mysql-wss', source => 'puppet:///modules/galera/ocf/mysql-wss',
} }
File<| title == 'ocf-mirantis-path' |> -> File['mysql-wss-ocf'] File<| title == 'ocf-fuel-path' |> -> File['mysql-wss-ocf']
Package['MySQL-server', 'galera'] -> File['mysql-wss-ocf'] Package['MySQL-server', 'galera'] -> File['mysql-wss-ocf']

8
deployment/puppet/openstack/manifests/ceilometer.pp
View File

@ -128,7 +128,7 @@ class openstack::ceilometer (
Package['ceilometer-agent-central'] -> File['ceilometer-agent-central-ocf'] Package['ceilometer-agent-central'] -> File['ceilometer-agent-central-ocf']
file {'ceilometer-agent-central-ocf': file {'ceilometer-agent-central-ocf':
path => '/usr/lib/ocf/resource.d/mirantis/ceilometer-agent-central', path => '/usr/lib/ocf/resource.d/fuel/ceilometer-agent-central',
mode => '0755', mode => '0755',
owner => root, owner => root,
group => root, group => root,
@ -139,7 +139,7 @@ class openstack::ceilometer (
cs_resource { $ceilometer_agent_res_name: cs_resource { $ceilometer_agent_res_name:
ensure => present, ensure => present,
primitive_class => 'ocf', primitive_class => 'ocf',
provided_by => 'mirantis', provided_by => 'fuel',
primitive_type => 'ceilometer-agent-central', primitive_type => 'ceilometer-agent-central',
metadata => { 'target-role' => 'stopped', 'resource-stickiness' => '1' }, metadata => { 'target-role' => 'stopped', 'resource-stickiness' => '1' },
parameters => { 'user' => 'ceilometer' }, parameters => { 'user' => 'ceilometer' },
@ -174,7 +174,7 @@ class openstack::ceilometer (
Package[$::ceilometer::params::alarm_package_name] -> File['ceilometer-alarm-evaluator-ocf'] Package[$::ceilometer::params::alarm_package_name] -> File['ceilometer-alarm-evaluator-ocf']
Package['pacemaker'] -> File['ceilometer-alarm-evaluator-ocf'] Package['pacemaker'] -> File['ceilometer-alarm-evaluator-ocf']
file {'ceilometer-alarm-evaluator-ocf': file {'ceilometer-alarm-evaluator-ocf':
path => '/usr/lib/ocf/resource.d/mirantis/ceilometer-alarm-evaluator', path => '/usr/lib/ocf/resource.d/fuel/ceilometer-alarm-evaluator',
mode => '0755', mode => '0755',
owner => root, owner => root,
group => root, group => root,
@ -185,7 +185,7 @@ class openstack::ceilometer (
cs_resource { $ceilometer_alarm_res_name: cs_resource { $ceilometer_alarm_res_name:
ensure => present, ensure => present,
primitive_class => 'ocf', primitive_class => 'ocf',
provided_by => 'mirantis', provided_by => 'fuel',
primitive_type => 'ceilometer-alarm-evaluator', primitive_type => 'ceilometer-alarm-evaluator',
metadata => { 'target-role' => 'stopped' }, metadata => { 'target-role' => 'stopped' },
parameters => { 'user' => 'ceilometer' }, parameters => { 'user' => 'ceilometer' },

2
deployment/puppet/openstack/manifests/ha/haproxy_service.pp
View File

@ -66,7 +66,7 @@ define openstack::ha::haproxy_service (
# Dirty hack, due Puppet can't send notify between stages # Dirty hack, due Puppet can't send notify between stages
exec { "haproxy reload for ${name}": exec { "haproxy reload for ${name}":
command => 'export OCF_ROOT="/usr/lib/ocf"; (ip netns list | grep haproxy) && ip netns exec haproxy /usr/lib/ocf/resource.d/mirantis/ns_haproxy reload', command => 'export OCF_ROOT="/usr/lib/ocf"; (ip netns list | grep haproxy) && ip netns exec haproxy /usr/lib/ocf/resource.d/fuel/ns_haproxy reload',
path => '/usr/bin:/usr/sbin:/bin:/sbin', path => '/usr/bin:/usr/sbin:/bin:/sbin',
logoutput => true, logoutput => true,
provider => 'shell', provider => 'shell',

2
deployment/puppet/pacemaker_wrappers/manifests/service.pp
View File

@ -2,7 +2,7 @@ define pacemaker_wrappers::service (
$ensure = 'present', $ensure = 'present',
$ocf_root_path = '/usr/lib/ocf', $ocf_root_path = '/usr/lib/ocf',
$primitive_class = 'ocf', $primitive_class = 'ocf',
$primitive_provider = 'mirantis', $primitive_provider = 'fuel',
$primitive_type = undef, $primitive_type = undef,
$parameters = undef, $parameters = undef,

2
deployment/puppet/vmware/manifests/ceilometer.pp
View File

@ -26,7 +26,7 @@ class vmware::ceilometer (
if $ha_mode { if $ha_mode {
file {'ceilometer-agent-compute-ocf': file {'ceilometer-agent-compute-ocf':
path =>'/usr/lib/ocf/resource.d/mirantis/ceilometer-agent-compute', path =>'/usr/lib/ocf/resource.d/fuel/ceilometer-agent-compute',
mode => '0755', mode => '0755',
owner => root, owner => root,
group => root, group => root,

2
deployment/puppet/vmware/manifests/ceilometer/ha.pp
View File

@ -29,7 +29,7 @@ define vmware::ceilometer::ha (
cs_resource { "p_ceilometer_agent_compute_vmware_${index}": cs_resource { "p_ceilometer_agent_compute_vmware_${index}":
ensure => present, ensure => present,
primitive_class => 'ocf', primitive_class => 'ocf',
provided_by => 'mirantis', provided_by => 'fuel',
primitive_type => 'ceilometer-agent-compute', primitive_type => 'ceilometer-agent-compute',
metadata => { metadata => {
'target-role' => 'stopped', 'target-role' => 'stopped',

2
deployment/puppet/vmware/manifests/compute/ha.pp
View File

@ -55,7 +55,7 @@ define vmware::compute::ha(
cs_resource { "p_nova_compute_vmware_${index}": cs_resource { "p_nova_compute_vmware_${index}":
ensure => present, ensure => present,
primitive_class => 'ocf', primitive_class => 'ocf',
provided_by => 'mirantis', provided_by => 'fuel',
primitive_type => 'nova-compute', primitive_type => 'nova-compute',
metadata => { metadata => {
resource-stickiness => '1' resource-stickiness => '1'

2
deployment/puppet/vmware/manifests/controller.pp
View File

@ -61,7 +61,7 @@ class vmware::controller (
} else { } else {
file { 'vcenter-nova-compute-ocf': file { 'vcenter-nova-compute-ocf':
path => '/usr/lib/ocf/resource.d/mirantis/nova-compute', path => '/usr/lib/ocf/resource.d/fuel/nova-compute',
source => 'puppet:///modules/vmware/ocf/nova-compute', source => 'puppet:///modules/vmware/ocf/nova-compute',
owner => 'root', owner => 'root',
group => 'root', group => 'root',

4
deployment/puppet/vmware/manifests/network/nova.pp
View File

@ -45,7 +45,7 @@ class vmware::network::nova (
cs_resource { 'p_vcenter_nova_network': cs_resource { 'p_vcenter_nova_network':
ensure => present, ensure => present,
primitive_class => 'ocf', primitive_class => 'ocf',
provided_by => 'mirantis', provided_by => 'fuel',
primitive_type => 'nova-network', primitive_type => 'nova-network',
metadata => { metadata => {
'resource-stickiness' => '1' 'resource-stickiness' => '1'
@ -69,7 +69,7 @@ class vmware::network::nova (
} }
file { 'vcenter-nova-network-ocf': file { 'vcenter-nova-network-ocf':
path => '/usr/lib/ocf/resource.d/mirantis/nova-network', path => '/usr/lib/ocf/resource.d/fuel/nova-network',
source => 'puppet:///modules/vmware/ocf/nova-network', source => 'puppet:///modules/vmware/ocf/nova-network',
owner => 'root', owner => 'root',
group => 'root', group => 'root',

2
deployment/puppet/vmware/spec/classes/ceilometer_spec.rb
View File

@ -19,7 +19,7 @@ describe 'vmware::ceilometer' do
it 'should install ceilometer-agent-compute OCF script' do it 'should install ceilometer-agent-compute OCF script' do
should contain_file('ceilometer-agent-compute-ocf').with({ should contain_file('ceilometer-agent-compute-ocf').with({
'path' => '/usr/lib/ocf/resource.d/mirantis/ceilometer-agent-compute', 'path' => '/usr/lib/ocf/resource.d/fuel/ceilometer-agent-compute',
'source' => 'puppet:///modules/vmware/ocf/ceilometer-agent-compute', 'source' => 'puppet:///modules/vmware/ocf/ceilometer-agent-compute',
}) })
end end

2
deployment/puppet/vmware/spec/classes/controller_spec.rb
View File

@ -14,7 +14,7 @@ describe 'vmware::controller' do
it 'should install nova-compute OCF script' do it 'should install nova-compute OCF script' do
should contain_file('vcenter-nova-compute-ocf').with({ should contain_file('vcenter-nova-compute-ocf').with({
'path' => '/usr/lib/ocf/resource.d/mirantis/nova-compute', 'path' => '/usr/lib/ocf/resource.d/fuel/nova-compute',
'source' => 'puppet:///modules/vmware/ocf/nova-compute', 'source' => 'puppet:///modules/vmware/ocf/nova-compute',
}) })
end end

2
deployment/puppet/vmware/spec/defines/vmware_ceilometer_ha_spec.rb
View File

@ -17,7 +17,7 @@ describe 'vmware::ceilometer::ha' do
it 'should create service p_ceilometer_agent_compute_vmware_0' do it 'should create service p_ceilometer_agent_compute_vmware_0' do
should contain_cs_resource('p_ceilometer_agent_compute_vmware_0').with({ should contain_cs_resource('p_ceilometer_agent_compute_vmware_0').with({
'primitive_class' => 'ocf', 'primitive_class' => 'ocf',
'provided_by' => 'mirantis', 'provided_by' => 'fuel',
}) })
end end

2
deployment/puppet/vmware/spec/defines/vmware_compute_ha_spec.rb
View File

@ -17,7 +17,7 @@ describe 'vmware::compute::ha' do
it 'should create service p_nova_compute_vmware_0' do it 'should create service p_nova_compute_vmware_0' do
should contain_cs_resource('p_nova_compute_vmware_0').with({ should contain_cs_resource('p_nova_compute_vmware_0').with({
'primitive_class' => 'ocf', 'primitive_class' => 'ocf',
'provided_by' => 'mirantis', 'provided_by' => 'fuel',
}) })
end end