openstack/zun
Code Issues Proposed changes

Merge "Fix the heredoc in quickstart guide"

Browse Source
This commit is contained in:
Jenkins 2017-03-20 06:43:35 +00:00 committed by Gerrit Code Review
commit c4c4422601
1 changed files with 22 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

44
doc/source/dev/quickstart.rst
View File

@ -79,19 +79,19 @@ We will run devstack with minimal local.conf settings required to enable
required OpenStack services:: required OpenStack services::
$ cat > /opt/stack/devstack/local.conf << END $ cat > /opt/stack/devstack/local.conf << END
[[local|localrc]] [[local|localrc]]
HOST_IP=$(ip addr | grep 'state UP' -A2 | tail -n1 | awk '{print $2}' | cut -f1 -d'/') HOST_IP=$(ip addr | grep 'state UP' -A2 | tail -n1 | awk '{print $2}' | cut -f1 -d'/')
DATABASE_PASSWORD=password DATABASE_PASSWORD=password
RABBIT_PASSWORD=password RABBIT_PASSWORD=password
SERVICE_TOKEN=password SERVICE_TOKEN=password
SERVICE_PASSWORD=password SERVICE_PASSWORD=password
ADMIN_PASSWORD=password ADMIN_PASSWORD=password
enable_plugin zun https://git.openstack.org/openstack/zun enable_plugin zun https://git.openstack.org/openstack/zun
enable_plugin kuryr-libnetwork http://git.openstack.org/openstack/kuryr-libnetwork enable_plugin kuryr-libnetwork http://git.openstack.org/openstack/kuryr-libnetwork
# Optional: uncomment to enable the Zun UI plugin in Horizon # Optional: uncomment to enable the Zun UI plugin in Horizon
# enable_plugin zun-ui https://git.openstack.org/openstack/zun-ui # enable_plugin zun-ui https://git.openstack.org/openstack/zun-ui
END END
By default, devstack will enable docker driver in Zun. Alternatively, you can 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 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:: driver::
$ cat >> /opt/stack/devstack/local.conf << END $ cat >> /opt/stack/devstack/local.conf << END
ZUN_DRIVER=nova-docker ZUN_DRIVER=nova-docker
IP_VERSION=4 IP_VERSION=4
disable_service n-net disable_service n-net
enable_service q-svc enable_service q-svc
enable_service q-agt enable_service q-agt
enable_service q-dhcp enable_service q-dhcp
enable_service q-l3 enable_service q-l3
enable_service q-meta enable_service q-meta
enable_service neutron enable_service neutron
END END
More devstack configuration information can be found at More devstack configuration information can be found at
http://docs.openstack.org/developer/devstack/configuration.html http://docs.openstack.org/developer/devstack/configuration.html