Release 1.6.3

Merge branch 'develop' into master

.github/FUNDING.yml

@@ -0,0 +1,3 @@
+ko_fi: sleepingkyoto
+custom:
+  - "https://monappy.jp/u/lae"

README.md

@@ -435,6 +435,22 @@ pve_datacenter_cfg:
   keyboard: en-us
 ```
 
+You can also configure [HA manager groups][ha-group]:
+```
+pve_cluster_ha_groups: [] # List of HA groups to create in PVE.
+```
+
+This example creates a group "lab_node01" for resources assigned to the
+lab-node01 host:
+```
+pve_cluster_ha_groups:
+  - name: lab_node01
+    comment: "My HA group"
+    nodes: "lab-node01"
+    nofailback: 0
+    restricted: 0
+```
+
 All configuration options supported in the datacenter.cfg file are documented in the
 [Proxmox manual datacenter.cfg section][datacenter-cfg].
 
@@ -564,7 +580,8 @@ successfully used this role to deploy PVE Ceph, it is not fully tested in CI
 deploy a test environment with your configuration first prior to prod, and
 report any issues if you run into any.
 
-This role can configure the Ceph storage system on your Proxmox hosts.
+This role can configure the Ceph storage system on your Proxmox hosts. The
+following definitions show some of the configurations that are possible.
 
 ```
 pve_ceph_enabled: true
@@ -590,13 +607,16 @@ pve_ceph_pools:
     rule: ssd
     application: rbd
     storage: true
+# This Ceph pool uses custom size/replication values
   - name: hdd
     pgs: 32
     rule: hdd
     application: rbd
     storage: true
-# A CephFS filesystem not defined as a Proxmox storage
+    size: 2
+    min-size: 1
 pve_ceph_fs:
+# A CephFS filesystem not defined as a Proxmox storage
   - name: backup
     pgs: 64
     rule: hdd
@@ -628,3 +648,5 @@ Michael Holasek ([@mholasek](https://github.com/mholasek))
 [acl-module]: https://github.com/lae/ansible-role-proxmox/blob/master/library/proxmox_group.py
 [storage-module]: https://github.com/lae/ansible-role-proxmox/blob/master/library/proxmox_storage.py
 [datacenter-cfg]: https://pve.proxmox.com/wiki/Manual:_datacenter.cfg
+[ceph_volume]: https://github.com/ceph/ceph-ansible/blob/master/library/ceph_volume.py
+[ha-group]: https://pve.proxmox.com/wiki/High_Availability#ha_manager_groups

Vagrantfile

@@ -4,6 +4,7 @@ Vagrant.configure("2") do |config|
   config.vm.provider :libvirt do |libvirt|
     libvirt.memory = 2048
     libvirt.cpus = 2
+    libvirt.storage :file, :size => '2G'
   end
 
   N = 3
@@ -12,6 +13,11 @@ Vagrant.configure("2") do |config|
       machine.vm.hostname = "pve-#{machine_id}"
 
       if machine_id == N
+        machine.vm.provision :ansible do |ansible|
+          ansible.limit = "all,localhost"
+          ansible.playbook = "tests/vagrant/package_role.yml"
+          ansible.verbose = true
+        end
         machine.vm.provision :ansible do |ansible|
           ansible.limit = "all"
           ansible.playbook = "tests/vagrant/provision.yml"

defaults/main.yml

@@ -32,6 +32,7 @@ pve_cluster_clustername: "{{ pve_group }}"
 # pve_cluster_addr0: "{{ ansible_default_ipv4.address }}"
 # pve_cluster_addr1: "{{ ansible_eth1.ipv4.address }}
 pve_datacenter_cfg: {}
+pve_cluster_ha_groups: []
 pve_ssl_letsencrypt: false
 pve_groups: []
 pve_users: []

files/00_remove_checked_command_buster.patch

@@ -0,0 +1,41 @@
+diff -ur /usr/share/javascript/proxmox-widget-toolkit/proxmoxlib.js /usr/share/javascript/proxmox-widget-toolkit/proxmoxlib.js
+--- /usr/share/javascript/proxmox-widget-toolkit/proxmoxlib.js	2019-12-17 11:02:52.000000000 +0000
++++ /usr/share/javascript/proxmox-widget-toolkit/proxmoxlib.js	2020-01-18 16:29:37.362953621 +0000
+@@ -6016,7 +6016,7 @@
+ 	var update_btn = new Ext.Button({
+ 	    text: gettext('Refresh'),
+ 	    handler: function() {
+-		Proxmox.Utils.checked_command(function() { apt_command('update'); });
++		apt_command('update');
+ 	    }
+ 	});
+
+diff -ur /usr/share/pve-manager/js/pvemanagerlib.js /usr/share/pve-manager/js/pvemanagerlib.js
+--- /usr/share/pve-manager/js/pvemanagerlib.js	2019-12-16 14:12:19.000000000 +0000
++++ /usr/share/pve-manager/js/pvemanagerlib.js	2020-01-18 16:26:07.187536513 +0000
+@@ -19024,7 +19024,7 @@
+ 	var version_btn = new Ext.Button({
+ 	    text: gettext('Package versions'),
+ 	    handler: function(){
+-		Proxmox.Utils.checked_command(function() { me.showVersions(); });
++		me.showVersions();
+ 	    }
+ 	});
+
+@@ -19288,7 +19288,7 @@
+ 		{
+ 		    text: gettext('System Report'),
+ 		    handler: function() {
+-			Proxmox.Utils.checked_command(function (){ me.showReport(); });
++			me.showReport();
+ 		    }
+ 		}
+ 	    ],
+@@ -40472,7 +40472,6 @@
+ 		handler: function(data) {
+ 		    me.login = null;
+ 		    me.updateLoginData(data);
+-		    Proxmox.Utils.checked_command(function() {}); // display subscription status
+ 		}
+ 	    });
+ 	}