Merge "Allow depth limiting git clones"
diff --git a/HACKING.rst b/HACKING.rst
index 3b86529..3ffe1e2 100644
--- a/HACKING.rst
+++ b/HACKING.rst
@@ -126,14 +126,9 @@
Documentation
-------------
-The official DevStack repo on GitHub does not include a gh-pages branch that
-GitHub uses to create static web sites. That branch is maintained in the
-`CloudBuilders DevStack repo`__ mirror that supports the
-http://devstack.org site. This is the primary DevStack
-documentation along with the DevStack scripts themselves.
-
-__ repo_
-.. _repo: https://github.com/cloudbuilders/devstack
+The DevStack repo now contains all of the static pages of devstack.org in
+the ``doc/source`` directory. The OpenStack CI system rebuilds the docs after every
+commit and updates devstack.org (now a redirect to docs.openstack.org/developer/devstack).
All of the scripts are processed with shocco_ to render them with the comments
as text describing the script below. For this reason we tend to be a little
@@ -144,6 +139,8 @@
.. _shocco: https://github.com/dtroyer/shocco/tree/rst_support
The script used to drive <code>shocco</code> is <code>tools/build_docs.sh</code>.
+The complete docs build is also handled with <code>tox -edocs</code> per the
+OpenStack project standard.
Exercises
@@ -235,8 +232,12 @@
collections of bash scripts. These should be considered as part of the
review process.
-We have a preliminary enforcing script for this called bash8 (only a
-small number of these rules are enforced).
+DevStack uses the bashate_ style checker
+to enforce basic guidelines, similar to pep8 and flake8 tools for Python. The
+list below is not complete for what bashate checks, nor is it all checked
+by bashate. So many lines of code, so little time.
+
+.. _bashate: https://pypi.python.org/pypi/bashate
Whitespace Rules
----------------
diff --git a/doc/source/changes.rst b/doc/source/changes.rst
index 7ce629f..ccd96e8 100644
--- a/doc/source/changes.rst
+++ b/doc/source/changes.rst
@@ -12,7 +12,3 @@
These are the commits to DevStack for the last six months. For the
complete list see `the DevStack project in
Gerrit <https://review.openstack.org/#/q/status:merged+project:openstack-dev/devstack,n,z>`__.
-
-© Openstack Foundation 2011-2014 — An
-`OpenStack <https://www.openstack.org/>`__
-`program <https://wiki.openstack.org/wiki/Programs>`__
diff --git a/doc/source/configuration.rst b/doc/source/configuration.rst
index 694ad62..9befc90 100644
--- a/doc/source/configuration.rst
+++ b/doc/source/configuration.rst
@@ -354,7 +354,3 @@
RABBIT_PASSWORD=$ADMIN_PASSWORD
SERVICE_PASSWORD=$ADMIN_PASSWORD
SERVICE_TOKEN=a682f596-76f3-11e3-b3b2-e716f9080d50
-
-© Openstack Foundation 2011-2014 — An
-`OpenStack <https://www.openstack.org/>`__
-`program <https://wiki.openstack.org/wiki/Programs>`__
diff --git a/doc/source/contributing.rst b/doc/source/contributing.rst
index e37c06b..73069e7 100644
--- a/doc/source/contributing.rst
+++ b/doc/source/contributing.rst
@@ -98,8 +98,3 @@
may reference the top-level DevStack configuration they can generally be
run alone. There are also some sub-directories to support specific
environments such as XenServer.
-
-© Openstack Foundation 2011-2013 — An `OpenStack
-program <https://wiki.openstack.org/wiki/Programs>`__ created by
-`Rackspace Cloud
-Builders <http://www.rackspace.com/cloud/private_edition/>`__
diff --git a/doc/source/eucarc.rst b/doc/source/eucarc.rst
index c1065e6..c91d341 100644
--- a/doc/source/eucarc.rst
+++ b/doc/source/eucarc.rst
@@ -50,8 +50,3 @@
EC2_CERT=cert.pem
NOVA_CERT=cacert.pem
EUCALYPTUS_CERT=${NOVA_CERT}
-
-© Openstack Foundation 2011-2013 — An `OpenStack
-program <https://wiki.openstack.org/wiki/Programs>`__ created by
-`Rackspace Cloud
-Builders <http://www.rackspace.com/cloud/private_edition/>`__
diff --git a/doc/source/exerciserc.rst b/doc/source/exerciserc.rst
index 22aff9a..ed3f2e8 100644
--- a/doc/source/exerciserc.rst
+++ b/doc/source/exerciserc.rst
@@ -47,8 +47,3 @@
::
TERMINATE_TIMEOUT=30
-
-© Openstack Foundation 2011-2013 — An `OpenStack
-program <https://wiki.openstack.org/wiki/Programs>`__ created by
-`Rackspace Cloud
-Builders <http://www.rackspace.com/cloud/private_edition/>`__
diff --git a/doc/source/faq.rst b/doc/source/faq.rst
index 9adc58e..36b25b3 100644
--- a/doc/source/faq.rst
+++ b/doc/source/faq.rst
@@ -178,7 +178,3 @@
problems than we'll add them to the script. Knowing about the broken
future releases is valuable rather than polling to see if it has
been fixed.
-
-© Openstack Foundation 2011-2014 — An
-`OpenStack <https://www.openstack.org/>`__
-`program <https://wiki.openstack.org/wiki/Programs>`__
diff --git a/doc/source/guides/multinode-lab.rst b/doc/source/guides/multinode-lab.rst
index c7901a2..a63260f 100644
--- a/doc/source/guides/multinode-lab.rst
+++ b/doc/source/guides/multinode-lab.rst
@@ -376,7 +376,3 @@
::
mysqladmin -u root -pnova password 'supersecret'
-
-© Openstack Foundation 2011-2014 — An
-`OpenStack <https://www.openstack.org/>`__
-`program <https://wiki.openstack.org/wiki/Programs>`__
diff --git a/doc/source/guides/pxe-boot.rst b/doc/source/guides/pxe-boot.rst
index 584e558..f745abb 100644
--- a/doc/source/guides/pxe-boot.rst
+++ b/doc/source/guides/pxe-boot.rst
@@ -138,6 +138,3 @@
Now `return <ramdisk.html>`__ to the RAM disk Guide to kick off your
DevStack experience.
-
-© Openstack Foundation 2011-2013 — this is not an official OpenStack
-project...
diff --git a/doc/source/guides/ramdisk.rst b/doc/source/guides/ramdisk.rst
index 82147a8..1ba74f2 100644
--- a/doc/source/guides/ramdisk.rst
+++ b/doc/source/guides/ramdisk.rst
@@ -84,6 +84,3 @@
screen -x
- Connect to the dashboard at ``http://<ip-address>/``
-
-© Openstack Foundation 2011-2013 — this is not an official OpenStack
-project...
diff --git a/doc/source/guides/single-machine.rst b/doc/source/guides/single-machine.rst
index 0db0466..3e0a39c 100644
--- a/doc/source/guides/single-machine.rst
+++ b/doc/source/guides/single-machine.rst
@@ -138,8 +138,3 @@
Some examples of using the OpenStack command-line clients ``nova`` and
``glance`` are in the shakedown scripts in ``devstack/exercises``.
``exercise.sh`` will run all of those scripts and report on the results.
-
-© Openstack Foundation 2011-2013 — An `OpenStack
-program <https://wiki.openstack.org/wiki/Programs>`__ created by
-`Rackspace Cloud
-Builders <http://www.rackspace.com/cloud/private_edition/>`__
diff --git a/doc/source/guides/single-vm.rst b/doc/source/guides/single-vm.rst
index 0e2d157..35efb14 100644
--- a/doc/source/guides/single-vm.rst
+++ b/doc/source/guides/single-vm.rst
@@ -104,7 +104,3 @@
Setting ``OFFLINE=True`` in ``local.conf`` enables ``stack.sh`` to run
multiple times without an Internet connection. DevStack, making hacking
at the lake possible since 2012!
-
-© Openstack Foundation 2011-2014 — An
-`OpenStack <https://www.openstack.org/>`__
-`program <https://wiki.openstack.org/wiki/Programs>`__
diff --git a/doc/source/guides/usb-boot.rst b/doc/source/guides/usb-boot.rst
index 888e14f..4f7a494 100644
--- a/doc/source/guides/usb-boot.rst
+++ b/doc/source/guides/usb-boot.rst
@@ -55,6 +55,3 @@
Now `return <ramdisk.html>`__ to the RAM disk Guide to kick off your
DevStack experience.
-
-© Openstack Foundation 2011-2013 — this is not an official OpenStack
-project...
diff --git a/doc/source/index.rst b/doc/source/index.rst
index 6e5105d..6f7cab6 100644
--- a/doc/source/index.rst
+++ b/doc/source/index.rst
@@ -377,7 +377,3 @@
exercises/zaqar.sh
`Read » <exercises/zaqar.sh.html>`__
-
-© Openstack Foundation 2011-2014 — An
-`OpenStack <https://www.openstack.org/>`__
-`program <https://wiki.openstack.org/wiki/Programs>`__
diff --git a/doc/source/local.conf.rst b/doc/source/local.conf.rst
index 40d0e0f..e1de44c 100644
--- a/doc/source/local.conf.rst
+++ b/doc/source/local.conf.rst
@@ -14,7 +14,3 @@
``localrc`` file. See `the description of
local.conf <configuration.html>`__ for more details about the mechanics
of the file.
-
-© Openstack Foundation 2011-2014 — An
-`OpenStack <https://www.openstack.org/>`__
-`program <https://wiki.openstack.org/wiki/Programs>`__
diff --git a/doc/source/localrc.rst b/doc/source/localrc.rst
index 910e274..487280b 100644
--- a/doc/source/localrc.rst
+++ b/doc/source/localrc.rst
@@ -14,7 +14,3 @@
will continue to use ``localrc`` if it is present and ignore the
``localrc`` section in ``local.conf.``. Remove ``localrc`` to switch to
using the new file.
-
-© Openstack Foundation 2011-2014 — An
-`OpenStack <https://www.openstack.org/>`__
-`program <https://wiki.openstack.org/wiki/Programs>`__
diff --git a/doc/source/openrc.rst b/doc/source/openrc.rst
index b8759ec..ce5765a 100644
--- a/doc/source/openrc.rst
+++ b/doc/source/openrc.rst
@@ -81,8 +81,3 @@
# export KEYSTONECLIENT_DEBUG=1
# export NOVACLIENT_DEBUG=1
-
-© Openstack Foundation 2011-2013 — An `OpenStack
-program <https://wiki.openstack.org/wiki/Programs>`__ created by
-`Rackspace Cloud
-Builders <http://www.rackspace.com/cloud/private_edition/>`__
diff --git a/doc/source/overview.rst b/doc/source/overview.rst
index 953938b..cedf941 100644
--- a/doc/source/overview.rst
+++ b/doc/source/overview.rst
@@ -97,7 +97,3 @@
testing as that job has transitioned to Tempest. They are still
maintained as a demonstrations of using OpenStack from the command line
and for quick operational testing.
-
-© Openstack Foundation 2011-2014 — An
-`OpenStack <https://www.openstack.org/>`__
-`program <https://wiki.openstack.org/wiki/Programs>`__
diff --git a/doc/source/plugins.rst b/doc/source/plugins.rst
index db695d3..0747b59 100644
--- a/doc/source/plugins.rst
+++ b/doc/source/plugins.rst
@@ -117,8 +117,3 @@
- ``start_nova_hypervisor`` - start any external services
- ``stop_nova_hypervisor`` - stop any external services
- ``cleanup_nova_hypervisor`` - remove transient data and cache
-
-© Openstack Foundation 2011-2013 — An `OpenStack
-program <https://wiki.openstack.org/wiki/Programs>`__ created by
-`Rackspace Cloud
-Builders <http://www.rackspace.com/cloud/private_edition/>`__
diff --git a/doc/source/stackrc.rst b/doc/source/stackrc.rst
index b2766cb..5d9d221 100644
--- a/doc/source/stackrc.rst
+++ b/doc/source/stackrc.rst
@@ -71,7 +71,3 @@
NOVA_REPO=https://review.openstack.org/p/openstack/nova
NOVA_BRANCH=refs/changes/50/5050/1
-
-© Openstack Foundation 2011-2014 — An
-`OpenStack <https://www.openstack.org/>`__
-`program <https://wiki.openstack.org/wiki/Programs>`__
diff --git a/lib/ironic b/lib/ironic
index 1541dcf..0a84e47 100644
--- a/lib/ironic
+++ b/lib/ironic
@@ -281,7 +281,8 @@
fi
iniset $IRONIC_CONF_FILE glance swift_endpoint_url http://${HOST_IP}:8080
iniset $IRONIC_CONF_FILE glance swift_api_version v1
- iniset $IRONIC_CONF_FILE glance swift_account AUTH_${SERVICE_TENANT}
+ local tenant_id=$(get_or_create_project $SERVICE_TENANT_NAME)
+ iniset $IRONIC_CONF_FILE glance swift_account AUTH_${tenant_id}
iniset $IRONIC_CONF_FILE glance swift_container glance
iniset $IRONIC_CONF_FILE glance swift_temp_url_duration 3600
iniset $IRONIC_CONF_FILE agent heartbeat_timeout 30