diff --git a/doc/source/cloudservices.rst b/doc/source/cloudservices.rst index 639277453..151942074 100644 --- a/doc/source/cloudservices.rst +++ b/doc/source/cloudservices.rst @@ -98,10 +98,6 @@ tables populated by the 'neutron_prod' datasource. (More details about writing policy can be found in the :ref:`Policy ` section.) -The creation and deletion of datasources via the API are deprecated as of liberty. -The upcoming distributed architecture replaces -API-level datasource management with configuration-level datasource management. - 3. Currently Supported Drivers ============================== @@ -114,7 +110,7 @@ has a differing degree of coverage for the available API calls. - OpenStack Glance (v2) - OpenStack Heat - OpenStack Ironic - - OpenStack Keystone + - OpenStack Keystone (v2 & v3) - OpenStack Monasca - OpenStack Murano - OpenStack Neutron (v2) @@ -188,17 +184,7 @@ a different service using that driver. The following steps detail how to implement a datasource driver. -1. Create a new Python module and include 1 static method - - ``d6service(name, keys, inbox, datapath, args)`` - - When a service is created, Congress calls ``d6service`` on the appropriate - driver module to construct an instance of DataSourceDriver tailored for that - service. - - ``name``, ``keys``, ``inbox``, and ``datapath`` are all arguments that - should be passed unaltered to the constructor of the DataSourceDriver - subclass. +1. Create a new Python module 2. Create a subclass of :code`DataSourceDriver`. @@ -208,12 +194,11 @@ The following steps detail how to implement a datasource driver. 3. Implement the constructor :func:`MyDriver.__init__` - ``def __init__(name, keys, inbox, datapath, args)`` + ``def __init__(name, args)`` You must call the DataSourceDriver's constructor. - ``super(NeutronDriver, self).__init__(name, keys, inbox=inbox, - datapath=datapath, poll_time=poll_time, creds`` + ``super(NeutronDriver, self).__init__(name, args)`` 4. Implement the function :func:`MyDriver.update_from_datasource` diff --git a/doc/source/codeoverview.rst b/doc/source/codeoverview.rst index 7ee3b9b91..5c4803df4 100644 --- a/doc/source/codeoverview.rst +++ b/doc/source/codeoverview.rst @@ -39,10 +39,10 @@ laid out in the repository. understand policy languages * ``congress/datasources``: datasource drivers: thin wrappers/adapters for integrating services like Nova, Neutron -* ``congress/dse``: message bus that the policy engine and datasources use to +* ``congress/dse2``: message bus that the policy engine and datasources use to communicate * ``congress/api``: API data models (entry points into the system from the API) -* ``contrib``: code for integrating into other services, e.g. horizon +* ``contrib``: code for integrating into other services 3. Datalog