Merge "Add hosts metadata for share, telemetry and barbican services" into release/2019.2.0
diff --git a/cinder/control/backup/ceph.yml b/cinder/control/backup/ceph.yml
new file mode 100644
index 0000000..5b9c5a7
--- /dev/null
+++ b/cinder/control/backup/ceph.yml
@@ -0,0 +1,10 @@
+parameters:
+ cinder:
+ controller:
+ backup:
+ engine: ceph
+ ceph_pool: ${_param:cinder_ceph_backup_pool}
+ ceph_stripe_count: ${_param:cinder_ceph_stripe_count}
+ ceph_stripe_unit: ${_param:cinder_ceph_stripe_unit}
+ ceph_user: ${_param:cinder_ceph_backup_user}
+ ceph_chunk_size: ${_param:cinder_ceph_chunk_size}
diff --git a/cinder/volume/backup/ceph.yml b/cinder/volume/backup/ceph.yml
new file mode 100644
index 0000000..5cc6e02
--- /dev/null
+++ b/cinder/volume/backup/ceph.yml
@@ -0,0 +1,10 @@
+parameters:
+ cinder:
+ volume:
+ backup:
+ engine: ceph
+ ceph_pool: ${_param:cinder_ceph_backup_pool}
+ ceph_stripe_count: ${_param:cinder_ceph_stripe_count}
+ ceph_stripe_unit: ${_param:cinder_ceph_stripe_unit}
+ ceph_user: ${_param:cinder_ceph_backup_user}
+ ceph_chunk_size: ${_param:cinder_ceph_chunk_size}
diff --git a/docker/host.yml b/docker/host.yml
index bb3dffa..a88ff2f 100644
--- a/docker/host.yml
+++ b/docker/host.yml
@@ -6,6 +6,7 @@
docker:
host:
pkgs:
+ - containerd.io
- docker-ce
- python-docker
experimental: true
diff --git a/jenkins/slave/docker.yml b/jenkins/slave/docker.yml
index 227dd51..169cb08 100644
--- a/jenkins/slave/docker.yml
+++ b/jenkins/slave/docker.yml
@@ -17,5 +17,7 @@
commands:
- /usr/bin/docker
package:
+ containerd.io:
+ version: latest
docker-ce:
version: latest