Moving socat to a fuel-misc dependency
fuel-misc provides haproxy-status which needs socat. Additionally we are currently requiring the socat package in several places in puppet to try and satisfy this dependancy. This will consolidate them into a single requirement where it is needed. Depends-On: I951b137627880b20ece3c64e6a0c8b6ab473daab Change-Id: If3069c8c7bc68337596195e27e2213a4c9ec3540 Closes-Bug: 1479033
This commit is contained in:
parent
2a01b28fd0
commit
5c3e685c9c
|
@ -13,7 +13,7 @@ Description: Fuel Library HA utils
|
||||||
|
|
||||||
Package: fuel-misc
|
Package: fuel-misc
|
||||||
Architecture: all
|
Architecture: all
|
||||||
Depends: ${misc:Depends}, ${shlibs:Depends}
|
Depends: ${misc:Depends}, ${shlibs:Depends}, socat
|
||||||
Description: Misc Fuel library scripts
|
Description: Misc Fuel library scripts
|
||||||
.
|
.
|
||||||
|
|
||||||
|
|
|
@ -53,10 +53,6 @@ if $enabled {
|
||||||
$config_hash_real = { }
|
$config_hash_real = { }
|
||||||
}
|
}
|
||||||
|
|
||||||
package { 'socat':
|
|
||||||
ensure => 'present',
|
|
||||||
}
|
|
||||||
|
|
||||||
class { 'mysql::server':
|
class { 'mysql::server':
|
||||||
bind_address => '0.0.0.0',
|
bind_address => '0.0.0.0',
|
||||||
etc_root_password => true,
|
etc_root_password => true,
|
||||||
|
@ -118,7 +114,6 @@ if $enabled {
|
||||||
db_password => $mysql_database_password,
|
db_password => $mysql_database_password,
|
||||||
}
|
}
|
||||||
|
|
||||||
Package['socat'] ->
|
|
||||||
Class['mysql::server'] ->
|
Class['mysql::server'] ->
|
||||||
Class['osnailyfacter::mysql_user'] ->
|
Class['osnailyfacter::mysql_user'] ->
|
||||||
Exec['initial_access_config'] ->
|
Exec['initial_access_config'] ->
|
||||||
|
|
|
@ -139,8 +139,6 @@ class { '::openstack::controller':
|
||||||
idle_timeout => $idle_timeout,
|
idle_timeout => $idle_timeout,
|
||||||
}
|
}
|
||||||
|
|
||||||
package { 'socat': ensure => present }
|
|
||||||
|
|
||||||
#TODO: PUT this configuration stanza into nova class
|
#TODO: PUT this configuration stanza into nova class
|
||||||
nova_config { 'DEFAULT/use_cow_images': value => hiera('use_cow_images')}
|
nova_config { 'DEFAULT/use_cow_images': value => hiera('use_cow_images')}
|
||||||
|
|
||||||
|
|
|
@ -155,6 +155,7 @@ License: Apache 2.0
|
||||||
URL: http://github.com/stackforge/fuel-library
|
URL: http://github.com/stackforge/fuel-library
|
||||||
BuildArch: noarch
|
BuildArch: noarch
|
||||||
BuildRoot: %{_tmppath}/fuel-library-%{version}-%{release}
|
BuildRoot: %{_tmppath}/fuel-library-%{version}-%{release}
|
||||||
|
Requires: socat
|
||||||
|
|
||||||
%description -n fuel-misc
|
%description -n fuel-misc
|
||||||
A set of scripts for Fuel deployment utility
|
A set of scripts for Fuel deployment utility
|
||||||
|
|
|
@ -40,7 +40,6 @@ describe manifest do
|
||||||
it { should contain_class('osnailyfacter::mysql_access') }
|
it { should contain_class('osnailyfacter::mysql_access') }
|
||||||
it { should contain_class('openstack::galera::status').that_comes_before('Haproxy_backend_status[mysql]') }
|
it { should contain_class('openstack::galera::status').that_comes_before('Haproxy_backend_status[mysql]') }
|
||||||
it { should contain_haproxy_backend_status('mysql').that_comes_before('Class[osnailyfacter::mysql_access]') }
|
it { should contain_haproxy_backend_status('mysql').that_comes_before('Class[osnailyfacter::mysql_access]') }
|
||||||
it { should contain_package('socat').that_comes_before('Class[mysql::server]') }
|
|
||||||
|
|
||||||
end
|
end
|
||||||
test_ubuntu_and_centos manifest
|
test_ubuntu_and_centos manifest
|
||||||
|
|
Loading…
Reference in New Issue