From 6ccff033adadaff9756eec66b96cfcb0f17c396f Mon Sep 17 00:00:00 2001 From: Hongbin Lu Date: Fri, 17 Mar 2017 13:30:57 -0500 Subject: [PATCH] Fix the heredoc in quickstart guide The delimiting identifier "END" must be placed at the beginning of the line (no space in before). Change-Id: Id9a1db74056ce9f5ade661e7016bfe696a7474e6 --- doc/source/dev/quickstart.rst | 44 +++++++++++++++++------------------ 1 file changed, 22 insertions(+), 22 deletions(-) diff --git a/doc/source/dev/quickstart.rst b/doc/source/dev/quickstart.rst index d2aad18aa..828dafc08 100644 --- a/doc/source/dev/quickstart.rst +++ b/doc/source/dev/quickstart.rst @@ -79,19 +79,19 @@ We will run devstack with minimal local.conf settings required to enable required OpenStack services:: $ cat > /opt/stack/devstack/local.conf << END - [[local|localrc]] - HOST_IP=$(ip addr | grep 'state UP' -A2 | tail -n1 | awk '{print $2}' | cut -f1 -d'/') - DATABASE_PASSWORD=password - RABBIT_PASSWORD=password - SERVICE_TOKEN=password - SERVICE_PASSWORD=password - ADMIN_PASSWORD=password - enable_plugin zun https://git.openstack.org/openstack/zun - enable_plugin kuryr-libnetwork http://git.openstack.org/openstack/kuryr-libnetwork + [[local|localrc]] + HOST_IP=$(ip addr | grep 'state UP' -A2 | tail -n1 | awk '{print $2}' | cut -f1 -d'/') + DATABASE_PASSWORD=password + RABBIT_PASSWORD=password + SERVICE_TOKEN=password + SERVICE_PASSWORD=password + ADMIN_PASSWORD=password + enable_plugin zun https://git.openstack.org/openstack/zun + enable_plugin kuryr-libnetwork http://git.openstack.org/openstack/kuryr-libnetwork - # Optional: uncomment to enable the Zun UI plugin in Horizon - # enable_plugin zun-ui https://git.openstack.org/openstack/zun-ui - END + # Optional: uncomment to enable the Zun UI plugin in Horizon + # enable_plugin zun-ui https://git.openstack.org/openstack/zun-ui + END By default, devstack will enable docker driver in Zun. Alternatively, you can enable nova-docker driver instead. If nova-docker driver is enabled, zun will @@ -101,16 +101,16 @@ containers with networking provided by Neutron. Otherwise, choose docker driver:: $ cat >> /opt/stack/devstack/local.conf << END - ZUN_DRIVER=nova-docker - IP_VERSION=4 - disable_service n-net - enable_service q-svc - enable_service q-agt - enable_service q-dhcp - enable_service q-l3 - enable_service q-meta - enable_service neutron - END + ZUN_DRIVER=nova-docker + IP_VERSION=4 + disable_service n-net + enable_service q-svc + enable_service q-agt + enable_service q-dhcp + enable_service q-l3 + enable_service q-meta + enable_service neutron + END More devstack configuration information can be found at http://docs.openstack.org/developer/devstack/configuration.html