Skip to content

Update openstack modules to their latest master #149

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
paramite merged 6 commits into from
Nov 27, 2014
Merged

Update openstack modules to their latest master #149

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
bf598b4
Update glance to 24d5c3425f6016e9eb6447a4041a7419eada3d31
xbezdick Nov 24, 2014
ebb92f2
Update heat to d1479219e946bc9cc7fb08d60de9f3ec85cb7176
xbezdick Nov 24, 2014
b91fe33
Update horizon to 353c372d582167d5635b1b2ee9474cf6822db032
xbezdick Nov 24, 2014
337b82f
Update neutron to bbecaab2ff2d755e8c19e50458bbbd1b7e43fb2a
xbezdick Nov 24, 2014
6737a4e
Update nova to 0d1a71f4f6f59c7ec87d571dc63707e200f753b2
xbezdick Nov 24, 2014
77933c6
Update swift to 54fdb8474245deebc7f4a04cd74caf061a4e90f2
xbezdick Nov 24, 2014
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 6 additions & 6 deletions Puppetfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ mod 'galera',
:git => 'https://github.com/rohara/puppet-galera.git'

mod 'glance',
:commit => '916a90ebdc3e9fafe956b12dcaa0e0ce3e7e3f04',
:commit => '24d5c3425f6016e9eb6447a4041a7419eada3d31',
:git => 'https://github.com/stackforge/puppet-glance.git'

mod 'gluster',
Expand All @@ -43,11 +43,11 @@ mod 'haproxy',
:git => 'https://github.com/puppetlabs/puppetlabs-haproxy.git'

mod 'heat',
:commit => '45a35dc2ec5f01bd79189ada881d083e1a51413b',
:commit => 'd1479219e946bc9cc7fb08d60de9f3ec85cb7176',
:git => 'https://github.com/stackforge/puppet-heat.git'

mod 'horizon',
:commit => '351c711004ccd9815e9a0d153bc5452461f7852d',
:commit => '353c372d582167d5635b1b2ee9474cf6822db032',
:git => 'https://github.com/stackforge/puppet-horizon.git'

mod 'inifile',
Expand Down Expand Up @@ -87,11 +87,11 @@ mod 'nagios',
:git => 'https://github.com/gildub/puppet-nagios-openstack.git'

mod 'neutron',
:commit => '663b4b16d22f78dbbb89c58170690a3c0a1e0ff2',
:commit => 'bbecaab2ff2d755e8c19e50458bbbd1b7e43fb2a',
:git => 'https://github.com/stackforge/puppet-neutron.git'

mod 'nova',
:commit => '261ae911fc5c325f6dd739a9b05f508a80a25034',
:commit => '0d1a71f4f6f59c7ec87d571dc63707e200f753b2',
:git => 'https://github.com/stackforge/puppet-nova.git'

mod 'nssdb',
Expand Down Expand Up @@ -151,7 +151,7 @@ mod 'stdlib',
:git => 'https://github.com/puppetlabs/puppetlabs-stdlib.git'

mod 'swift',
:commit => '2193831dd787e9b24382c588dfa49917bcf47262',
:commit => '54fdb8474245deebc7f4a04cd74caf061a4e90f2',
:git => 'https://github.com/stackforge/puppet-swift.git'

mod 'sysctl',
Expand Down
4 changes: 2 additions & 2 deletions glance/manifests/api.pp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -290,11 +290,11 @@
# known_stores config
if $known_stores {
glance_api_config {
'DEFAULT/known_stores': value => join($known_stores, ',');
'glance_store/stores': value => join($known_stores, ',');
}
} else {
glance_api_config {
'DEFAULT/known_stores': ensure => absent;
'glance_store/stores': ensure => absent;
}
}

Expand Down
2 changes: 1 addition & 1 deletion glance/manifests/backend/cinder.pp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -71,7 +71,7 @@
'DEFAULT/cinder_api_insecure': value => $cinder_api_insecure;
'DEFAULT/cinder_catalog_info': value => $cinder_catalog_info;
'DEFAULT/cinder_http_retries': value => $cinder_http_retries;
'DEFAULT/default_store': value => 'cinder';
'glance_store/default_store': value => 'cinder';
}

glance_cache_config {
Expand Down
6 changes: 3 additions & 3 deletions glance/manifests/backend/file.pp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,11 +9,11 @@
) inherits glance::api {

glance_api_config {
'DEFAULT/default_store': value => 'file';
'DEFAULT/filesystem_store_datadir': value => $filesystem_store_datadir;
'glance_store/default_store': value => 'file';
'glance_store/filesystem_store_datadir': value => $filesystem_store_datadir;
}

glance_cache_config {
'DEFAULT/filesystem_store_datadir': value => $filesystem_store_datadir;
'glance_store/filesystem_store_datadir': value => $filesystem_store_datadir;
}
}
2 changes: 1 addition & 1 deletion glance/manifests/backend/rbd.pp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,11 +34,11 @@
}

glance_api_config {
'DEFAULT/default_store': value => 'rbd';
'DEFAULT/rbd_store_ceph_conf': value => $rbd_store_ceph_conf;
'DEFAULT/rbd_store_user': value => $rbd_store_user;
'DEFAULT/rbd_store_pool': value => $rbd_store_pool;
'DEFAULT/rbd_store_chunk_size': value => $rbd_store_chunk_size;
'glance_store/default_store': value => 'rbd';
}

package { 'python-ceph':
Expand Down
22 changes: 11 additions & 11 deletions glance/manifests/backend/swift.pp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,24 +26,24 @@
) {

glance_api_config {
'DEFAULT/default_store': value => 'swift';
'DEFAULT/swift_store_user': value => $swift_store_user;
'DEFAULT/swift_store_key': value => $swift_store_key;
'DEFAULT/swift_store_auth_address': value => $swift_store_auth_address;
'DEFAULT/swift_store_container': value => $swift_store_container;
'DEFAULT/swift_store_auth_version': value => $swift_store_auth_version;
'glance_store/default_store': value => 'swift';
'glance_store/swift_store_user': value => $swift_store_user;
'glance_store/swift_store_key': value => $swift_store_key;
'glance_store/swift_store_auth_address': value => $swift_store_auth_address;
'DEFAULT/swift_store_container': value => $swift_store_container;
'DEFAULT/swift_store_auth_version': value => $swift_store_auth_version;
'DEFAULT/swift_store_create_container_on_put':
value => $swift_store_create_container_on_put;
'DEFAULT/swift_store_large_object_size':
value => $swift_store_large_object_size;
}

glance_cache_config {
'DEFAULT/swift_store_user': value => $swift_store_user;
'DEFAULT/swift_store_key': value => $swift_store_key;
'DEFAULT/swift_store_auth_address': value => $swift_store_auth_address;
'DEFAULT/swift_store_container': value => $swift_store_container;
'DEFAULT/swift_store_auth_version': value => $swift_store_auth_version;
'glance_store/swift_store_user': value => $swift_store_user;
'glance_store/swift_store_key': value => $swift_store_key;
'glance_store/swift_store_auth_address': value => $swift_store_auth_address;
'DEFAULT/swift_store_container': value => $swift_store_container;
'DEFAULT/swift_store_auth_version': value => $swift_store_auth_version;
'DEFAULT/swift_store_create_container_on_put':
value => $swift_store_create_container_on_put;
'DEFAULT/swift_store_large_object_size':
Expand Down
4 changes: 2 additions & 2 deletions glance/spec/classes/glance_api_spec.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -324,7 +324,7 @@
default_params
end

it { should_not contain_glance_api_config('DEFAULT/known_stores').with_value('false') }
it { should_not contain_glance_api_config('glance_store/stores').with_value('false') }
end

describe 'with known_stores override' do
Expand All @@ -334,7 +334,7 @@
})
end

it { should contain_glance_api_config('DEFAULT/known_stores').with_value("glance.store.filesystem.Store,glance.store.http.Store") }
it { should contain_glance_api_config('glance_store/stores').with_value("glance.store.filesystem.Store,glance.store.http.Store") }
end

describe 'with deprecated sql parameters' do
Expand Down
4 changes: 2 additions & 2 deletions glance/spec/classes/glance_backend_cinder_spec.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@
context 'when default parameters' do

it 'configures glance-api.conf' do
should contain_glance_api_config('DEFAULT/default_store').with_value('cinder')
should contain_glance_api_config('glance_store/default_store').with_value('cinder')
should contain_glance_api_config('DEFAULT/cinder_api_insecure').with_value(false)
should contain_glance_api_config('DEFAULT/cinder_catalog_info').with_value('volume:cinder:publicURL')
should contain_glance_api_config('DEFAULT/cinder_http_retries').with_value('3')
Expand All @@ -58,7 +58,7 @@
}
end
it 'configures glance-api.conf' do
should contain_glance_api_config('DEFAULT/default_store').with_value('cinder')
should contain_glance_api_config('glance_store/default_store').with_value('cinder')
should contain_glance_api_config('DEFAULT/cinder_api_insecure').with_value(true)
should contain_glance_api_config('DEFAULT/cinder_ca_certificates_file').with_value('/etc/ssh/ca.crt')
should contain_glance_api_config('DEFAULT/cinder_catalog_info').with_value('volume:cinder:internalURL')
Expand Down
10 changes: 5 additions & 5 deletions glance/spec/classes/glance_backend_file_spec.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,12 +10,12 @@
end

it 'configures glance-api.conf' do
should contain_glance_api_config('DEFAULT/default_store').with_value('file')
should contain_glance_api_config('DEFAULT/filesystem_store_datadir').with_value('/var/lib/glance/images/')
should contain_glance_api_config('glance_store/default_store').with_value('file')
should contain_glance_api_config('glance_store/filesystem_store_datadir').with_value('/var/lib/glance/images/')
end

it 'configures glance-cache.conf' do
should contain_glance_cache_config('DEFAULT/filesystem_store_datadir').with_value('/var/lib/glance/images/')
should contain_glance_cache_config('glance_store/filesystem_store_datadir').with_value('/var/lib/glance/images/')
end

describe 'when overriding datadir' do
Expand All @@ -24,11 +24,11 @@
end

it 'configures glance-api.conf' do
should contain_glance_api_config('DEFAULT/filesystem_store_datadir').with_value('/tmp/')
should contain_glance_api_config('glance_store/filesystem_store_datadir').with_value('/tmp/')
end

it 'configures glance-cache.conf' do
should contain_glance_cache_config('DEFAULT/filesystem_store_datadir').with_value('/tmp/')
should contain_glance_cache_config('glance_store/filesystem_store_datadir').with_value('/tmp/')
end
end
end
2 changes: 1 addition & 1 deletion glance/spec/classes/glance_backend_rbd_spec.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
}
end

it { should contain_glance_api_config('DEFAULT/default_store').with_value('rbd') }
it { should contain_glance_api_config('glance_store/default_store').with_value('rbd') }
it { should contain_glance_api_config('DEFAULT/rbd_store_pool').with_value('images') }
it { should contain_glance_api_config('DEFAULT/rbd_store_ceph_conf').with_value('/etc/ceph/ceph.conf') }
it { should contain_glance_api_config('DEFAULT/rbd_store_chunk_size').with_value('8') }
Expand Down
18 changes: 9 additions & 9 deletions glance/spec/classes/glance_backend_swift_spec.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,22 +21,22 @@
describe 'when default parameters' do

it 'configures glance-api.conf' do
should contain_glance_api_config('DEFAULT/default_store').with_value('swift')
should contain_glance_api_config('DEFAULT/swift_store_key').with_value('key')
should contain_glance_api_config('DEFAULT/swift_store_user').with_value('user')
should contain_glance_api_config('glance_store/default_store').with_value('swift')
should contain_glance_api_config('glance_store/swift_store_key').with_value('key')
should contain_glance_api_config('glance_store/swift_store_user').with_value('user')
should contain_glance_api_config('DEFAULT/swift_store_auth_version').with_value('2')
should contain_glance_api_config('DEFAULT/swift_store_large_object_size').with_value('5120')
should contain_glance_api_config('DEFAULT/swift_store_auth_address').with_value('127.0.0.1:5000/v2.0/')
should contain_glance_api_config('glance_store/swift_store_auth_address').with_value('127.0.0.1:5000/v2.0/')
should contain_glance_api_config('DEFAULT/swift_store_container').with_value('glance')
should contain_glance_api_config('DEFAULT/swift_store_create_container_on_put').with_value(false)
end

it 'configures glance-cache.conf' do
should contain_glance_cache_config('DEFAULT/swift_store_key').with_value('key')
should contain_glance_cache_config('DEFAULT/swift_store_user').with_value('user')
should contain_glance_cache_config('glance_store/swift_store_key').with_value('key')
should contain_glance_cache_config('glance_store/swift_store_user').with_value('user')
should contain_glance_cache_config('DEFAULT/swift_store_auth_version').with_value('2')
should contain_glance_cache_config('DEFAULT/swift_store_large_object_size').with_value('5120')
should contain_glance_cache_config('DEFAULT/swift_store_auth_address').with_value('127.0.0.1:5000/v2.0/')
should contain_glance_cache_config('glance_store/swift_store_auth_address').with_value('127.0.0.1:5000/v2.0/')
should contain_glance_cache_config('DEFAULT/swift_store_container').with_value('glance')
should contain_glance_cache_config('DEFAULT/swift_store_create_container_on_put').with_value(false)
end
Expand All @@ -60,15 +60,15 @@
should contain_glance_api_config('DEFAULT/swift_store_create_container_on_put').with_value(true)
should contain_glance_api_config('DEFAULT/swift_store_auth_version').with_value('1')
should contain_glance_api_config('DEFAULT/swift_store_large_object_size').with_value('100')
should contain_glance_api_config('DEFAULT/swift_store_auth_address').with_value('127.0.0.2:8080/v1.0/')
should contain_glance_api_config('glance_store/swift_store_auth_address').with_value('127.0.0.2:8080/v1.0/')
end

it 'configures glance-cache.conf' do
should contain_glance_cache_config('DEFAULT/swift_store_container').with_value('swift')
should contain_glance_cache_config('DEFAULT/swift_store_create_container_on_put').with_value(true)
should contain_glance_cache_config('DEFAULT/swift_store_auth_version').with_value('1')
should contain_glance_cache_config('DEFAULT/swift_store_large_object_size').with_value('100')
should contain_glance_cache_config('DEFAULT/swift_store_auth_address').with_value('127.0.0.2:8080/v1.0/')
should contain_glance_cache_config('glance_store/swift_store_auth_address').with_value('127.0.0.2:8080/v1.0/')
end
end
end
69 changes: 0 additions & 69 deletions heat/manifests/api-cfn.pp
View file
Open in desktop

This file was deleted.

69 changes: 0 additions & 69 deletions heat/manifests/api-cloudwatch.pp
View file
Open in desktop

This file was deleted.

Loading