openstack
/
fuel-library
Code Issues Proposed changes

Revert "Fix for ensurability of ceph" 

Looks like this commit introduced a regression:
class ceph::ephemeral passes 'images_type' as a value

This reverts commit 038ab3861e.
Closes-bug: #1554090

Change-Id: I55af63df43f342e7f285075c20a4025655843093
This commit is contained in:
Sergey Kolekonov 2016-03-07 18:48:32 +03:00
parent 9db0671c28
commit 67b2eec0f2
8 changed files with 20 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
deployment/puppet/openstack/manifests/ha/radosgw.pp
View File

@ -52,7 +52,7 @@ class openstack::ha::radosgw (
},
}
openstack::ha::haproxy_service { 'object-storage':
openstack::ha::haproxy_service { 'radosgw':
order => '130',
public => true,
public_ssl => $public_ssl,
@ -60,7 +60,7 @@ class openstack::ha::radosgw (
}
if $baremetal_virtual_ip {
openstack::ha::haproxy_service { 'object-storage-baremetal':
openstack::ha::haproxy_service { 'radosgw-baremetal':
order => '135',
public_virtual_ip => false,
internal_virtual_ip => $baremetal_virtual_ip,

8
deployment/puppet/openstack/manifests/ha/swift.pp
View File

@ -88,8 +88,8 @@ class openstack::ha::swift (
balancermember_options => $balancermember_options,
}
openstack::ha::haproxy_service { 'object-storage':
order => '130',
openstack::ha::haproxy_service { 'swift':
order => '120',
public => true,
public_ssl => $public_ssl,
public_ssl_path => $public_ssl_path,
@ -98,8 +98,8 @@ class openstack::ha::swift (
}
if $baremetal_virtual_ip {
openstack::ha::haproxy_service { 'object-storage-baremetal':
order => '135',
openstack::ha::haproxy_service { 'swift-baremetal':
order => '125',
public_virtual_ip => false,
internal_virtual_ip => $baremetal_virtual_ip,
}

4
deployment/puppet/openstack/spec/classes/openstack_ha_radosgw_spec.rb
View File

@ -29,7 +29,7 @@ require 'spec_helper'
end
it "should properly configure radosgw haproxy based on ssl" do
should contain_openstack__ha__haproxy_service('object-storage').with(
should contain_openstack__ha__haproxy_service('radosgw').with(
'order' => '130',
'listen_port' => 8080,
'balancermember_port' => 6780,
@ -41,7 +41,7 @@ require 'spec_helper'
end
it "should properly configure radosgw haproxy on baremetal VIP" do
should contain_openstack__ha__haproxy_service('object-storage-baremetal').with(
should contain_openstack__ha__haproxy_service('radosgw-baremetal').with(
'order' => '135',
'listen_port' => 8080,
'balancermember_port' => 6780,

12
deployment/puppet/openstack/spec/classes/openstack_ha_swift_spec.rb
View File

@ -43,8 +43,8 @@ require 'spec_helper'
end
it "should properly configure swift haproxy based on ssl" do
should contain_openstack__ha__haproxy_service('object-storage').with(
'order' => '130',
should contain_openstack__ha__haproxy_service('swift').with(
'order' => '120',
'listen_port' => 8080,
'public' => true,
'public_ssl' => true,
@ -55,8 +55,8 @@ require 'spec_helper'
end
it "should properly configure swift haproxy on baremetal VIP" do
should contain_openstack__ha__haproxy_service('object-storage-baremetal').with(
'order' => '135',
should contain_openstack__ha__haproxy_service('swift-baremetal').with(
'order' => '125',
'listen_port' => 8080,
'public_ssl' => false,
'internal_virtual_ip' => '192.168.0.2',
@ -76,8 +76,8 @@ require 'spec_helper'
end
it "should properly configure swift haproxy" do
should contain_openstack__ha__haproxy_service('object-storage').with(
'order' => '130',
should contain_openstack__ha__haproxy_service('swift').with(
'order' => '120',
'listen_port' => 8080,
'public' => true,
'public_ssl' => false,

7
deployment/puppet/osnailyfacter/modular/ceph/ceph_compute.pp
View File

@ -96,11 +96,4 @@ if $use_ceph {
cwd => '/root',
}
}
if !($storage_hash['ephemeral_ceph']) {
class { 'ceph::ephemeral':
libvirt_images_type => 'absent',
}
}

5
tests/noop/spec/hosts/ceph/ceph_compute_spec.rb
View File

@ -36,11 +36,6 @@ describe manifest do
it { should_not contain_class('ceph') }
end
if !(storage_hash['ephemeral_ceph'])
it { should contain_class('ceph::ephemeral').with(
'libvirt_images_type' => 'absent',)
}
end
end
test_ubuntu_and_centos manifest
end

4
tests/noop/spec/hosts/openstack-haproxy/openstack-haproxy-radosgw_spec.rb
View File

@ -38,7 +38,7 @@ describe manifest do
it "should properly configure radosgw haproxy based on ssl" do
public_ssl_radosgw = Noop.hiera_structure('public_ssl/services', false)
should contain_openstack__ha__haproxy_service('object-storage').with(
should contain_openstack__ha__haproxy_service('radosgw').with(
'order' => '130',
'ipaddresses' => ipaddresses,
'server_names' => server_names,
@ -55,7 +55,7 @@ describe manifest do
end
it 'should declare openstack::ha::haproxy_service with name radosgw-baremetal' do
should contain_openstack__ha__haproxy_service('object-storage-baremetal').with(
should contain_openstack__ha__haproxy_service('radosgw-baremetal').with(
'order' => '135',
'ipaddresses' => ipaddresses,
'server_names' => server_names,

8
tests/noop/spec/hosts/openstack-haproxy/openstack-haproxy-swift_spec.rb
View File

@ -50,8 +50,8 @@ describe manifest do
it "should properly configure swift haproxy based on ssl" do
public_ssl_swift = Noop.hiera_structure('public_ssl/services', false)
should contain_openstack__ha__haproxy_service('object-storage').with(
'order' => '130',
should contain_openstack__ha__haproxy_service('swift').with(
'order' => '120',
'listen_port' => 8080,
'public' => true,
'public_ssl' => public_ssl_swift,
@ -71,8 +71,8 @@ describe manifest do
end
it 'should declare openstack::ha::haproxy_service with name swift-baremetal' do
should contain_openstack__ha__haproxy_service('object-storage-baremetal').with(
'order' => '135',
should contain_openstack__ha__haproxy_service('swift-baremetal').with(
'order' => '125',
'listen_port' => 8080,
'public_virtual_ip' => false,
'internal_virtual_ip' => baremetal_virtual_ip,