Merge "Install containerd.io along with docker-ce package" 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/defaults/docker_images.yml b/defaults/docker_images.yml
index 35c44a9..6adab6b 100644
--- a/defaults/docker_images.yml
+++ b/defaults/docker_images.yml
@@ -29,7 +29,7 @@
docker_image_grafana: "${_param:mcp_docker_registry}/openstack-docker/grafana:${_param:mcp_version}"
docker_image_prometheus_es_exporter: "${_param:mcp_docker_registry}/mirantis/external/braedon/prometheus-es-exporter:0.5.1"
docker_image_prometheus: "${_param:mcp_docker_registry}/openstack-docker/prometheus:${_param:mcp_version}"
- docker_image_prometheus_gainsight: "${_param:mcp_docker_registry}/openstack-docker/gainsight:${_param:mcp_version}"
+ docker_image_prometheus_gainsight: "${_param:mcp_docker_registry}/openstack-docker/gainsight:2019.2.3"
docker_image_prometheus_gainsight_elasticsearch: "${_param:mcp_docker_registry}/openstack-docker/gainsight_elasticsearch:${_param:mcp_version}"
docker_image_prometheus_relay: "${_param:mcp_docker_registry}/openstack-docker/prometheus_relay:${_param:mcp_version}"
docker_image_pushgateway: "${_param:mcp_docker_registry}/openstack-docker/pushgateway:${_param:mcp_version}"