openstack/tripleo-docs
Code Issues Proposed changes

Cleanup remaining pointers to storage-environment.yaml

Browse Source 
We used to have references to the storage-environment.yaml Heat
environment file when documenting the deployment of Ceph.

From the newton release instead we suggest use of puppet-ceph.yaml
and, from the pike release, ceph-ansible.yaml. These enable
respectively enable use of puppet-ceph or ceph-ansible for the
deployment of Ceph.

This submission removes the remaining references to the
storage-environment.yaml file, hopefully avoiding confusion in
the future by making the choice more explicit.

Change-Id: I4d936ac3988d6fc7d3bb0b18535045137a0d11f7
This commit is contained in:
Giulio Fidente 2017-10-17 15:30:48 +02:00
parent 65651865f3
commit 2ceeb2a61c
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
doc/source/install/advanced_deployment/deploy_manila.rst
View File

@ -11,8 +11,8 @@ Ceph, Ceph MDS and Manila Ceph environment files are included when deploying the
Overcloud:: Overcloud::
openstack overcloud deploy --templates \ openstack overcloud deploy --templates \
-e /usr/share/openstack-tripleo-heat-templates/environments/storage-environment.yaml \ -e /usr/share/openstack-tripleo-heat-templates/environments/ceph-ansible/ceph-ansible.yaml \
-e /usr/share/openstack-tripleo-heat-templates/environments/services/ceph-mds.yaml \ -e /usr/share/openstack-tripleo-heat-templates/environments/ceph-ansible/ceph-mds.yaml \
-e /usr/share/openstack-tripleo-heat-templates/environments/manila-cephfsnative-config.yaml -e /usr/share/openstack-tripleo-heat-templates/environments/manila-cephfsnative-config.yaml
.. note:: .. note::

4
doc/source/install/basic_deployment/basic_deployment_cli.rst
View File

@ -424,13 +424,13 @@ configured for the virtual environment. To customize this, see the output of::
of Ceph for Glance, Cinder, Nova or all of them. To do so, use the of Ceph for Glance, Cinder, Nova or all of them. To do so, use the
following arguments when deploying:: following arguments when deploying::
--ceph-storage-scale <number of nodes> -e /usr/share/openstack-tripleo-heat-templates/environments/storage-environment.yaml --ceph-storage-scale <number of nodes> -e /usr/share/openstack-tripleo-heat-templates/environments/ceph-ansible/ceph-ansible.yaml
When deploying Ceph without dedicated CephStorage nodes, opting for an HCI When deploying Ceph without dedicated CephStorage nodes, opting for an HCI
architecture instead, where the CephOSD service is colocated with the architecture instead, where the CephOSD service is colocated with the
NovaCompute service on the Compute nodes, use the following arguments:: NovaCompute service on the Compute nodes, use the following arguments::
-e /usr/share/openstack-tripleo-heat-templates/environments/hyperconverged-ceph.yaml -e /usr/share/openstack-tripleo-heat-templates/environments/storage-environment.yaml -e /usr/share/openstack-tripleo-heat-templates/environments/hyperconverged-ceph.yaml -e /usr/share/openstack-tripleo-heat-templates/environments/ceph-ansible/ceph-ansible.yaml
The `hyperconverged-ceph.yaml` environment file will also enable a port on the The `hyperconverged-ceph.yaml` environment file will also enable a port on the
`StorageMgmt` network for the Compute nodes. This will be the Ceph private `StorageMgmt` network for the Compute nodes. This will be the Ceph private