[pve-devel] pveceph with custom keyurl and source

[Frank Brendel]

Hi list,

I would like to install ceph with the pveceph install command using a 
local ceph repository.
Unfortunately the key url and the ceph repository are hard coded.

I've written a little patch to provide the additional options keyurl and 
source.
I'm not a Debian expert so I'm unsure if the '--force-yes' option (see 
below) is really needed but without it doesn't work.

Is it possible to integrate this into a future release?


Kind regards
Frank

pveversion --verbose
proxmox-ve-2.6.32: 3.2-136 (running kernel: 2.6.32-32-pve)
pve-manager: 3.3-1 (running version: 3.3-1/a06c9f73)
pve-kernel-2.6.32-32-pve: 2.6.32-136
lvm2: 2.02.98-pve4
clvm: 2.02.98-pve4
corosync-pve: 1.4.7-1
openais-pve: 1.1.4-3
libqb0: 0.11.1-2
redhat-cluster-pve: 3.2.0-2
resource-agents-pve: 3.9.2-4
fence-agents-pve: 4.0.10-1
pve-cluster: 3.0-15
qemu-server: 3.1-34
pve-firmware: 1.1-3
libpve-common-perl: 3.0-19
libpve-access-control: 3.0-15
libpve-storage-perl: 3.0-23
pve-libspice-server1: 0.12.4-3
vncterm: 1.1-8
vzctl: 4.0-1pve6
vzprocps: 2.0.11-2
vzquota: 3.1-2
pve-qemu-kvm: 2.1-9
ksm-control-daemon: 1.1-1
glusterfs-client: 3.5.2-1

diff pveceph.old/pveceph pveceph.new/pveceph
90a91,98
 >           },
 >           keyurl => {
 >              type => 'string',
 >              optional => 1
 >           },
 >           source => {
 >              type => 'string',
 >              optional => 1
102c110
<       my $keyurl = 
"https://ceph.com/git/?p=ceph.git;a=blob_plain;f=keys/release.asc";
---
 >       my $keyurl = $param->{keyurl} || 
"https://ceph.com/git/?p=ceph.git;a=blob_plain;f=keys/release.asc";
108,110c116,123
<
<       my $source = "deb http://ceph.com/debian-$cephver wheezy main\n";
<
---
 >       my $source = $param->{source} || "deb 
http://ceph.com/debian-$cephver wheezy main";
 >       $source .= "\n";
 >
 >       my $instcmd = "apt-get -q --assume-yes" .
 >                     (defined $param->{source} && $param->{source} ? " 
--force-yes" : "") .
 >                     " --no-install-recommends -o 
Dpkg::Options::=--force-confnew" .
 >                     " install -- ceph ceph-common gdisk";
 >
116,120c129,130
<       run_command(['apt-get', '-q', '--assume-yes', 
'--no-install-recommends',
<                    '-o', 'Dpkg::Options::=--force-confnew',
<                    'install', '--',
<                    'ceph', 'ceph-common', 'gdisk']);
<
---
 >       run_command([split('\s', $instcmd)]);
 >