From c09228d03a40fd486048d9983dd667ad69754a90 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bart=C5=82omiej=20Piotrowski?= Date: Mon, 19 Jan 2015 09:10:23 +0100 Subject: [PATCH] Change references to Mirantis to Fuel in OCF pathes Change-Id: I594a6a7ade6029689232d2946acc28b9dd3b835c Closes-Bug: 1402610 --- .../puppet/cluster/manifests/corosync/cs_service.pp | 4 ++-- deployment/puppet/cluster/manifests/haproxy_ocf.pp | 6 +++--- deployment/puppet/cluster/manifests/init.pp | 12 ++++++------ deployment/puppet/cluster/manifests/virtual_ip.pp | 2 +- deployment/puppet/galera/manifests/init.pp | 6 +++--- deployment/puppet/openstack/manifests/ceilometer.pp | 8 ++++---- .../puppet/openstack/manifests/ha/haproxy_service.pp | 2 +- .../puppet/pacemaker_wrappers/manifests/service.pp | 2 +- deployment/puppet/vmware/manifests/ceilometer.pp | 2 +- deployment/puppet/vmware/manifests/ceilometer/ha.pp | 2 +- deployment/puppet/vmware/manifests/compute/ha.pp | 2 +- deployment/puppet/vmware/manifests/controller.pp | 2 +- deployment/puppet/vmware/manifests/network/nova.pp | 4 ++-- .../puppet/vmware/spec/classes/ceilometer_spec.rb | 2 +- .../puppet/vmware/spec/classes/controller_spec.rb | 2 +- .../vmware/spec/defines/vmware_ceilometer_ha_spec.rb | 2 +- .../vmware/spec/defines/vmware_compute_ha_spec.rb | 2 +- 17 files changed, 31 insertions(+), 31 deletions(-) diff --git a/deployment/puppet/cluster/manifests/corosync/cs_service.pp b/deployment/puppet/cluster/manifests/corosync/cs_service.pp index 6906c47478..35784aa5e6 100644 --- a/deployment/puppet/cluster/manifests/corosync/cs_service.pp +++ b/deployment/puppet/cluster/manifests/corosync/cs_service.pp @@ -25,7 +25,7 @@ define cluster::corosync::cs_service ( # OCF script for pacemaker file { $ocf_script : - path => "/usr/lib/ocf/resource.d/mirantis/${ocf_script}", + path => "/usr/lib/ocf/resource.d/fuel/${ocf_script}", mode => '0755', owner => root, group => root, @@ -36,7 +36,7 @@ define cluster::corosync::cs_service ( cs_resource { "p_${service_name}": ensure => present, primitive_class => 'ocf', - provided_by => 'mirantis', + provided_by => 'fuel', primitive_type => $ocf_script, complex_type => $csr_complex_type, ms_metadata => $csr_ms_metadata, diff --git a/deployment/puppet/cluster/manifests/haproxy_ocf.pp b/deployment/puppet/cluster/manifests/haproxy_ocf.pp index a7f9e15e42..8c78392215 100644 --- a/deployment/puppet/cluster/manifests/haproxy_ocf.pp +++ b/deployment/puppet/cluster/manifests/haproxy_ocf.pp @@ -10,20 +10,20 @@ class cluster::haproxy_ocf ( $service_name = 'p_haproxy' file {'haproxy-ocf': - path =>'/usr/lib/ocf/resource.d/mirantis/ns_haproxy', + path =>'/usr/lib/ocf/resource.d/fuel/ns_haproxy', mode => '0755', owner => root, group => root, source => 'puppet:///modules/cluster/ocf/ns_haproxy', } Anchor['haproxy'] -> File['haproxy-ocf'] - File<| title == 'ocf-mirantis-path' |> -> File['haproxy-ocf'] + File<| title == 'ocf-fuel-path' |> -> File['haproxy-ocf'] if $primary_controller { cs_resource { $service_name: ensure => present, primitive_class => 'ocf', - provided_by => 'mirantis', + provided_by => 'fuel', primitive_type => 'ns_haproxy', complex_type => 'clone', ms_metadata => { diff --git a/deployment/puppet/cluster/manifests/init.pp b/deployment/puppet/cluster/manifests/init.pp index 87bf6b91f6..06cdb7305e 100644 --- a/deployment/puppet/cluster/manifests/init.pp +++ b/deployment/puppet/cluster/manifests/init.pp @@ -20,18 +20,18 @@ class cluster ( unicast_addresses => $unicast_addresses } } - file { 'ocf-mirantis-path': + file { 'ocf-fuel-path': ensure => directory, - path =>'/usr/lib/ocf/resource.d/mirantis', + path =>'/usr/lib/ocf/resource.d/fuel', recurse => true, owner => root, group => root, } - Package['corosync'] -> File['ocf-mirantis-path'] - Package<| title == 'pacemaker' |> -> File['ocf-mirantis-path'] + Package['corosync'] -> File['ocf-fuel-path'] + Package<| title == 'pacemaker' |> -> File['ocf-fuel-path'] file { 'ns-ipaddr2-ocf': - path =>'/usr/lib/ocf/resource.d/mirantis/ns_IPaddr2', + path =>'/usr/lib/ocf/resource.d/fuel/ns_IPaddr2', mode => '0755', owner => root, group => root, @@ -39,7 +39,7 @@ class cluster ( } Package['pacemaker'] -> File['ns-ipaddr2-ocf'] - File<| title == 'ocf-mirantis-path' |> -> File['ns-ipaddr2-ocf'] + File<| title == 'ocf-fuel-path' |> -> File['ns-ipaddr2-ocf'] } # diff --git a/deployment/puppet/cluster/manifests/virtual_ip.pp b/deployment/puppet/cluster/manifests/virtual_ip.pp index cbcc8159f5..74cda70c96 100644 --- a/deployment/puppet/cluster/manifests/virtual_ip.pp +++ b/deployment/puppet/cluster/manifests/virtual_ip.pp @@ -25,7 +25,7 @@ define cluster::virtual_ip ( cs_resource { $vip_name: ensure => present, primitive_class => 'ocf', - provided_by => 'mirantis', + provided_by => 'fuel', primitive_type => 'ns_IPaddr2', parameters => { 'nic' => $vip[nic], diff --git a/deployment/puppet/galera/manifests/init.pp b/deployment/puppet/galera/manifests/init.pp index 7fbf796c58..efc1d57900 100644 --- a/deployment/puppet/galera/manifests/init.pp +++ b/deployment/puppet/galera/manifests/init.pp @@ -168,7 +168,7 @@ class galera ( cs_resource { "p_${service_name}": ensure => present, primitive_class => 'ocf', - provided_by => 'mirantis', + provided_by => 'fuel', primitive_type => 'mysql-wss', complex_type => 'clone', parameters => { @@ -201,14 +201,14 @@ class galera ( } file { 'mysql-wss-ocf': - path => '/usr/lib/ocf/resource.d/mirantis/mysql-wss', + path => '/usr/lib/ocf/resource.d/fuel/mysql-wss', mode => '0755', owner => root, group => root, 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'] diff --git a/deployment/puppet/openstack/manifests/ceilometer.pp b/deployment/puppet/openstack/manifests/ceilometer.pp index dbff8ad675..03259ea3c9 100644 --- a/deployment/puppet/openstack/manifests/ceilometer.pp +++ b/deployment/puppet/openstack/manifests/ceilometer.pp @@ -128,7 +128,7 @@ class openstack::ceilometer ( Package['ceilometer-agent-central'] -> 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', owner => root, group => root, @@ -139,7 +139,7 @@ class openstack::ceilometer ( cs_resource { $ceilometer_agent_res_name: ensure => present, primitive_class => 'ocf', - provided_by => 'mirantis', + provided_by => 'fuel', primitive_type => 'ceilometer-agent-central', metadata => { 'target-role' => 'stopped', 'resource-stickiness' => '1' }, parameters => { 'user' => 'ceilometer' }, @@ -174,7 +174,7 @@ class openstack::ceilometer ( Package[$::ceilometer::params::alarm_package_name] -> File['ceilometer-alarm-evaluator-ocf'] Package['pacemaker'] -> 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', owner => root, group => root, @@ -185,7 +185,7 @@ class openstack::ceilometer ( cs_resource { $ceilometer_alarm_res_name: ensure => present, primitive_class => 'ocf', - provided_by => 'mirantis', + provided_by => 'fuel', primitive_type => 'ceilometer-alarm-evaluator', metadata => { 'target-role' => 'stopped' }, parameters => { 'user' => 'ceilometer' }, diff --git a/deployment/puppet/openstack/manifests/ha/haproxy_service.pp b/deployment/puppet/openstack/manifests/ha/haproxy_service.pp index cdfa357be1..ca2a891597 100644 --- a/deployment/puppet/openstack/manifests/ha/haproxy_service.pp +++ b/deployment/puppet/openstack/manifests/ha/haproxy_service.pp @@ -66,7 +66,7 @@ define openstack::ha::haproxy_service ( # Dirty hack, due Puppet can't send notify between stages 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', logoutput => true, provider => 'shell', diff --git a/deployment/puppet/pacemaker_wrappers/manifests/service.pp b/deployment/puppet/pacemaker_wrappers/manifests/service.pp index 57ad7c852f..ce1db1e65e 100644 --- a/deployment/puppet/pacemaker_wrappers/manifests/service.pp +++ b/deployment/puppet/pacemaker_wrappers/manifests/service.pp @@ -2,7 +2,7 @@ define pacemaker_wrappers::service ( $ensure = 'present', $ocf_root_path = '/usr/lib/ocf', $primitive_class = 'ocf', - $primitive_provider = 'mirantis', + $primitive_provider = 'fuel', $primitive_type = undef, $parameters = undef, diff --git a/deployment/puppet/vmware/manifests/ceilometer.pp b/deployment/puppet/vmware/manifests/ceilometer.pp index a8898afe11..69625ebe12 100644 --- a/deployment/puppet/vmware/manifests/ceilometer.pp +++ b/deployment/puppet/vmware/manifests/ceilometer.pp @@ -26,7 +26,7 @@ class vmware::ceilometer ( if $ha_mode { 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', owner => root, group => root, diff --git a/deployment/puppet/vmware/manifests/ceilometer/ha.pp b/deployment/puppet/vmware/manifests/ceilometer/ha.pp index 3736a2ea37..ee5c528514 100644 --- a/deployment/puppet/vmware/manifests/ceilometer/ha.pp +++ b/deployment/puppet/vmware/manifests/ceilometer/ha.pp @@ -29,7 +29,7 @@ define vmware::ceilometer::ha ( cs_resource { "p_ceilometer_agent_compute_vmware_${index}": ensure => present, primitive_class => 'ocf', - provided_by => 'mirantis', + provided_by => 'fuel', primitive_type => 'ceilometer-agent-compute', metadata => { 'target-role' => 'stopped', diff --git a/deployment/puppet/vmware/manifests/compute/ha.pp b/deployment/puppet/vmware/manifests/compute/ha.pp index d121693c53..49e9238f43 100644 --- a/deployment/puppet/vmware/manifests/compute/ha.pp +++ b/deployment/puppet/vmware/manifests/compute/ha.pp @@ -55,7 +55,7 @@ define vmware::compute::ha( cs_resource { "p_nova_compute_vmware_${index}": ensure => present, primitive_class => 'ocf', - provided_by => 'mirantis', + provided_by => 'fuel', primitive_type => 'nova-compute', metadata => { resource-stickiness => '1' diff --git a/deployment/puppet/vmware/manifests/controller.pp b/deployment/puppet/vmware/manifests/controller.pp index dcd2642f7e..5bc73c1047 100644 --- a/deployment/puppet/vmware/manifests/controller.pp +++ b/deployment/puppet/vmware/manifests/controller.pp @@ -61,7 +61,7 @@ class vmware::controller ( } else { 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', owner => 'root', group => 'root', diff --git a/deployment/puppet/vmware/manifests/network/nova.pp b/deployment/puppet/vmware/manifests/network/nova.pp index eec9ebb297..9258813342 100644 --- a/deployment/puppet/vmware/manifests/network/nova.pp +++ b/deployment/puppet/vmware/manifests/network/nova.pp @@ -45,7 +45,7 @@ class vmware::network::nova ( cs_resource { 'p_vcenter_nova_network': ensure => present, primitive_class => 'ocf', - provided_by => 'mirantis', + provided_by => 'fuel', primitive_type => 'nova-network', metadata => { 'resource-stickiness' => '1' @@ -69,7 +69,7 @@ class vmware::network::nova ( } 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', owner => 'root', group => 'root', diff --git a/deployment/puppet/vmware/spec/classes/ceilometer_spec.rb b/deployment/puppet/vmware/spec/classes/ceilometer_spec.rb index 5c42e17756..f66f177f6e 100644 --- a/deployment/puppet/vmware/spec/classes/ceilometer_spec.rb +++ b/deployment/puppet/vmware/spec/classes/ceilometer_spec.rb @@ -19,7 +19,7 @@ describe 'vmware::ceilometer' do it 'should install ceilometer-agent-compute OCF script' do 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', }) end diff --git a/deployment/puppet/vmware/spec/classes/controller_spec.rb b/deployment/puppet/vmware/spec/classes/controller_spec.rb index 548023cd51..86ba84d2a7 100644 --- a/deployment/puppet/vmware/spec/classes/controller_spec.rb +++ b/deployment/puppet/vmware/spec/classes/controller_spec.rb @@ -14,7 +14,7 @@ describe 'vmware::controller' do it 'should install nova-compute OCF script' do 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', }) end diff --git a/deployment/puppet/vmware/spec/defines/vmware_ceilometer_ha_spec.rb b/deployment/puppet/vmware/spec/defines/vmware_ceilometer_ha_spec.rb index 2e58e53e28..c8819a0229 100644 --- a/deployment/puppet/vmware/spec/defines/vmware_ceilometer_ha_spec.rb +++ b/deployment/puppet/vmware/spec/defines/vmware_ceilometer_ha_spec.rb @@ -17,7 +17,7 @@ describe 'vmware::ceilometer::ha' do it 'should create service p_ceilometer_agent_compute_vmware_0' do should contain_cs_resource('p_ceilometer_agent_compute_vmware_0').with({ 'primitive_class' => 'ocf', - 'provided_by' => 'mirantis', + 'provided_by' => 'fuel', }) end diff --git a/deployment/puppet/vmware/spec/defines/vmware_compute_ha_spec.rb b/deployment/puppet/vmware/spec/defines/vmware_compute_ha_spec.rb index 665146df4f..05c76ac9de 100644 --- a/deployment/puppet/vmware/spec/defines/vmware_compute_ha_spec.rb +++ b/deployment/puppet/vmware/spec/defines/vmware_compute_ha_spec.rb @@ -17,7 +17,7 @@ describe 'vmware::compute::ha' do it 'should create service p_nova_compute_vmware_0' do should contain_cs_resource('p_nova_compute_vmware_0').with({ 'primitive_class' => 'ocf', - 'provided_by' => 'mirantis', + 'provided_by' => 'fuel', }) end