|
...
|
...
|
@@ -33,7 +33,8 @@ REGION_NAME=${REGION_NAME:-RegionOne}
|
|
33
|
33
|
# For example, to enable Swift add this to ``local.conf``:
|
|
34
|
34
|
# enable_service s-proxy s-object s-container s-account
|
|
35
|
35
|
# In order to enable Neutron (a single node setup) add the following
|
|
36
|
|
-# settings in `` localrc``:
|
|
|
36
|
+# settings in ``local.conf``:
|
|
|
37
|
+# [[local|localrc]]
|
|
37
|
38
|
# disable_service n-net
|
|
38
|
39
|
# enable_service q-svc
|
|
39
|
40
|
# enable_service q-agt
|
|
...
|
...
|
@@ -529,8 +530,8 @@ CIRROS_VERSION=${CIRROS_VERSION:-"0.3.2"}
|
|
529
|
529
|
CIRROS_ARCH=${CIRROS_ARCH:-"x86_64"}
|
|
530
|
530
|
|
|
531
|
531
|
# Set default image based on ``VIRT_DRIVER`` and ``LIBVIRT_TYPE``, either of
|
|
532
|
|
-# which may be set in ``localrc``. Also allow ``DEFAULT_IMAGE_NAME`` and
|
|
533
|
|
-# ``IMAGE_URLS`` to be set directly in ``localrc``.
|
|
|
532
|
+# which may be set in ``local.conf``. Also allow ``DEFAULT_IMAGE_NAME`` and
|
|
|
533
|
+# ``IMAGE_URLS`` to be set in the `localrc` section of ``local.conf``.
|
|
534
|
534
|
case "$VIRT_DRIVER" in
|
|
535
|
535
|
openvz)
|
|
536
|
536
|
DEFAULT_IMAGE_NAME=${DEFAULT_IMAGE_NAME:-ubuntu-12.04-x86_64}
|