diff --git a/cookbooks/nova/attributes/dashboard.rb b/cookbooks/nova/attributes/dashboard.rb index bce288c..01b6dad 100644 --- a/cookbooks/nova/attributes/dashboard.rb +++ b/cookbooks/nova/attributes/dashboard.rb @@ -3,8 +3,8 @@ default[:nova][:dashboard][:admin_password] = "sha1$4361c$4d5e785f6e18734ae843c10dcb30104bafacf21d" # "vagrant" default[:nova][:dashboard][:deploy_dir] = "/srv/dashboard" default[:nova][:dashboard][:dashboard_dir] = File.join(node[:nova][:dashboard][:deploy_dir], "openstack-dashboard") -default[:nova][:dashboard][:dashboard_branch] = "lp:openstack-dashboard" -default[:nova][:dashboard][:django_nova_dir] = File.join(node[:nova][:dashboard][:deploy_dir], "django-nova") +default[:nova][:dashboard][:dashboard_branch] = "https://github.com/piston/openstack-dashboard.git" +default[:nova][:dashboard][:django_nova_dir] = File.join(node[:nova][:dashboard][:deploy_dir], "django-openstack") default[:nova][:dashboard][:django_nova_branch] = "lp:django-nova" default[:nova][:dashboard][:apache_dir] = "/etc/apache2" default[:nova][:dashboard][:database_name] = "dashboard.db" diff --git a/cookbooks/nova/recipes/dashboard.rb b/cookbooks/nova/recipes/dashboard.rb index 541166e..c7fa1fc 100644 --- a/cookbooks/nova/recipes/dashboard.rb +++ b/cookbooks/nova/recipes/dashboard.rb @@ -1,10 +1,11 @@ package "python-pip" package "python-virtualenv" package "bzr" +package "git" package "apache2" package "libapache2-mod-wsgi" -execute "bzr branch #{node[:nova][:dashboard][:dashboard_branch]} #{node[:nova][:dashboard][:deploy_dir]}" +execute "git clone #{node[:nova][:dashboard][:dashboard_branch]} #{node[:nova][:dashboard][:deploy_dir]}" file "/usr/lib/python2.6/dist-packages/dashboard.pth" do content node[:nova][:dashboard][:dashboard_dir]