diff --git a/Berksfile b/Berksfile index 8039afe..f4b2bb3 100644 --- a/Berksfile +++ b/Berksfile @@ -5,15 +5,15 @@ if Gem::Specification::find_by_name('berkshelf').version.to_s[0] == '3' end metadata -cookbook 'mon_api', git: 'git@git.hpcloud.net:mon/cookbooks-mon_api' -cookbook 'kafka', git: 'git@git.hpcloud.net:mon/cookbooks-kafka' -cookbook 'mon_agent', git: 'git@git.hpcloud.net:mon/cookbooks-mon_agent' -cookbook 'mon_notification', git: 'git@git.hpcloud.net:mon/cookbooks-mon_notification' -cookbook 'mon_persister', git: 'git@git.hpcloud.net:mon/cookbooks-mon_persister' -cookbook 'mon_thresh', git: 'git@git.hpcloud.net:mon/cookbooks-mon_thresh' +cookbook 'mon_api', git: 'https://github.com/hpcloud-mon/cookbooks-mon_api' +cookbook 'kafka', git: 'https://github.com/hpcloud-mon/cookbooks-kafka' +cookbook 'mon_agent', git: 'https://github.com/hpcloud-mon/cookbooks-mon_agent' +cookbook 'mon_notification', git: 'https://github.com/hpcloud-mon/cookbooks-mon_notification' +cookbook 'mon_persister', git: 'https://github.com/hpcloud-mon/cookbooks-mon_persister.git' +cookbook 'mon_thresh', git: 'https://github.com/hpcloud-mon/cookbooks-mon_thresh' cookbook 'percona', git: 'https://github.com/tkuhlman/chef-percona', branch: "feature/mini-mon" -cookbook 'vertica', git: 'git@git.hpcloud.net:mon/cookbooks-vertica' -cookbook 'zookeeper', git: 'git@git.hpcloud.net:mon/cookbooks-zookeeper' +cookbook 'vertica', git: 'https://github.com/hpcloud-mon/cookbooks-vertica' +cookbook 'zookeeper', git: 'https://github.com/hpcloud-mon/cookbooks-zookeeper' # community cookbook we pin cookbook 'hostsfile', '= 1.0.1' diff --git a/metadata.rb b/metadata.rb index 156b117..b21dd44 100644 --- a/metadata.rb +++ b/metadata.rb @@ -4,5 +4,5 @@ maintainer_email "hpcs-mon@hp.com" license "All rights reserved" description "Base setup for all vagrant boxes" long_description IO.read(File.join(File.dirname(__FILE__), 'README.md')) -version "0.0.2" +version "0.0.3" depends "apt" diff --git a/recipes/default.rb b/recipes/default.rb index fe03cb8..993c938 100644 --- a/recipes/default.rb +++ b/recipes/default.rb @@ -1,40 +1,5 @@ # Common setup for all vagrant boxes -## Todo - This apt setup is specific to HP Cloud and should be moved to an optional recipe. - -# This move the default apt sources which are the standard ubuntu apt ones aside, so we are forced to deal with what hpcloud has mirrored -bash 'move dist sources.list' do - action :run - code 'mv /etc/apt/sources.list /etc/apt/sources.list-dist' - not_if do ::File.exists?('/etc/apt/sources.list-dist') end -end - -# HP Public Cloud apt mirror -apt_repository 'foundation' do - uri 'http://packages.dev.uswest.hpcloud.net/cloud/foundation' - arch 'amd64' - distribution node['lsb']['codename'] - components ['main', 'restricted', 'universe', 'multiverse'] - key 'http://packages.dev.uswest.hpcloud.net/cloud/som/developer/hpcs.gpg' -end - -apt_repository 'foundation-updates' do - uri 'http://packages.dev.uswest.hpcloud.net/cloud/foundation' - arch 'amd64' - distribution "#{node['lsb']['codename']}-updates/snapshots/rc20140129" - components ['main', 'restricted', 'universe', 'multiverse'] - key 'http://packages.dev.uswest.hpcloud.net/cloud/som/developer/hpcs.gpg' -end - -# hLinux apt repo -#apt_repository 'hlinux' do -# uri 'http://hlinux-hrepo.usa.hp.com/hLinux' -# arch 'amd64' -# distribution 'testing' -# components ['main', 'contrib', 'non-free'] -# key 'http://hlinux-hrepo.usa.hp.com/hLinux/dists/testing/Release.gpg' -#end - # Look for a local apt cache, the base repo must be there before the apt cache but it should ideally be before the others rb = ruby_block "Check for local apt cache" do action :nothing @@ -56,9 +21,8 @@ rb.run_action(:create) # Run during compile time so that apt::cacher-client has include_recipe('apt::cacher-client') apt_repository 'dev' do - uri 'http://packages.dev.uswest.hpcloud.net/cloud/som/developer' + uri 'https://region-a.geo-1.objects.hpcloudsvc.com/v1/46995959297574/mini-mon/public_repo' arch 'amd64' distribution 'precise' components ['release'] - key 'http://packages.dev.uswest.hpcloud.net/cloud/som/developer/hpcs.gpg' end diff --git a/roles/MySQL.json b/roles/MySQL.json index d7a251d..d37b0aa 100644 --- a/roles/MySQL.json +++ b/roles/MySQL.json @@ -19,8 +19,7 @@ }, "root_password": "password", "skip_name_resolve": true - }, - "use_percona_apt": false + } } }, "override_attributes": {