diff --git a/doc/source/user/pipelines/index.rst b/doc/source/user/pipelines/index.rst index 9593807..9283f03 100644 --- a/doc/source/user/pipelines/index.rst +++ b/doc/source/user/pipelines/index.rst @@ -7,15 +7,10 @@ For your convenience, find below some example pipelines to be used with the corresponding OpenStack Compute version. These are to be **added** into your ``/etc/nova/api-paste.ini`` configuration file. -.. include:: juno.rst -.. include:: kilo.rst - -.. # NOTE(aloga): We are including the pipelines, so we are not adding them to - # any TOC and sphinx will complain. .. toctree:: - :hidden: juno kilo liberty mitaka + newton diff --git a/doc/source/user/pipelines/liberty.rst b/doc/source/user/pipelines/liberty.rst index e93d1fe..2952135 100644 --- a/doc/source/user/pipelines/liberty.rst +++ b/doc/source/user/pipelines/liberty.rst @@ -1,5 +1,5 @@ -Liberty (2015.2) ---------------- +Liberty (12) +------------ .. code:: ini diff --git a/doc/source/user/pipelines/mitaka.rst b/doc/source/user/pipelines/mitaka.rst new file mode 100644 index 0000000..9ffa718 --- /dev/null +++ b/doc/source/user/pipelines/mitaka.rst @@ -0,0 +1,17 @@ +Mitaka (13) +----------- + +.. code:: ini + + [composite:ooi] + use = call:nova.api.openstack.urlmap:urlmap_factory + /occi1.1: occi_api_11 + + [filter:occi] + paste.filter_factory = ooi.wsgi:OCCIMiddleware.factory + openstack_version = /v2.1 + + [composite:occi_api_11] + use = call:nova.api.auth:pipeline_factory_v21 + noauth2 = cors compute_req_id faultwrap sizelimit noauth2 occi osapi_compute_app_v21 + keystone = cors compute_req_id faultwrap sizelimit authtoken keystonecontext occi osapi_compute_app_v21 diff --git a/doc/source/user/pipelines/newton.rst b/doc/source/user/pipelines/newton.rst new file mode 100644 index 0000000..1a8b144 --- /dev/null +++ b/doc/source/user/pipelines/newton.rst @@ -0,0 +1,17 @@ +Netwon (14) +----------- + +.. code:: ini + + [composite:ooi] + use = call:nova.api.openstack.urlmap:urlmap_factory + /occi1.1: occi_api_11 + + [filter:occi] + paste.filter_factory = ooi.wsgi:OCCIMiddleware.factory + openstack_version = /v2.1 + + [composite:occi_api_11] + use = call:nova.api.auth:pipeline_factory_v21 + noauth2 = cors http_proxy_to_wsgi compute_req_id faultwrap sizelimit noauth2 occi osapi_compute_app_v21 + keystone = cors http_proxy_to_wsgi compute_req_id faultwrap sizelimit authtoken keystonecontext occi osapi_compute_app_v21