From a02c583d33f046a88823389caabf963384b5f63a Mon Sep 17 00:00:00 2001 From: Logan V Date: Thu, 27 Jul 2017 19:33:41 -0500 Subject: [PATCH] [DOCS] Use upstream etcd environment definition The etcd environment definition is included in the integrated repo now, so instead of defining an env.d definition, we only need to add hosts to the existing env.d skeleton provided under 'etcd_hosts'. Change-Id: I3f24557d0a48d0127fd406d30fc8c602470a44d2 Depends-On: Id395ae972ea821b36f3b4ae09f4c72280256e676 --- doc/source/app-calico.rst | 26 +++++++++++--------------- 1 file changed, 11 insertions(+), 15 deletions(-) diff --git a/doc/source/app-calico.rst b/doc/source/app-calico.rst index 67ede2f5..0c9ff137 100644 --- a/doc/source/app-calico.rst +++ b/doc/source/app-calico.rst @@ -32,24 +32,20 @@ Prerequisites Configure OSA Environment for Project Calico ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -Copy the etcd container definition to ``/etc/openstack_deploy/env.d/etcd.yml`` -to enable the creation of the etcd cluster. +Add hosts to the ``/etc/openstack_deploy/conf.d/etcd.conf`` configuration file +to add container hosts for the etcd cluster. See +``etc/openstack_deploy/conf.d/etcd.conf.example`` in the openstack-ansible repo +or adjust the example below to match your infrastructure hosts: .. code-block:: yaml - component_skel: - etcd: - belongs_to: - - etcd_all - container_skel: - etcd_container: - belongs_to: - - infra_containers - - shared-infra_containers - contains: - - etcd - properties: - service_name: etcd + etcd_hosts: + infra1: + ip: 172.20.236.111 + infra2: + ip: 172.20.236.112 + infra3: + ip: 172.20.236.113 Copy the neutron environment overrides to ``/etc/openstack_deploy/env.d/neutron.yml`` to disable the creation of the