diff --git a/README.md b/README.md index fa56ce5..72c0803 100644 --- a/README.md +++ b/README.md @@ -77,7 +77,8 @@ A report from the cache is found at http://localhost:3142/acng-report.html # Running hLinux as the base OS hLinux can be installed and run as the base OS for all the vms defined in mini-mon. To this comment/uncomment the appropriate lines in the Vagrantfile. -There are a couple of minor problem which would slow down development and are why at this point hLinux has not been turned on by default: +Also switch to the proper base apt repos in recipes/default.rb. There are a couple of minor problem which would slow down development and are why at +this point hLinux has not been turned on by default: - The vboxsf filesystem driver is not working correctly in hLinux, this prevents home directory syncing. - Slow network performance of the hLinux vbox image makes some tasks annoying. diff --git a/recipes/default.rb b/recipes/default.rb index 1380943..fe03cb8 100644 --- a/recipes/default.rb +++ b/recipes/default.rb @@ -9,14 +9,32 @@ bash 'move dist sources.list' do not_if do ::File.exists?('/etc/apt/sources.list-dist') end end -apt_repository 'hlinux' do - uri 'http://hlinux-hrepo.usa.hp.com/hLinux' +# HP Public Cloud apt mirror +apt_repository 'foundation' do + uri 'http://packages.dev.uswest.hpcloud.net/cloud/foundation' arch 'amd64' - distribution 'testing' - components ['main', 'contrib', 'non-free'] - key 'http://hlinux-hrepo.usa.hp.com/hLinux/dists/testing/Release.gpg' + 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 @@ -44,4 +62,3 @@ apt_repository 'dev' do components ['release'] key 'http://packages.dev.uswest.hpcloud.net/cloud/som/developer/hpcs.gpg' end -