From 5c3e685c9cc5395da615d44f1f2b453e2612a8bb Mon Sep 17 00:00:00 2001
From: Alex Schultz <aschultz@mirantis.com>
Date: Tue, 28 Jul 2015 11:14:17 -0500
Subject: [PATCH] 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
---
 debian/control                                  |  2 +-
 .../osnailyfacter/modular/database/database.pp  | 17 ++++++-----------
 .../openstack-controller.pp                     |  2 --
 specs/fuel-library8.0.spec                      |  1 +
 tests/noop/spec/hosts/database/database_spec.rb |  1 -
 5 files changed, 8 insertions(+), 15 deletions(-)

diff --git a/debian/control b/debian/control
index d9ea0fab76..5f48c3b9dc 100644
--- a/debian/control
+++ b/debian/control
@@ -13,7 +13,7 @@ Description: Fuel Library HA utils
 
 Package: fuel-misc
 Architecture: all
-Depends: ${misc:Depends}, ${shlibs:Depends}
+Depends: ${misc:Depends}, ${shlibs:Depends}, socat
 Description: Misc Fuel library scripts
  .
 
diff --git a/deployment/puppet/osnailyfacter/modular/database/database.pp b/deployment/puppet/osnailyfacter/modular/database/database.pp
index 7d26bee395..02a1e6c80b 100644
--- a/deployment/puppet/osnailyfacter/modular/database/database.pp
+++ b/deployment/puppet/osnailyfacter/modular/database/database.pp
@@ -53,10 +53,6 @@ if $enabled {
     $config_hash_real = { }
   }
 
-  package { 'socat':
-    ensure => 'present',
-  }
-
   class { 'mysql::server':
     bind_address            => '0.0.0.0',
     etc_root_password       => true,
@@ -118,12 +114,11 @@ if $enabled {
     db_password => $mysql_database_password,
   }
 
-  Package['socat'] ->
-    Class['mysql::server'] ->
-      Class['osnailyfacter::mysql_user'] ->
-        Exec['initial_access_config'] ->
-          Class['openstack::galera::status'] ->
-            Haproxy_backend_status['mysql'] ->
-              Class['osnailyfacter::mysql_access']
+  Class['mysql::server'] ->
+    Class['osnailyfacter::mysql_user'] ->
+      Exec['initial_access_config'] ->
+        Class['openstack::galera::status'] ->
+          Haproxy_backend_status['mysql'] ->
+            Class['osnailyfacter::mysql_access']
 
 }
diff --git a/deployment/puppet/osnailyfacter/modular/openstack-controller/openstack-controller.pp b/deployment/puppet/osnailyfacter/modular/openstack-controller/openstack-controller.pp
index 5960f089af..59b4f0ad42 100644
--- a/deployment/puppet/osnailyfacter/modular/openstack-controller/openstack-controller.pp
+++ b/deployment/puppet/osnailyfacter/modular/openstack-controller/openstack-controller.pp
@@ -139,8 +139,6 @@ class { '::openstack::controller':
   idle_timeout                   => $idle_timeout,
 }
 
-package { 'socat': ensure => present }
-
 #TODO: PUT this configuration stanza into nova class
 nova_config { 'DEFAULT/use_cow_images':                   value => hiera('use_cow_images')}
 
diff --git a/specs/fuel-library8.0.spec b/specs/fuel-library8.0.spec
index fb1fbfb6c6..508e2ccae8 100644
--- a/specs/fuel-library8.0.spec
+++ b/specs/fuel-library8.0.spec
@@ -155,6 +155,7 @@ License: Apache 2.0
 URL: http://github.com/stackforge/fuel-library
 BuildArch: noarch
 BuildRoot: %{_tmppath}/fuel-library-%{version}-%{release}
+Requires: socat
 
 %description -n fuel-misc
 A set of scripts for Fuel deployment utility
diff --git a/tests/noop/spec/hosts/database/database_spec.rb b/tests/noop/spec/hosts/database/database_spec.rb
index 088f7821e5..19f1ee532b 100644
--- a/tests/noop/spec/hosts/database/database_spec.rb
+++ b/tests/noop/spec/hosts/database/database_spec.rb
@@ -40,7 +40,6 @@ describe manifest do
     it { should contain_class('osnailyfacter::mysql_access') }
     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_package('socat').that_comes_before('Class[mysql::server]') }
 
   end
   test_ubuntu_and_centos manifest