Merge "DockerCephDaemonImage is now optional for Ceph deployments"

This commit is contained in:
Zuul 2017-10-31 15:42:47 +00:00 committed by Gerrit Code Review
commit 2ac02e6fb6

View File

@ -32,11 +32,14 @@ like the following::
openstack overcloud deploy --templates -e /usr/share/openstack-tripleo-heat-templates/environments/ceph-ansible/ceph-ansible.yaml openstack overcloud deploy --templates -e /usr/share/openstack-tripleo-heat-templates/environments/ceph-ansible/ceph-ansible.yaml
When using ceph-ansible to deploy Ceph in containers, it is also When using ceph-ansible to deploy Ceph in containers, the process
necessary to set the URL for the docker image to use. For example:: described in the :ref:`prepare-environment-containers` documentation
will configure the deployment to use the appropriate Ceph docker
image. However, it is also possible to override the default docker
image. For example::
parameter_defaults: parameter_defaults:
DockerCephDaemonImage: ceph/daemon:tag-build-master-jewel-centos-7 DockerCephDaemonImage: ceph/daemon:tag-stable-3.0-jewel-centos-7
In both the puppet-ceph and ceph-ansible examples above, at least one In both the puppet-ceph and ceph-ansible examples above, at least one
Ceph storage node is required. The following example will configure Ceph storage node is required. The following example will configure