From d5773de2a87041d318d4a2b0496e004c79542333 Mon Sep 17 00:00:00 2001 From: Jean-Philippe Evrard Date: Tue, 28 Nov 2017 16:28:47 +0000 Subject: [PATCH] [Docs] Clarify ceph production example. There are details that confuse people (like the usage of may), when they are configuring a ceph environment. This should clarify the situation. Change-Id: Ic8b734eabcfa218c687db69290c8b3cef1def7c5 --- deploy-guide/source/app-config-prod-ceph.rst | 14 ++++++++------ .../user_variables.yml.prod-ceph.example | 5 ++--- 2 files changed, 10 insertions(+), 9 deletions(-) diff --git a/deploy-guide/source/app-config-prod-ceph.rst b/deploy-guide/source/app-config-prod-ceph.rst index 3704fb87f9..e6889c8465 100644 --- a/deploy-guide/source/app-config-prod-ceph.rst +++ b/deploy-guide/source/app-config-prod-ceph.rst @@ -112,9 +112,9 @@ customization of Ansible groups. This allows the deployer to set whether the services will run in a container (the default), or on the host (on metal). -For this environment, the ``cinder-volume`` runs in a container on the -infrastructure hosts. To achieve this, implement -``/etc/openstack_deploy/env.d/cinder.yml`` with the following content: +For a ceph environment, you can run the ``cinder-volume`` in a container. +To do this you will need to create a ``/etc/openstack_deploy/env.d/cinder.yml`` file +with the following content: .. literalinclude:: ../../etc/openstack_deploy/env.d/cinder-volume.yml.container.example @@ -124,8 +124,10 @@ User variables The ``/etc/openstack_deploy/user_variables.yml`` file defines the global overrides for the default variables. -For this environment, implement the load balancer on the infrastructure -hosts. Ensure that keepalived is also configured with HAProxy in -``/etc/openstack_deploy/user_variables.yml`` with the following content. +For this example environment, we configure a HA load balancer. +We implement the load balancer (HAProxy) with an HA layer (keepalived) +on the infrastructure hosts. +Your ``/etc/openstack_deploy/user_variables.yml`` must have the following content +to configure haproxy, keepalived and ceph: .. literalinclude:: ../../etc/openstack_deploy/user_variables.yml.prod-ceph.example diff --git a/etc/openstack_deploy/user_variables.yml.prod-ceph.example b/etc/openstack_deploy/user_variables.yml.prod-ceph.example index c6afc3beba..94d13fed4a 100644 --- a/etc/openstack_deploy/user_variables.yml.prod-ceph.example +++ b/etc/openstack_deploy/user_variables.yml.prod-ceph.example @@ -1,7 +1,6 @@ --- -# This file contains an example of the global variable overrides -# which may need to be set for a production environment. - +# Because we have three haproxy nodes, we need +# to one active LB IP, and we use keepalived for that. ## Load Balancer Configuration (haproxy/keepalived) haproxy_keepalived_external_vip_cidr: "1.2.3.4/32" haproxy_keepalived_internal_vip_cidr: "172.29.236.0/22"