From 0e373adad768fe59ef1bcbaf5312b31e8e8133a2 Mon Sep 17 00:00:00 2001 From: Dan Bode Date: Fri, 4 Oct 2013 15:20:16 -0700 Subject: [PATCH] Revert "Use cisco rabbitmq and mysql modules" This reverts commit 26702fcc56515c90768421703395394a00a6379f. --- Puppetfile | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/Puppetfile b/Puppetfile index 3d55e17..4a82a37 100644 --- a/Puppetfile +++ b/Puppetfile @@ -116,6 +116,8 @@ mod 'CiscoSystems/stdlib', :git => "#{base_url}/#{puppetlabs_module_prefix}stdli mod 'CiscoSystems/xinetd', :git => "#{base_url}/#{puppetlabs_module_prefix}xinetd", :ref => branch_name mod 'CiscoSystems/ntp', :git => "#{base_url}/#{puppetlabs_module_prefix}ntp", :ref => branch_name mod 'CiscoSystems/rsync', :git => "#{base_url}/#{puppetlabs_module_prefix}rsync", :ref => branch_name +mod 'CiscoSystems/mysql', :git => "#{base_url}/#{puppetlabs_module_prefix}mysql", :ref => mysql_branch +mod 'CiscoSystems/rabbitmq', :git => "#{base_url}/#{puppetlabs_module_prefix}rabbitmq", :ref => rabbitmq_branch ##### modules with other upstreams ##### @@ -154,10 +156,6 @@ mod 'CiscoSystems/pip', :git => "#{base_url}/CiscoSystems/puppet-pip", :ref => ' mod 'CiscoSystems/dnsmasq', :git => "#{base_url}/CiscoSystems/puppet-dnsmasq", :ref => 'origin/grizzly' mod 'CiscoSystems/naginator', :git => "#{base_url}/CiscoSystems/puppet-naginator", :ref => 'origin/grizzly' -##### Modules that have been forked ##### -mod 'CiscoSystems/mysql', :git => "#{base_url}/CiscoSystems/puppet-mysql", :ref => 'origin/grizzly' -mod 'CiscoSystems/rabbitmq', :git => "#{base_url}/CiscoSystems/puppet-rabbitmq", :ref => 'origin/grizzly' - #### HA Modules ### mod 'CiscoSystems/augeas', :git => "#{base_url}/CiscoSystems/puppet-augeas", :ref => 'origin/grizzly' mod 'CiscoSystems/filemapper', :git => "#{base_url}/CiscoSystems/puppet-filemapper", :ref => 'origin/grizzly'