From 426702779777cbc7debd98cd1083aa057d0a5ea4 Mon Sep 17 00:00:00 2001 From: John Fulton Date: Thu, 26 Oct 2017 11:21:44 -0400 Subject: [PATCH] DockerCephDaemonImage is now optional for Ceph deployments Remove obsolete statement that it is necessary to set the URL for the docker image to use but include example to show how this parameter may be overridden. Link to prepare-environment-containers so reader may easily get more context on this parameter. Change-Id: I84334eb996d043fc6bfc95575d183d46a88b373a --- doc/source/install/advanced_deployment/ceph_config.rst | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/doc/source/install/advanced_deployment/ceph_config.rst b/doc/source/install/advanced_deployment/ceph_config.rst index dda9db4d..7de9f22d 100644 --- a/doc/source/install/advanced_deployment/ceph_config.rst +++ b/doc/source/install/advanced_deployment/ceph_config.rst @@ -32,11 +32,14 @@ like the following:: 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 -necessary to set the URL for the docker image to use. For example:: +When using ceph-ansible to deploy Ceph in containers, the process +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: - 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 Ceph storage node is required. The following example will configure