OpenDev Migration Patch

This commit was bulk generated and pushed by the OpenDev sysadmins as a part of the Git hosting and code review systems migration detailed in these mailing list posts: http://lists.openstack.org/pipermail/openstack-discuss/2019-March/003603.html http://lists.openstack.org/pipermail/openstack-discuss/2019-April/004920.html Attempts have been made to correct repository namespaces and hostnames based on simple pattern matching, but it's possible some were updated incorrectly or missed entirely. Please reach out to us via the contact information listed at https://opendev.org/ with any questions you may have.
Replace openstack.org git:// URLs with https://
2019-04-19 19:40:45 +00:00 · 2019-03-24 20:36:25 +00:00 · 2018-08-19 00:58:37 +09:00 · 2017-05-15 23:41:13 +00:00 · 2017-03-09 18:26:17 +00:00 · 2017-02-16 13:53:58 +00:00
483 changed files with 6537 additions and 25372 deletions
--- a/.gitignore
+++ b/.gitignore
@@ -4,7 +4,8 @@
 *.so

 # Packages
-*.egg*
+*.egg
+*.egg-info
 dist
 build
 eggs
@@ -24,7 +25,6 @@ pip-log.txt
 .coverage*
 .tox
 nosetests.xml
-.stestr/
 .testrepository
 .venv
 .idea
@@ -43,11 +43,9 @@ output/*/index.html

 # Sphinx
 doc/build
-doc/source/api/*
+doc/source/api
 doc/source/samples
-doc/source/_static/*.sample
-!doc/source/api/index.rst
-!doc/source/api/v1.rst
+doc/source/watcher.conf.sample

 # pbr generates these
 AUTHORS
@@ -73,6 +71,3 @@ releasenotes/build

 # Desktop Service Store
 *.DS_Store
-
-# Autogenerated sample config file
-etc/watcher/watcher.conf.sample
--- a/.gitreview
+++ b/.gitreview
@@ -1,4 +1,5 @@
 [gerrit]
-host=review.openstack.org
+host=review.opendev.org
 port=29418
 project=openstack/watcher.git
+defaultbranch=stable/ocata
--- a/.stestr.conf
+++ b/.stestr.conf
@@ -1,4 +0,0 @@
-[DEFAULT]
-test_path=${OS_TEST_PATH:-./watcher/tests}
-top_dir=./
-
--- a/.zuul.yaml
+++ b/.zuul.yaml
@@ -1,139 +1,9 @@
 - project:
-    check:
-      jobs:
-        - watcher-tempest-functional
-        - watcher-tempest-dummy_optim
-        - watcher-tempest-actuator
-        - watcher-tempest-basic_optim
-        - watcher-tempest-workload_balancing
-        - watcherclient-tempest-functional
-        - legacy-rally-dsvm-watcher-rally
-        - openstack-tox-lower-constraints
+    templates:
+      - openstack-python-jobs
+      - openstack-python35-jobs
+      - publish-openstack-sphinx-docs
+      - check-requirements
+      - release-notes-jobs
    gate:
-      jobs:
-        - watcher-tempest-functional
-        - watcher-tempest-dummy_optim
-        - watcher-tempest-actuator
-        - watcher-tempest-basic_optim
-        - watcher-tempest-workload_balancing
-        - watcherclient-tempest-functional
-        - legacy-rally-dsvm-watcher-rally
-        - openstack-tox-lower-constraints
-
- job:
-    name: watcher-tempest-dummy_optim
-    parent: watcher-tempest-multinode
-    vars:
-      tempest_test_regex: 'watcher_tempest_plugin.tests.scenario.test_execute_dummy_optim'
-
- job:
-    name: watcher-tempest-actuator
-    parent: watcher-tempest-multinode
-    vars:
-      tempest_test_regex: 'watcher_tempest_plugin.tests.scenario.test_execute_actuator'
-
- job:
-    name: watcher-tempest-basic_optim
-    parent: watcher-tempest-multinode
-    vars:
-      tempest_test_regex: 'watcher_tempest_plugin.tests.scenario.test_execute_basic_optim'
-
- job:
-    name: watcher-tempest-workload_balancing
-    parent: watcher-tempest-multinode
-    vars:
-      tempest_test_regex: 'watcher_tempest_plugin.tests.scenario.test_execute_workload_balancing'
-
- job:
-    name: watcher-tempest-multinode
-    parent: watcher-tempest-functional
-    voting: false
-    nodeset: openstack-two-node
-    pre-run: playbooks/pre.yaml
-    run: playbooks/orchestrate-tempest.yaml
-    roles:
-      - zuul: openstack/tempest
-    group-vars:
-      subnode:
-        devstack_local_conf:
-          post-config:
-            $NOVA_CONF:
-              libvirt:
-                live_migration_uri: 'qemu+ssh://root@%s/system'
-        devstack_services:
-          watcher-api: false
-          watcher-decision-engine: false
-          watcher-applier: false
-          # We need to add TLS support for watcher plugin
-          tls-proxy: false
-          ceilometer: false
-          ceilometer-acompute: false
-          ceilometer-acentral: false
-          ceilometer-anotification: false
-          watcher: false
-          gnocchi-api: false
-          gnocchi-metricd: false
-          rabbit: false
-          mysql: false
-    vars:
-      devstack_local_conf:
-        post-config:
-          $NOVA_CONF:
-            libvirt:
-              live_migration_uri: 'qemu+ssh://root@%s/system'
-        test-config:
-          $TEMPEST_CONFIG:
-            compute:
-              min_compute_nodes: 2
-            compute-feature-enabled:
-              live_migration: true
-              block_migration_for_live_migration: true
-      devstack_plugins:
-        ceilometer: https://git.openstack.org/openstack/ceilometer
-
- job:
-    name: watcher-tempest-functional
-    parent: devstack-tempest
-    timeout: 7200
-    required-projects:
-      - openstack/ceilometer
-      - openstack-infra/devstack-gate
-      - openstack/python-openstackclient
-      - openstack/python-watcherclient
-      - openstack/watcher
-      - openstack/watcher-tempest-plugin
-      - openstack/tempest
-    vars:
-      devstack_plugins:
-        watcher: https://git.openstack.org/openstack/watcher
-      devstack_services:
-        tls-proxy: false
-        watcher-api: true
-        watcher-decision-engine: true
-        watcher-applier: true
-        tempest: true
-        s-account: false
-        s-container: false
-        s-object: false
-        s-proxy: false
-      devstack_localrc:
-        TEMPEST_PLUGINS: '/opt/stack/watcher-tempest-plugin'
-      tempest_test_regex: 'watcher_tempest_plugin.tests.api'
-      tox_envlist: all
-      tox_environment:
-        # Do we really need to set this? It's cargo culted
-        PYTHONUNBUFFERED: 'true'
-      zuul_copy_output:
-        /etc/hosts: logs
-
- job:
-    # This job is used in python-watcherclient repo
-    name: watcherclient-tempest-functional
-    parent: watcher-tempest-functional
-    voting: false
-    timeout: 4200
-    vars:
-      tempest_concurrency: 1
-      devstack_localrc:
-        TEMPEST_PLUGINS: '/opt/stack/python-watcherclient'
-      tempest_test_regex: 'watcherclient.tests.functional'
+      queue: watcher
--- a/CONTRIBUTING.rst
+++ b/CONTRIBUTING.rst
@@ -1,13 +1,13 @@
 If you would like to contribute to the development of OpenStack,
 you must follow the steps in this page:

-   https://docs.openstack.org/infra/manual/developers.html
+   http://docs.openstack.org/infra/manual/developers.html

 Once those steps have been completed, changes to OpenStack
 should be submitted for review via the Gerrit tool, following
 the workflow documented at:

-   https://docs.openstack.org/infra/manual/developers.html#development-workflow
+   http://docs.openstack.org/infra/manual/developers.html#development-workflow

 Pull requests submitted through GitHub will be ignored.

--- a/HACKING.rst
+++ b/HACKING.rst
@@ -8,4 +8,4 @@
 watcher Style Commandments
 ==========================

-Read the OpenStack Style Commandments https://docs.openstack.org/hacking/latest/
+Read the OpenStack Style Commandments http://docs.openstack.org/developer/hacking/
--- a/README.rst
+++ b/README.rst
@@ -2,8 +2,8 @@
 Team and repository tags
 ========================

-.. image:: https://governance.openstack.org/tc/badges/watcher.svg
-    :target: https://governance.openstack.org/tc/reference/tags/index.html
+.. image:: http://governance.openstack.org/badges/watcher.svg
+    :target: http://governance.openstack.org/reference/tags/index.html

 .. Change things from this point on

@@ -22,11 +22,10 @@ service for multi-tenant OpenStack-based clouds.
 Watcher provides a robust framework to realize a wide range of cloud
 optimization goals, including the reduction of data center
 operating costs, increased system performance via intelligent virtual machine
-migration, increased energy efficiency and more!
+migration, increased energy efficiency-and more!

 * Free software: Apache license
-* Wiki: https://wiki.openstack.org/wiki/Watcher
-* Source: https://github.com/openstack/watcher
-* Bugs: https://bugs.launchpad.net/watcher
-* Documentation: https://docs.openstack.org/watcher/latest/
-* Release notes: https://docs.openstack.org/releasenotes/watcher/
+* Wiki: http://wiki.openstack.org/wiki/Watcher
+* Source:  https://github.com/openstack/watcher
+* Bugs: http://bugs.launchpad.net/watcher
+* Documentation: http://docs.openstack.org/developer/watcher/
--- a/devstack/files/apache-watcher-api.template
+++ b/devstack/files/apache-watcher-api.template
@@ -1,42 +0,0 @@
-# Licensed under the Apache License, Version 2.0 (the "License"); you may
-# not use this file except in compliance with the License. You may obtain
-# a copy of the License at
-#
-#      http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
-# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
-# License for the specific language governing permissions and limitations
-# under the License.
-
-# This is an example Apache2 configuration file for using the
-# Watcher API through mod_wsgi.  This version assumes you are
-# running devstack to configure the software.
-
-Listen %WATCHER_SERVICE_PORT%
-
-<VirtualHost *:%WATCHER_SERVICE_PORT%>
-    WSGIDaemonProcess watcher-api user=%USER% processes=%APIWORKERS% threads=1 display-name=%{GROUP}
-    WSGIScriptAlias / %WATCHER_WSGI_DIR%/app.wsgi
-    WSGIApplicationGroup %{GLOBAL}
-    WSGIProcessGroup watcher-api
-    WSGIPassAuthorization On
-
-    ErrorLogFormat "%M"
-    ErrorLog /var/log/%APACHE_NAME%/watcher-api.log
-    CustomLog /var/log/%APACHE_NAME%/watcher-api-access.log combined
-
-
-    <Directory %WATCHER_WSGI_DIR%>
-        WSGIProcessGroup watcher-api
-        WSGIApplicationGroup %{GLOBAL}
-        <IfVersion >= 2.4>
-            Require all granted
-        </IfVersion>
-        <IfVersion < 2.4>
-            Order allow,deny
-            Allow from all
-        </IfVersion>
-    </Directory>
-</VirtualHost>
--- a/devstack/lib/watcher
+++ b/devstack/lib/watcher
@@ -42,10 +42,7 @@ WATCHER_AUTH_CACHE_DIR=${WATCHER_AUTH_CACHE_DIR:-/var/cache/watcher}

 WATCHER_CONF_DIR=/etc/watcher
 WATCHER_CONF=$WATCHER_CONF_DIR/watcher.conf
-WATCHER_POLICY_YAML=$WATCHER_CONF_DIR/policy.yaml.sample
-
-WATCHER_DEVSTACK_DIR=$WATCHER_DIR/devstack
-WATCHER_DEVSTACK_FILES_DIR=$WATCHER_DEVSTACK_DIR/files
+WATCHER_POLICY_JSON=$WATCHER_CONF_DIR/policy.json

 NOVA_CONF_DIR=/etc/nova
 NOVA_CONF=$NOVA_CONF_DIR/nova.conf
@@ -54,13 +51,6 @@ if is_ssl_enabled_service "watcher" || is_service_enabled tls-proxy; then
    WATCHER_SERVICE_PROTOCOL="https"
 fi

-WATCHER_USE_MOD_WSGI=$(trueorfalse True WATCHER_USE_MOD_WSGI)
-
-if is_suse; then
-    WATCHER_WSGI_DIR=${WATCHER_WSGI_DIR:-/srv/www/htdocs/watcher}
-else
-    WATCHER_WSGI_DIR=${WATCHER_WSGI_DIR:-/var/www/watcher}
-fi
 # Public facing bits
 WATCHER_SERVICE_HOST=${WATCHER_SERVICE_HOST:-$HOST_IP}
 WATCHER_SERVICE_PORT=${WATCHER_SERVICE_PORT:-9322}
@@ -84,21 +74,10 @@ function is_watcher_enabled {
    return 1
 }

-#_cleanup_watcher_apache_wsgi - Remove wsgi files,
-#disable and remove apache vhost file
-function _cleanup_watcher_apache_wsgi {
-    sudo rm -rf $WATCHER_WSGI_DIR
-    sudo rm -f $(apache_site_config_for watcher-api)
-    restart_apache_server
-}
-
 # cleanup_watcher() - Remove residual data files, anything left over from previous
 # runs that a clean run would need to clean up
 function cleanup_watcher {
    sudo rm -rf $WATCHER_STATE_PATH $WATCHER_AUTH_CACHE_DIR
-    if [[ "$WATCHER_USE_MOD_WSGI" == "True" ]]; then
-        _cleanup_watcher_apache_wsgi
-    fi
 }

 # configure_watcher() - Set config files, create data dirs, etc
@@ -106,25 +85,7 @@ function configure_watcher {
    # Put config files in ``/etc/watcher`` for everyone to find
    sudo install -d -o $STACK_USER $WATCHER_CONF_DIR

-    local project=watcher
-    local project_uc
-    project_uc=$(echo watcher|tr a-z A-Z)
-    local conf_dir="${project_uc}_CONF_DIR"
-    # eval conf dir to get the variable
-    conf_dir="${!conf_dir}"
-    local project_dir="${project_uc}_DIR"
-    # eval project dir to get the variable
-    project_dir="${!project_dir}"
-    local sample_conf_dir="${project_dir}/etc/${project}"
-    local sample_policy_dir="${project_dir}/etc/${project}/policy.d"
-    local sample_policy_generator="${project_dir}/etc/${project}/oslo-policy-generator/watcher-policy-generator.conf"
-
-    # first generate policy.yaml
-    oslopolicy-sample-generator --config-file $sample_policy_generator
-    # then optionally copy over policy.d
-    if [[ -d $sample_policy_dir ]]; then
-        cp -r $sample_policy_dir $conf_dir/policy.d
-    fi
+    install_default_policy watcher

    # Rebuild the config file from scratch
    create_watcher_conf
@@ -147,28 +108,6 @@ function create_watcher_accounts {
        "$WATCHER_SERVICE_PROTOCOL://$WATCHER_SERVICE_HOST:$WATCHER_SERVICE_PORT"
 }

-# _config_watcher_apache_wsgi() - Set WSGI config files of watcher
-function _config_watcher_apache_wsgi {
-    local watcher_apache_conf
-    if [[ "$WATCHER_USE_MOD_WSGI" == "True" ]]; then
-        sudo mkdir -p $WATCHER_WSGI_DIR
-        sudo cp $WATCHER_DIR/watcher/api/app.wsgi $WATCHER_WSGI_DIR/app.wsgi
-        watcher_apache_conf=$(apache_site_config_for watcher-api)
-        sudo cp $WATCHER_DEVSTACK_FILES_DIR/apache-watcher-api.template $watcher_apache_conf
-        sudo sed -e "
-            s|%WATCHER_SERVICE_PORT%|$WATCHER_SERVICE_PORT|g;
-            s|%WATCHER_WSGI_DIR%|$WATCHER_WSGI_DIR|g;
-            s|%USER%|$STACK_USER|g;
-            s|%APIWORKERS%|$API_WORKERS|g;
-            s|%APACHE_NAME%|$APACHE_NAME|g;
-        " -i $watcher_apache_conf
-        enable_apache_site watcher-api
-        tail_log watcher-access /var/log/$APACHE_NAME/watcher-api-access.log
-        tail_log watcher-api /var/log/$APACHE_NAME/watcher-api.log
-   fi
-
-}
-
 # create_watcher_conf() - Create a new watcher.conf file
 function create_watcher_conf {
    # (Re)create ``watcher.conf``
@@ -177,21 +116,17 @@ function create_watcher_conf {
    iniset $WATCHER_CONF DEFAULT debug "$ENABLE_DEBUG_LOG_LEVEL"
    iniset $WATCHER_CONF DEFAULT control_exchange watcher

-    iniset_rpc_backend watcher $WATCHER_CONF
-
    iniset $WATCHER_CONF database connection $(database_connection_url watcher)
    iniset $WATCHER_CONF api host "$WATCHER_SERVICE_HOST"
+    iniset $WATCHER_CONF api port "$WATCHER_SERVICE_PORT"

-    if is_service_enabled tls-proxy; then
-        iniset $WATCHER_CONF api port "$WATCHER_SERVICE_PORT_INT"
-        # iniset $WATCHER_CONF api enable_ssl_api "True"
-    else
-        iniset $WATCHER_CONF api port "$WATCHER_SERVICE_PORT"
-    fi
+    iniset $WATCHER_CONF oslo_policy policy_file $WATCHER_POLICY_JSON

-    iniset $WATCHER_CONF oslo_policy policy_file $WATCHER_POLICY_YAML
+    iniset $WATCHER_CONF oslo_messaging_rabbit rabbit_userid $RABBIT_USERID
+    iniset $WATCHER_CONF oslo_messaging_rabbit rabbit_password $RABBIT_PASSWORD
+    iniset $WATCHER_CONF oslo_messaging_rabbit rabbit_host $RABBIT_HOST

-    iniset $WATCHER_CONF oslo_messaging_notifications driver "messagingv2"
+    iniset $WATCHER_CONF oslo_messaging_notifications driver "messaging"

    iniset $NOVA_CONF oslo_messaging_notifications topics "notifications,watcher_notifications"
    iniset $NOVA_CONF notifications notify_on_state_change "vm_and_task_state"
@@ -219,13 +154,9 @@ function create_watcher_conf {
        setup_colorized_logging $WATCHER_CONF DEFAULT
    else
        # Show user_name and project_name instead of user_id and project_id
-        iniset $WATCHER_CONF DEFAULT logging_context_format_string "%(asctime)s.%(msecs)03d %(levelname)s %(name)s [%(request_id)s %(project_domain)s %(user_name)s %(project_name)s] %(instance)s%(message)s"
+        iniset $WATCHER_CONF DEFAULT logging_context_format_string "%(asctime)s.%(msecs)03d %(levelname)s %(name)s [%(request_id)s %(user_name)s %(project_name)s] %(instance)s%(message)s"
    fi

-    #config apache files
-    if [[ "$WATCHER_USE_MOD_WSGI" == "True" ]]; then
-        _config_watcher_apache_wsgi
-    fi
    # Register SSL certificates if provided
    if is_ssl_enabled_service watcher; then
        ensure_certificates WATCHER
@@ -257,7 +188,7 @@ function init_watcher {
        recreate_database watcher

        # Create watcher schema
-        $WATCHER_BIN_DIR/watcher-db-manage --config-file $WATCHER_CONF upgrade
+        $WATCHER_BIN_DIR/watcher-db-manage --config-file $WATCHER_CONF upgrade head
    fi
    create_watcher_cache_dir
 }
@@ -274,26 +205,19 @@ function install_watcherclient {
 function install_watcher {
    git_clone $WATCHER_REPO $WATCHER_DIR $WATCHER_BRANCH
    setup_develop $WATCHER_DIR
-    if [[ "$WATCHER_USE_MOD_WSGI" == "True" ]]; then
-        install_apache_wsgi
-    fi
 }

 # start_watcher_api() - Start the API process ahead of other things
 function start_watcher_api {
    # Get right service port for testing
-
    local service_port=$WATCHER_SERVICE_PORT
    local service_protocol=$WATCHER_SERVICE_PROTOCOL
    if is_service_enabled tls-proxy; then
        service_port=$WATCHER_SERVICE_PORT_INT
        service_protocol="http"
    fi
-    if [[ "$WATCHER_USE_MOD_WSGI" == "True" ]]; then
-        restart_apache_server
-    else
-        run_process watcher-api "$WATCHER_BIN_DIR/watcher-api --config-file $WATCHER_CONF"
-    fi
+
+    run_process watcher-api "$WATCHER_BIN_DIR/watcher-api --config-file $WATCHER_CONF"
    echo "Waiting for watcher-api to start..."
    if ! wait_for_service $SERVICE_TIMEOUT $service_protocol://$WATCHER_SERVICE_HOST:$service_port; then
        die $LINENO "watcher-api did not start"
@@ -301,7 +225,8 @@ function start_watcher_api {

    # Start proxies if enabled
    if is_service_enabled tls-proxy; then
-        start_tls_proxy watcher '*' $WATCHER_SERVICE_PORT $WATCHER_SERVICE_HOST $WATCHER_SERVICE_PORT_INT
+        start_tls_proxy '*' $WATCHER_SERVICE_PORT $WATCHER_SERVICE_HOST $WATCHER_SERVICE_PORT_INT &
+        start_tls_proxy '*' $EC2_SERVICE_PORT $WATCHER_SERVICE_HOST $WATCHER_SERVICE_PORT_INT &
    fi
 }

@@ -315,12 +240,7 @@ function start_watcher {

 # stop_watcher() - Stop running processes (non-screen)
 function stop_watcher {
-    if [[ "$WATCHER_USE_MOD_WSGI" == "True" ]]; then
-        disable_apache_site watcher-api
-    else
-        stop_process watcher-api
-    fi
-    for serv in watcher-decision-engine watcher-applier; do
+    for serv in watcher-api watcher-decision-engine watcher-applier; do
        stop_process $serv
    done
 }
--- a/devstack/local.conf.compute
+++ b/devstack/local.conf.compute
@@ -25,7 +25,7 @@ GLANCE_HOSTPORT=${SERVICE_HOST}:9292
 DATABASE_TYPE=mysql

 # Enable services (including neutron)
-ENABLED_SERVICES=n-cpu,n-api-meta,c-vol,q-agt,placement-client
+ENABLED_SERVICES=n-cpu,n-api-meta,c-vol,q-agt

 NOVA_VNC_ENABLED=True
 NOVNCPROXY_URL="http://$SERVICE_HOST:6080/vnc_auto.html"
@@ -35,7 +35,7 @@ VNCSERVER_PROXYCLIENT_ADDRESS=$HOST_IP
 NOVA_INSTANCES_PATH=/opt/stack/data/instances

 # Enable the Ceilometer plugin for the compute agent
-enable_plugin ceilometer git://git.openstack.org/openstack/ceilometer
+enable_plugin ceilometer https://git.openstack.org/openstack/ceilometer
 disable_service ceilometer-acentral,ceilometer-collector,ceilometer-api

 LOGFILE=$DEST/logs/stack.sh.log
--- a/devstack/local.conf.controller
+++ b/devstack/local.conf.controller
@@ -17,31 +17,28 @@ NETWORK_GATEWAY=10.254.1.1 # Change this for your network

 MULTI_HOST=1

-
-#Set this to FALSE if do not want to run watcher-api behind mod-wsgi
-#WATCHER_USE_MOD_WSGI=TRUE
-
 # This is the controller node, so disable nova-compute
 disable_service n-cpu

+# Disable nova-network and use neutron instead
+disable_service n-net
+ENABLED_SERVICES+=,q-svc,q-dhcp,q-meta,q-agt,q-l3,neutron
+
+# Enable remote console access
+enable_service n-cauth
+
 # Enable the Watcher Dashboard plugin
-enable_plugin watcher-dashboard git://git.openstack.org/openstack/watcher-dashboard
+# enable_plugin watcher-dashboard https://git.openstack.org/openstack/watcher-dashboard

 # Enable the Watcher plugin
-enable_plugin watcher git://git.openstack.org/openstack/watcher
+enable_plugin watcher https://git.openstack.org/openstack/watcher

 # Enable the Ceilometer plugin
-enable_plugin ceilometer git://git.openstack.org/openstack/ceilometer
+enable_plugin ceilometer https://git.openstack.org/openstack/ceilometer

 # This is the controller node, so disable the ceilometer compute agent
 disable_service ceilometer-acompute

-# Enable the ceilometer api explicitly(bug:1667678)
-enable_service ceilometer-api
-
-# Enable the Gnocchi plugin
-enable_plugin gnocchi https://github.com/gnocchixyz/gnocchi
-
 LOGFILE=$DEST/logs/stack.sh.log
 LOGDAYS=2

--- a/devstack/plugin.sh
+++ b/devstack/plugin.sh
@@ -7,7 +7,7 @@ _XTRACE_WATCHER_PLUGIN=$(set +o | grep xtrace)
 set -o xtrace

 echo_summary "watcher's plugin.sh was called..."
-. $DEST/watcher/devstack/lib/watcher
+source $DEST/watcher/devstack/lib/watcher

 # Show all of defined environment variables
 (set -o posix; set)
--- a/devstack/settings
+++ b/devstack/settings
@@ -3,9 +3,6 @@
 # Make sure rabbit is enabled
 enable_service rabbit

-# Make sure mysql is enabled
-enable_service mysql
-
 # Enable Watcher services
 enable_service watcher-api
 enable_service watcher-decision-engine
--- a/doc/ext/term.py
+++ b/doc/ext/term.py
@@ -22,7 +22,7 @@ from docutils import nodes
 from docutils.parsers import rst
 from docutils import statemachine

-from watcher.version import version_string
+from watcher.version import version_info


 class BaseWatcherDirective(rst.Directive):
@@ -169,4 +169,4 @@ class WatcherFunc(BaseWatcherDirective):
 def setup(app):
    app.add_directive('watcher-term', WatcherTerm)
    app.add_directive('watcher-func', WatcherFunc)
-    return {'version': version_string}
+    return {'version': version_info.version_string()}
--- a/doc/ext/versioned_notifications.py
+++ b/doc/ext/versioned_notifications.py
@@ -20,7 +20,7 @@ It is used via a single directive in the .rst file

 """

-from docutils.parsers.rst import Directive
+from sphinx.util.compat import Directive
 from docutils import nodes

 from watcher.notifications import base as notification
--- a/doc/notification_samples/action-cancel-end.json
+++ b/doc/notification_samples/action-cancel-end.json
@@ -1,41 +0,0 @@
-{
-  "priority": "INFO",
-  "payload": {
-    "watcher_object.namespace": "watcher",
-    "watcher_object.version": "1.0",
-    "watcher_object.name": "ActionCancelPayload",
-    "watcher_object.data": {
-      "uuid": "10a47dd1-4874-4298-91cf-eff046dbdb8d",
-      "input_parameters": {
-        "param2": 2,
-        "param1": 1
-      },
-      "fault": null,
-      "created_at": "2016-10-18T09:52:05Z",
-      "updated_at": null,
-      "state": "CANCELLED",
-      "action_plan": {
-        "watcher_object.namespace": "watcher",
-        "watcher_object.version": "1.0",
-        "watcher_object.name": "TerseActionPlanPayload",
-        "watcher_object.data": {
-          "uuid": "76be87bd-3422-43f9-93a0-e85a577e3061",
-          "global_efficacy": [],
-          "created_at": "2016-10-18T09:52:05Z",
-          "updated_at": null,
-          "state": "CANCELLING",
-          "audit_uuid": "10a47dd1-4874-4298-91cf-eff046dbdb8d",
-          "strategy_uuid": "cb3d0b58-4415-4d90-b75b-1e96878730e3",
-          "deleted_at": null
-        }
-      },
-      "parents": [],
-      "action_type": "nop",
-      "deleted_at": null
-    }
-  },
-  "event_type": "action.cancel.end",
-  "publisher_id": "infra-optim:node0",
-  "timestamp": "2017-01-01 00:00:00.000000",
-  "message_id": "530b409c-9b6b-459b-8f08-f93dbfeb4d41"
-}
--- a/doc/notification_samples/action-cancel-error.json
+++ b/doc/notification_samples/action-cancel-error.json
@@ -1,51 +0,0 @@
-{
-  "priority": "ERROR",
-  "payload": {
-    "watcher_object.namespace": "watcher",
-    "watcher_object.version": "1.0",
-    "watcher_object.name": "ActionCancelPayload",
-    "watcher_object.data": {
-      "uuid": "10a47dd1-4874-4298-91cf-eff046dbdb8d",
-      "input_parameters": {
-        "param2": 2,
-        "param1": 1
-      },
-      "fault": {
-        "watcher_object.namespace": "watcher",
-        "watcher_object.version": "1.0",
-        "watcher_object.name": "ExceptionPayload",
-        "watcher_object.data": {
-          "module_name": "watcher.tests.notifications.test_action_notification",
-          "exception": "WatcherException",
-          "exception_message": "TEST",
-          "function_name": "test_send_action_cancel_with_error"
-        }
-      },
-      "created_at": "2016-10-18T09:52:05Z",
-      "updated_at": null,
-      "state": "FAILED",
-      "action_plan": {
-        "watcher_object.namespace": "watcher",
-        "watcher_object.version": "1.0",
-        "watcher_object.name": "TerseActionPlanPayload",
-        "watcher_object.data": {
-          "uuid": "76be87bd-3422-43f9-93a0-e85a577e3061",
-          "global_efficacy": [],
-          "created_at": "2016-10-18T09:52:05Z",
-          "updated_at": null,
-          "state": "CANCELLING",
-          "audit_uuid": "10a47dd1-4874-4298-91cf-eff046dbdb8d",
-          "strategy_uuid": "cb3d0b58-4415-4d90-b75b-1e96878730e3",
-          "deleted_at": null
-        }
-      },
-      "parents": [],
-      "action_type": "nop",
-      "deleted_at": null
-    }
-  },
-  "event_type": "action.cancel.error",
-  "publisher_id": "infra-optim:node0",
-  "timestamp": "2017-01-01 00:00:00.000000",
-  "message_id": "530b409c-9b6b-459b-8f08-f93dbfeb4d41"
-}
--- a/doc/notification_samples/action-cancel-start.json
+++ b/doc/notification_samples/action-cancel-start.json
@@ -1,41 +0,0 @@
-{
-  "priority": "INFO",
-  "payload": {
-    "watcher_object.namespace": "watcher",
-    "watcher_object.version": "1.0",
-    "watcher_object.name": "ActionCancelPayload",
-    "watcher_object.data": {
-      "uuid": "10a47dd1-4874-4298-91cf-eff046dbdb8d",
-      "input_parameters": {
-        "param2": 2,
-        "param1": 1
-      },
-      "fault": null,
-      "created_at": "2016-10-18T09:52:05Z",
-      "updated_at": null,
-      "state": "CANCELLING",
-      "action_plan": {
-        "watcher_object.namespace": "watcher",
-        "watcher_object.version": "1.0",
-        "watcher_object.name": "TerseActionPlanPayload",
-        "watcher_object.data": {
-          "uuid": "76be87bd-3422-43f9-93a0-e85a577e3061",
-          "global_efficacy": [],
-          "created_at": "2016-10-18T09:52:05Z",
-          "updated_at": null,
-          "state": "CANCELLING",
-          "audit_uuid": "10a47dd1-4874-4298-91cf-eff046dbdb8d",
-          "strategy_uuid": "cb3d0b58-4415-4d90-b75b-1e96878730e3",
-          "deleted_at": null
-        }
-      },
-      "parents": [],
-      "action_type": "nop",
-      "deleted_at": null
-    }
-  },
-  "event_type": "action.cancel.start",
-  "publisher_id": "infra-optim:node0",
-  "timestamp": "2017-01-01 00:00:00.000000",
-  "message_id": "530b409c-9b6b-459b-8f08-f93dbfeb4d41"
-}
--- a/doc/notification_samples/action-create.json
+++ b/doc/notification_samples/action-create.json
@@ -1,40 +0,0 @@
-{
-  "priority": "INFO",
-  "payload": {
-    "watcher_object.namespace": "watcher",
-    "watcher_object.version": "1.0",
-    "watcher_object.name": "ActionCreatePayload",
-    "watcher_object.data": {
-      "uuid": "10a47dd1-4874-4298-91cf-eff046dbdb8d",
-      "input_parameters": {
-        "param2": 2,
-        "param1": 1
-      },
-      "created_at": "2016-10-18T09:52:05Z",
-      "updated_at": null,
-      "state": "PENDING",
-      "action_plan": {
-        "watcher_object.namespace": "watcher",
-        "watcher_object.version": "1.0",
-        "watcher_object.name": "TerseActionPlanPayload",
-        "watcher_object.data": {
-          "uuid": "76be87bd-3422-43f9-93a0-e85a577e3061",
-          "global_efficacy": {},
-          "created_at": "2016-10-18T09:52:05Z",
-          "updated_at": null,
-          "state": "ONGOING",
-          "audit_uuid": "10a47dd1-4874-4298-91cf-eff046dbdb8d",
-          "strategy_uuid": "cb3d0b58-4415-4d90-b75b-1e96878730e3",
-          "deleted_at": null
-        }
-      },
-      "parents": [],
-      "action_type": "nop",
-      "deleted_at": null
-    }
-  },
-  "publisher_id": "infra-optim:node0",
-  "timestamp": "2017-01-01 00:00:00.000000",
-  "event_type": "action.create",
-  "message_id": "530b409c-9b6b-459b-8f08-f93dbfeb4d41"
-}
--- a/doc/notification_samples/action-delete.json
+++ b/doc/notification_samples/action-delete.json
@@ -1,40 +0,0 @@
-{
-  "priority": "INFO",
-  "payload": {
-    "watcher_object.namespace": "watcher",
-    "watcher_object.version": "1.0",
-    "watcher_object.name": "ActionDeletePayload",
-    "watcher_object.data": {
-      "uuid": "10a47dd1-4874-4298-91cf-eff046dbdb8d",
-      "input_parameters": {
-        "param2": 2,
-        "param1": 1
-      },
-      "created_at": "2016-10-18T09:52:05Z",
-      "updated_at": null,
-      "state": "DELETED",
-      "action_plan": {
-        "watcher_object.namespace": "watcher",
-        "watcher_object.version": "1.0",
-        "watcher_object.name": "TerseActionPlanPayload",
-        "watcher_object.data": {
-          "uuid": "76be87bd-3422-43f9-93a0-e85a577e3061",
-          "global_efficacy": {},
-          "created_at": "2016-10-18T09:52:05Z",
-          "updated_at": null,
-          "state": "ONGOING",
-          "audit_uuid": "10a47dd1-4874-4298-91cf-eff046dbdb8d",
-          "strategy_uuid": "cb3d0b58-4415-4d90-b75b-1e96878730e3",
-          "deleted_at": null
-        }
-      },
-      "parents": [],
-      "action_type": "nop",
-      "deleted_at": null
-    }
-  },
-  "publisher_id": "infra-optim:node0",
-  "timestamp": "2017-01-01 00:00:00.000000",
-  "event_type": "action.delete",
-  "message_id": "530b409c-9b6b-459b-8f08-f93dbfeb4d41"
-}
--- a/doc/notification_samples/action-execution-end.json
+++ b/doc/notification_samples/action-execution-end.json
@@ -1,41 +0,0 @@
-{
-  "priority": "INFO",
-  "payload": {
-    "watcher_object.namespace": "watcher",
-    "watcher_object.version": "1.0",
-    "watcher_object.name": "ActionExecutionPayload",
-    "watcher_object.data": {
-      "uuid": "10a47dd1-4874-4298-91cf-eff046dbdb8d",
-      "input_parameters": {
-        "param2": 2,
-        "param1": 1
-      },
-      "fault": null,
-      "created_at": "2016-10-18T09:52:05Z",
-      "updated_at": null,
-      "state": "SUCCEEDED",
-      "action_plan": {
-        "watcher_object.namespace": "watcher",
-        "watcher_object.version": "1.0",
-        "watcher_object.name": "TerseActionPlanPayload",
-        "watcher_object.data": {
-          "uuid": "76be87bd-3422-43f9-93a0-e85a577e3061",
-          "global_efficacy": [],
-          "created_at": "2016-10-18T09:52:05Z",
-          "updated_at": null,
-          "state": "ONGOING",
-          "audit_uuid": "10a47dd1-4874-4298-91cf-eff046dbdb8d",
-          "strategy_uuid": "cb3d0b58-4415-4d90-b75b-1e96878730e3",
-          "deleted_at": null
-        }
-      },
-      "parents": [],
-      "action_type": "nop",
-      "deleted_at": null
-    }
-  },
-  "event_type": "action.execution.end",
-  "publisher_id": "infra-optim:node0",
-  "timestamp": "2017-01-01 00:00:00.000000",
-  "message_id": "530b409c-9b6b-459b-8f08-f93dbfeb4d41"
-}
--- a/doc/notification_samples/action-execution-error.json
+++ b/doc/notification_samples/action-execution-error.json
@@ -1,51 +0,0 @@
-{
-  "priority": "ERROR",
-  "payload": {
-    "watcher_object.namespace": "watcher",
-    "watcher_object.version": "1.0",
-    "watcher_object.name": "ActionExecutionPayload",
-    "watcher_object.data": {
-      "uuid": "10a47dd1-4874-4298-91cf-eff046dbdb8d",
-      "input_parameters": {
-        "param2": 2,
-        "param1": 1
-      },
-      "fault": {
-        "watcher_object.namespace": "watcher",
-        "watcher_object.version": "1.0",
-        "watcher_object.name": "ExceptionPayload",
-        "watcher_object.data": {
-          "module_name": "watcher.tests.notifications.test_action_notification",
-          "exception": "WatcherException",
-          "exception_message": "TEST",
-          "function_name": "test_send_action_execution_with_error"
-        }
-      },
-      "created_at": "2016-10-18T09:52:05Z",
-      "updated_at": null,
-      "state": "FAILED",
-      "action_plan": {
-        "watcher_object.namespace": "watcher",
-        "watcher_object.version": "1.0",
-        "watcher_object.name": "TerseActionPlanPayload",
-        "watcher_object.data": {
-          "uuid": "76be87bd-3422-43f9-93a0-e85a577e3061",
-          "global_efficacy":[],
-          "created_at": "2016-10-18T09:52:05Z",
-          "updated_at": null,
-          "state": "ONGOING",
-          "audit_uuid": "10a47dd1-4874-4298-91cf-eff046dbdb8d",
-          "strategy_uuid": "cb3d0b58-4415-4d90-b75b-1e96878730e3",
-          "deleted_at": null
-        }
-      },
-      "parents": [],
-      "action_type": "nop",
-      "deleted_at": null
-    }
-  },
-  "event_type": "action.execution.error",
-  "publisher_id": "infra-optim:node0",
-  "timestamp": "2017-01-01 00:00:00.000000",
-  "message_id": "530b409c-9b6b-459b-8f08-f93dbfeb4d41"
-}
--- a/doc/notification_samples/action-execution-start.json
+++ b/doc/notification_samples/action-execution-start.json
@@ -1,41 +0,0 @@
-{
-  "priority": "INFO",
-  "payload": {
-    "watcher_object.namespace": "watcher",
-    "watcher_object.version": "1.0",
-    "watcher_object.name": "ActionExecutionPayload",
-    "watcher_object.data": {
-      "uuid": "10a47dd1-4874-4298-91cf-eff046dbdb8d",
-      "input_parameters": {
-        "param2": 2,
-        "param1": 1
-      },
-      "fault": null,
-      "created_at": "2016-10-18T09:52:05Z",
-      "updated_at": null,
-      "state": "ONGOING",
-      "action_plan": {
-        "watcher_object.namespace": "watcher",
-        "watcher_object.version": "1.0",
-        "watcher_object.name": "TerseActionPlanPayload",
-        "watcher_object.data": {
-          "uuid": "76be87bd-3422-43f9-93a0-e85a577e3061",
-          "global_efficacy": [],
-          "created_at": "2016-10-18T09:52:05Z",
-          "updated_at": null,
-          "state": "ONGOING",
-          "audit_uuid": "10a47dd1-4874-4298-91cf-eff046dbdb8d",
-          "strategy_uuid": "cb3d0b58-4415-4d90-b75b-1e96878730e3",
-          "deleted_at": null
-        }
-      },
-      "parents": [],
-      "action_type": "nop",
-      "deleted_at": null
-    }
-  },
-  "event_type": "action.execution.start",
-  "publisher_id": "infra-optim:node0",
-  "timestamp": "2017-01-01 00:00:00.000000",
-  "message_id": "530b409c-9b6b-459b-8f08-f93dbfeb4d41"
-}
--- a/doc/notification_samples/action-update.json
+++ b/doc/notification_samples/action-update.json
@@ -1,49 +0,0 @@
-{
-  "priority": "INFO",
-  "payload": {
-    "watcher_object.namespace": "watcher",
-    "watcher_object.version": "1.0",
-    "watcher_object.name": "ActionUpdatePayload",
-    "watcher_object.data": {
-      "uuid": "10a47dd1-4874-4298-91cf-eff046dbdb8d",
-      "input_parameters": {
-        "param2": 2,
-        "param1": 1
-      },
-      "created_at": "2016-10-18T09:52:05Z",
-      "updated_at": null,
-      "state_update": {
-        "watcher_object.namespace": "watcher",
-        "watcher_object.version": "1.0",
-        "watcher_object.name": "ActionStateUpdatePayload",
-        "watcher_object.data": {
-          "old_state": "PENDING",
-          "state": "ONGOING"
-        }
-      },
-      "state": "ONGOING",
-      "action_plan": {
-        "watcher_object.namespace": "watcher",
-        "watcher_object.version": "1.0",
-        "watcher_object.name": "TerseActionPlanPayload",
-        "watcher_object.data": {
-          "uuid": "76be87bd-3422-43f9-93a0-e85a577e3061",
-          "global_efficacy": {},
-          "created_at": "2016-10-18T09:52:05Z",
-          "updated_at": null,
-          "state": "ONGOING",
-          "audit_uuid": "10a47dd1-4874-4298-91cf-eff046dbdb8d",
-          "strategy_uuid": "cb3d0b58-4415-4d90-b75b-1e96878730e3",
-          "deleted_at": null
-        }
-      },
-      "parents": [],
-      "action_type": "nop",
-      "deleted_at": null
-    }
-  },
-  "event_type": "action.update",
-  "publisher_id": "infra-optim:node0",
-  "timestamp": "2017-01-01 00:00:00.000000",
-  "message_id": "530b409c-9b6b-459b-8f08-f93dbfeb4d41"
-}
--- a/doc/notification_samples/action_plan-cancel-end.json
+++ b/doc/notification_samples/action_plan-cancel-end.json
@@ -1,55 +0,0 @@
-{
-  "event_type": "action_plan.cancel.end",
-  "payload": {
-    "watcher_object.namespace": "watcher",
-    "watcher_object.name": "ActionPlanCancelPayload",
-    "watcher_object.version": "1.0",
-    "watcher_object.data": {
-      "created_at": "2016-10-18T09:52:05Z",
-      "deleted_at": null,
-      "audit_uuid": "10a47dd1-4874-4298-91cf-eff046dbdb8d",
-      "audit": {
-        "watcher_object.namespace": "watcher",
-        "watcher_object.name": "TerseAuditPayload",
-        "watcher_object.version": "1.0",
-        "watcher_object.data": {
-          "created_at": "2016-10-18T09:52:05Z",
-          "deleted_at": null,
-          "uuid": "10a47dd1-4874-4298-91cf-eff046dbdb8d",
-          "goal_uuid": "bc830f84-8ae3-4fc6-8bc6-e3dd15e8b49a",
-          "strategy_uuid": "75234dfe-87e3-4f11-a0e0-3c3305d86a39",
-          "scope": [],
-          "audit_type": "ONESHOT",
-          "state": "SUCCEEDED",
-          "parameters": {},
-          "interval": null,
-          "updated_at": null
-        }
-      },
-      "uuid": "76be87bd-3422-43f9-93a0-e85a577e3061",
-      "fault": null,
-      "state": "CANCELLED",
-      "global_efficacy": [],
-      "strategy_uuid": "cb3d0b58-4415-4d90-b75b-1e96878730e3",
-      "strategy": {
-        "watcher_object.namespace": "watcher",
-        "watcher_object.name": "StrategyPayload",
-        "watcher_object.version": "1.0",
-        "watcher_object.data": {
-          "created_at": "2016-10-18T09:52:05Z",
-          "deleted_at": null,
-          "name": "TEST",
-          "uuid": "cb3d0b58-4415-4d90-b75b-1e96878730e3",
-          "parameters_spec": {},
-          "display_name": "test strategy",
-          "updated_at": null
-        }
-      },
-      "updated_at": null
-    }
-  },
-  "priority": "INFO",
-  "message_id": "3984dc2b-8aef-462b-a220-8ae04237a56e",
-  "timestamp": "2016-10-18 09:52:05.219414",
-  "publisher_id": "infra-optim:node0"
-}
--- a/doc/notification_samples/action_plan-cancel-error.json
+++ b/doc/notification_samples/action_plan-cancel-error.json
@@ -1,65 +0,0 @@
-{
-  "event_type": "action_plan.cancel.error",
-  "publisher_id": "infra-optim:node0",
-  "priority": "ERROR",
-  "message_id": "9a45c5ae-0e21-4300-8fa0-5555d52a66d9",
-  "payload": {
-    "watcher_object.version": "1.0",
-    "watcher_object.namespace": "watcher",
-    "watcher_object.name": "ActionPlanCancelPayload",
-    "watcher_object.data": {
-      "fault": {
-        "watcher_object.version": "1.0",
-        "watcher_object.namespace": "watcher",
-        "watcher_object.name": "ExceptionPayload",
-        "watcher_object.data": {
-          "exception_message": "TEST",
-          "module_name": "watcher.tests.notifications.test_action_plan_notification",
-          "function_name": "test_send_action_plan_cancel_with_error",
-          "exception": "WatcherException"
-        }
-      },
-      "uuid": "76be87bd-3422-43f9-93a0-e85a577e3061",
-      "created_at": "2016-10-18T09:52:05Z",
-      "strategy_uuid": "cb3d0b58-4415-4d90-b75b-1e96878730e3",
-      "strategy": {
-        "watcher_object.version": "1.0",
-        "watcher_object.namespace": "watcher",
-        "watcher_object.name": "StrategyPayload",
-        "watcher_object.data": {
-          "uuid": "cb3d0b58-4415-4d90-b75b-1e96878730e3",
-          "created_at": "2016-10-18T09:52:05Z",
-          "name": "TEST",
-          "updated_at": null,
-          "display_name": "test strategy",
-          "parameters_spec": {},
-          "deleted_at": null
-        }
-      },
-      "updated_at": null,
-      "deleted_at": null,
-      "audit_uuid": "10a47dd1-4874-4298-91cf-eff046dbdb8d",
-      "audit": {
-        "watcher_object.version": "1.0",
-        "watcher_object.namespace": "watcher",
-        "watcher_object.name": "TerseAuditPayload",
-        "watcher_object.data": {
-          "parameters": {},
-          "uuid": "10a47dd1-4874-4298-91cf-eff046dbdb8d",
-          "goal_uuid": "bc830f84-8ae3-4fc6-8bc6-e3dd15e8b49a",
-          "strategy_uuid": "75234dfe-87e3-4f11-a0e0-3c3305d86a39",
-          "created_at": "2016-10-18T09:52:05Z",
-          "scope": [],
-          "updated_at": null,
-          "audit_type": "ONESHOT",
-          "interval": null,
-          "deleted_at": null,
-          "state": "SUCCEEDED"
-        }
-      },
-      "global_efficacy": [],
-      "state": "CANCELLING"
-    }
-  },
-  "timestamp": "2016-10-18 09:52:05.219414"
-}
--- a/doc/notification_samples/action_plan-cancel-start.json
+++ b/doc/notification_samples/action_plan-cancel-start.json
@@ -1,55 +0,0 @@
-{
-  "event_type": "action_plan.cancel.start",
-  "payload": {
-    "watcher_object.namespace": "watcher",
-    "watcher_object.name": "ActionPlanCancelPayload",
-    "watcher_object.version": "1.0",
-    "watcher_object.data": {
-      "created_at": "2016-10-18T09:52:05Z",
-      "deleted_at": null,
-      "audit_uuid": "10a47dd1-4874-4298-91cf-eff046dbdb8d",
-      "audit": {
-        "watcher_object.namespace": "watcher",
-        "watcher_object.name": "TerseAuditPayload",
-        "watcher_object.version": "1.0",
-        "watcher_object.data": {
-          "created_at": "2016-10-18T09:52:05Z",
-          "deleted_at": null,
-          "uuid": "10a47dd1-4874-4298-91cf-eff046dbdb8d",
-          "goal_uuid": "bc830f84-8ae3-4fc6-8bc6-e3dd15e8b49a",
-          "strategy_uuid": "75234dfe-87e3-4f11-a0e0-3c3305d86a39",
-          "scope": [],
-          "audit_type": "ONESHOT",
-          "state": "SUCCEEDED",
-          "parameters": {},
-          "interval": null,
-          "updated_at": null
-        }
-      },
-      "uuid": "76be87bd-3422-43f9-93a0-e85a577e3061",
-      "fault": null,
-      "state": "CANCELLING",
-      "global_efficacy": [],
-      "strategy_uuid": "cb3d0b58-4415-4d90-b75b-1e96878730e3",
-      "strategy": {
-        "watcher_object.namespace": "watcher",
-        "watcher_object.name": "StrategyPayload",
-        "watcher_object.version": "1.0",
-        "watcher_object.data": {
-          "created_at": "2016-10-18T09:52:05Z",
-          "deleted_at": null,
-          "name": "TEST",
-          "uuid": "cb3d0b58-4415-4d90-b75b-1e96878730e3",
-          "parameters_spec": {},
-          "display_name": "test strategy",
-          "updated_at": null
-        }
-      },
-      "updated_at": null
-    }
-  },
-  "priority": "INFO",
-  "message_id": "3984dc2b-8aef-462b-a220-8ae04237a56e",
-  "timestamp": "2016-10-18 09:52:05.219414",
-  "publisher_id": "infra-optim:node0"
-}
--- a/doc/notification_samples/action_plan-create.json
+++ b/doc/notification_samples/action_plan-create.json
@@ -23,7 +23,6 @@
      "audit": {
        "watcher_object.version": "1.0",
        "watcher_object.data": {
-          "name": "my_audit",
          "audit_type": "ONESHOT",
          "scope": [],
          "uuid": "10a47dd1-4874-4298-91cf-eff046dbdb8d",
--- a/doc/notification_samples/action_plan-delete.json
+++ b/doc/notification_samples/action_plan-delete.json
@@ -8,7 +8,6 @@
      "audit_uuid": "10a47dd1-4874-4298-91cf-eff046dbdb8d",
      "audit": {
        "watcher_object.data": {
-          "name": "my_audit",
          "uuid": "10a47dd1-4874-4298-91cf-eff046dbdb8d",
          "goal_uuid": "bc830f84-8ae3-4fc6-8bc6-e3dd15e8b49a",
          "strategy_uuid": "75234dfe-87e3-4f11-a0e0-3c3305d86a39",
--- a/doc/notification_samples/action_plan-execution-end.json
+++ b/doc/notification_samples/action_plan-execution-end.json
@@ -15,7 +15,6 @@
        "watcher_object.data": {
          "created_at": "2016-10-18T09:52:05Z",
          "deleted_at": null,
-          "name": "my_audit",
          "uuid": "10a47dd1-4874-4298-91cf-eff046dbdb8d",
          "goal_uuid": "bc830f84-8ae3-4fc6-8bc6-e3dd15e8b49a",
          "strategy_uuid": "75234dfe-87e3-4f11-a0e0-3c3305d86a39",
@@ -30,7 +29,7 @@
      "uuid": "76be87bd-3422-43f9-93a0-e85a577e3061",
      "fault": null,
      "state": "ONGOING",
-      "global_efficacy": [],
+      "global_efficacy": {},
      "strategy_uuid": "cb3d0b58-4415-4d90-b75b-1e96878730e3",
      "strategy": {
        "watcher_object.namespace": "watcher",
--- a/doc/notification_samples/action_plan-execution-error.json
+++ b/doc/notification_samples/action_plan-execution-error.json
@@ -45,7 +45,6 @@
        "watcher_object.name": "TerseAuditPayload",
        "watcher_object.data": {
          "parameters": {},
-          "name": "my_audit",
          "uuid": "10a47dd1-4874-4298-91cf-eff046dbdb8d",
          "goal_uuid": "bc830f84-8ae3-4fc6-8bc6-e3dd15e8b49a",
          "strategy_uuid": "75234dfe-87e3-4f11-a0e0-3c3305d86a39",
@@ -58,7 +57,7 @@
          "state": "PENDING"
        }
      },
-      "global_efficacy": [],
+      "global_efficacy": {},
      "state": "ONGOING"
    }
  },
--- a/doc/notification_samples/action_plan-execution-start.json
+++ b/doc/notification_samples/action_plan-execution-start.json
@@ -15,7 +15,6 @@
        "watcher_object.data": {
          "created_at": "2016-10-18T09:52:05Z",
          "deleted_at": null,
-          "name": "my_audit",
          "uuid": "10a47dd1-4874-4298-91cf-eff046dbdb8d",
          "goal_uuid": "bc830f84-8ae3-4fc6-8bc6-e3dd15e8b49a",
          "strategy_uuid": "75234dfe-87e3-4f11-a0e0-3c3305d86a39",
@@ -30,7 +29,7 @@
      "uuid": "76be87bd-3422-43f9-93a0-e85a577e3061",
      "fault": null,
      "state": "ONGOING",
-      "global_efficacy": [],
+      "global_efficacy": {},
      "strategy_uuid": "cb3d0b58-4415-4d90-b75b-1e96878730e3",
      "strategy": {
        "watcher_object.namespace": "watcher",
--- a/doc/notification_samples/action_plan-update.json
+++ b/doc/notification_samples/action_plan-update.json
@@ -6,7 +6,6 @@
      "audit": {
        "watcher_object.version": "1.0",
        "watcher_object.data": {
-          "name": "my_audit",
          "audit_type": "ONESHOT",
          "scope": [],
          "created_at": "2016-10-18T09:52:05Z",
--- a/doc/notification_samples/audit-create.json
+++ b/doc/notification_samples/audit-create.json
@@ -2,7 +2,6 @@
  "priority": "INFO",
  "payload": {
    "watcher_object.data": {
-      "name": "my_audit",
      "audit_type": "ONESHOT",
      "parameters": {
        "para2": "hello",
--- a/doc/notification_samples/audit-delete.json
+++ b/doc/notification_samples/audit-delete.json
@@ -2,7 +2,6 @@
  "priority": "INFO",
  "payload": {
    "watcher_object.data": {
-      "name": "my_audit",
      "audit_type": "ONESHOT",
      "parameters": {
        "para2": "hello",
--- a/doc/notification_samples/audit-planner-end.json
+++ b/doc/notification_samples/audit-planner-end.json
@@ -2,7 +2,6 @@
  "priority": "INFO",
  "payload": {
    "watcher_object.data": {
-      "name": "my_audit",
      "audit_type": "ONESHOT",
      "parameters": {
        "para2": "hello",
--- a/doc/notification_samples/audit-planner-error.json
+++ b/doc/notification_samples/audit-planner-error.json
@@ -2,7 +2,6 @@
  "priority": "ERROR",
  "payload": {
    "watcher_object.data": {
-      "name": "my_audit",
      "audit_type": "ONESHOT",
      "parameters": {
        "para2": "hello",
--- a/doc/notification_samples/audit-planner-start.json
+++ b/doc/notification_samples/audit-planner-start.json
@@ -2,7 +2,6 @@
  "priority": "INFO",
  "payload": {
    "watcher_object.data": {
-      "name": "my_audit",
      "audit_type": "ONESHOT",
      "parameters": {
        "para2": "hello",
--- a/doc/notification_samples/audit-strategy-end.json
+++ b/doc/notification_samples/audit-strategy-end.json
@@ -2,7 +2,6 @@
  "priority": "INFO",
  "payload": {
    "watcher_object.data": {
-      "name": "my_audit",
      "audit_type": "ONESHOT",
      "parameters": {
        "para2": "hello",
--- a/doc/notification_samples/audit-strategy-error.json
+++ b/doc/notification_samples/audit-strategy-error.json
@@ -2,7 +2,6 @@
  "priority": "ERROR",
  "payload": {
    "watcher_object.data": {
-      "name": "my_audit",
      "audit_type": "ONESHOT",
      "parameters": {
        "para2": "hello",
--- a/doc/notification_samples/audit-strategy-start.json
+++ b/doc/notification_samples/audit-strategy-start.json
@@ -2,7 +2,6 @@
  "priority": "INFO",
  "payload": {
    "watcher_object.data": {
-      "name": "my_audit",
      "audit_type": "ONESHOT",
      "parameters": {
        "para2": "hello",
--- a/doc/notification_samples/audit-update.json
+++ b/doc/notification_samples/audit-update.json
@@ -4,7 +4,6 @@
  "payload": {
    "watcher_object.name": "AuditUpdatePayload",
    "watcher_object.data": {
-      "name": "my_audit",
      "strategy_uuid": "75234dfe-87e3-4f11-a0e0-3c3305d86a39",
      "strategy": {
        "watcher_object.name": "StrategyPayload",
--- a/doc/notification_samples/service-update.json
+++ b/doc/notification_samples/service-update.json
@@ -1,26 +0,0 @@
-{
-    "payload": {
-        "watcher_object.name": "ServiceUpdatePayload",
-        "watcher_object.namespace": "watcher",
-        "watcher_object.data": {
-            "status_update": {
-                "watcher_object.name": "ServiceStatusUpdatePayload",
-                "watcher_object.namespace": "watcher",
-                "watcher_object.data": {
-                    "old_state": "ACTIVE",
-                    "state": "FAILED"
-                },
-                "watcher_object.version": "1.0"
-            },
-            "last_seen_up": "2016-09-22T08:32:06Z",
-            "name": "watcher-service",
-            "sevice_host": "controller"
-        },
-        "watcher_object.version": "1.0"
-    },
-    "event_type": "service.update",
-    "priority": "INFO",
-    "message_id": "3984dc2b-8aef-462b-a220-8ae04237a56e",
-    "timestamp": "2016-10-18 09:52:05.219414",
-    "publisher_id": "infra-optim:node0"
-}
--- a/doc/source/admin/apache-mod-wsgi.rst
+++ b/doc/source/admin/apache-mod-wsgi.rst
@@ -1,49 +0,0 @@
-..
-      Except where otherwise noted, this document is licensed under Creative
-      Commons Attribution 3.0 License.  You can view the license at:
-
-          https://creativecommons.org/licenses/by/3.0/
-
-
-Installing API behind mod_wsgi
-==============================
-
-#. Install the Apache Service::
-
-    Fedora 21/RHEL7/CentOS7:
-      sudo yum install httpd
-
-    Fedora 22 (or higher):
-      sudo dnf install httpd
-
-    Debian/Ubuntu:
-      apt-get install apache2
-
-#. Copy ``etc/apache2/watcher.conf`` under the apache sites::
-
-    Fedora/RHEL7/CentOS7:
-      sudo cp etc/apache2/watcher /etc/httpd/conf.d/watcher.conf
-
-    Debian/Ubuntu:
-      sudo cp etc/apache2/watcher /etc/apache2/sites-available/watcher.conf
-
-#. Edit ``<apache-configuration-dir>/watcher.conf`` according to installation
-   and environment.
-
-   * Modify the ``WSGIDaemonProcess`` directive to set the ``user`` and
-     ``group`` values to appropriate user on your server.
-   * Modify the ``WSGIScriptAlias`` directive to point to the
-     watcher/api/app.wsgi script.
-   * Modify the ``Directory`` directive to set the path to the Watcher API
-     code.
-   * Modify the ``ErrorLog and CustomLog`` to redirect the logs to the right
-     directory.
-
-#. Enable the apache watcher site and reload::
-
-    Fedora/RHEL7/CentOS7:
-      sudo systemctl reload httpd
-
-   Debian/Ubuntu:
-    sudo a2ensite watcher
-    sudo service apache2 reload
--- a/doc/source/admin/index.rst
+++ b/doc/source/admin/index.rst
@@ -1,12 +0,0 @@
-===================
-Administrator Guide
-===================
-
-.. toctree::
-   :maxdepth: 2
-
-   apache-mod-wsgi
-   gmr
-   policy
-   ways-to-install
-   ../strategies/index
--- a/doc/source/api/index.rst
+++ b/doc/source/api/index.rst
@@ -1,8 +0,0 @@
-==================================================
-OpenStack Infrastructure Optimization Service APIs
-==================================================
-
-.. toctree::
-   :maxdepth: 1
-
-   v1
--- a/doc/source/architecture.rst
+++ b/doc/source/architecture.rst
@@ -119,7 +119,7 @@ The watcher command-line interface (CLI) can be used to interact with the
 Watcher system in order to control it or to know its current status.

 Please, read `the detailed documentation about Watcher CLI
-<https://docs.openstack.org/python-watcherclient/latest/cli/>`_.
+<https://factory.b-com.com/www/watcher/doc/python-watcherclient/>`_.

 .. _archi_watcher_dashboard_definition:

@@ -130,7 +130,7 @@ The Watcher Dashboard can be used to interact with the Watcher system through
 Horizon in order to control it or to know its current status.

 Please, read `the detailed documentation about Watcher Dashboard
-<https://docs.openstack.org/watcher-dashboard/latest>`_.
+<http://docs.openstack.org/developer/watcher-dashboard/>`_.

 .. _archi_watcher_database_definition:

@@ -170,7 +170,7 @@ Unless specified, it then selects the most appropriate :ref:`strategy
 goal.

 The :ref:`Strategy <strategy_definition>` is then dynamically loaded (via
-`stevedore <https://docs.openstack.org/stevedore/latest>`_). The
+`stevedore <http://docs.openstack.org/developer/stevedore/>`_). The
 :ref:`Watcher Decision Engine <watcher_decision_engine_definition>` executes
 the strategy.

@@ -407,9 +407,6 @@ be one of the following:
 -  **CANCELLED** : the :ref:`Audit <audit_definition>` was in **PENDING** or
   **ONGOING** state and was cancelled by the
   :ref:`Administrator <administrator_definition>`
-  **SUSPENDED** : the :ref:`Audit <audit_definition>` was in **ONGOING**
-   state and was suspended by the
-   :ref:`Administrator <administrator_definition>`

 The following diagram shows the different possible states of an
 :ref:`Audit <audit_definition>` and what event makes the state change to a new
--- a/doc/source/conf.py
+++ b/doc/source/conf.py
@@ -31,7 +31,8 @@ sys.path.insert(0, os.path.abspath('./'))
 # Add any Sphinx extension module names here, as strings. They can be
 # extensions coming with Sphinx (named 'sphinx.ext.*') or your custom ones.
 extensions = [
-    'oslo_config.sphinxext',
+    'oslo_config.sphinxconfiggen',
+    'oslosphinx',
    'sphinx.ext.autodoc',
    'sphinx.ext.viewcode',
    'sphinxcontrib.httpdomain',
@@ -40,15 +41,10 @@ extensions = [
    'wsmeext.sphinxext',
    'ext.term',
    'ext.versioned_notifications',
-    'oslo_config.sphinxconfiggen',
-    'openstackdocstheme',
-    'sphinx.ext.napoleon',
 ]

 wsme_protocols = ['restjson']
-config_generator_config_file = [(
-    '../../etc/watcher/oslo-config-generator/watcher.conf',
-    '_static/watcher')]
+config_generator_config_file = '../../etc/watcher/watcher-config-generator.conf'
 sample_config_basename = 'watcher'

 # autodoc generation is a bit aggressive and a nuisance when doing heavy
@@ -73,7 +69,7 @@ copyright = u'OpenStack Foundation'
 # The full version, including alpha/beta/rc tags.
 release = watcher_version.version_info.release_string()
 # The short X.Y version.
-version = watcher_version.version_string
+version = watcher_version.version_info.version_string()

 # A list of ignored prefixes for module index sorting.
 modindex_common_prefix = ['watcher.']
@@ -96,8 +92,6 @@ add_function_parentheses = True
 # unit titles (such as .. function::).
 add_module_names = True

-suppress_warnings = ['app.add_directive']
-
 # The name of the Pygments (syntax highlighting) style to use.
 pygments_style = 'sphinx'

@@ -123,20 +117,12 @@ man_pages = [
 # Sphinx are currently 'default' and 'sphinxdoc'.
 # html_theme_path = ["."]
 # html_theme = '_theme'
-html_theme = 'openstackdocs'
 # html_static_path = ['static']
-# html_theme_options = {}
+html_theme_options = {'incubating': True}

 # Output file base name for HTML help builder.
 htmlhelp_basename = '%sdoc' % project

-html_last_updated_fmt = '%Y-%m-%d %H:%M'
-
-#openstackdocstheme options
-repository_name = 'openstack/watcher'
-bug_project = 'watcher'
-bug_tag = ''
-
 # Grouping the document tree into LaTeX files. List of tuples
 # (source start file, target name, title, author, documentclass
 # [howto/manual]).
--- a/doc/source/config-generator.conf
+++ b/doc/source/config-generator.conf
@@ -0,0 +1 @@
+../../etc/watcher/watcher-config-generator.conf
--- a/doc/source/configuration/index.rst
+++ b/doc/source/configuration/index.rst
@@ -1,9 +0,0 @@
-===================
-Configuration Guide
-===================
-
-.. toctree::
-   :maxdepth: 2
-
-   configuring
-   watcher
--- a/doc/source/configuration/watcher.rst
+++ b/doc/source/configuration/watcher.rst
@@ -1,11 +0,0 @@
-.. _watcher_sample_configuration_files:
-
------------
-watcher.conf
------------
-
-The ``watcher.conf`` file contains most of the options to configure the
-Watcher services.
-
-.. show-options::
-   :config-file: etc/watcher/oslo-config-generator/watcher.conf
--- a/doc/source/contributor/index.rst
+++ b/doc/source/contributor/index.rst
@@ -1,8 +0,0 @@
-.. toctree::
-   :maxdepth: 1
-
-   environment
-   devstack
-   notifications
-   testing
-   rally_link
--- a/doc/source/contributor/plugin/index.rst
+++ b/doc/source/contributor/plugin/index.rst
@@ -1,11 +0,0 @@
-.. toctree::
-   :maxdepth: 1
-
-   base-setup
-   action-plugin
-   cdmc-plugin
-   goal-plugin
-   planner-plugin
-   scoring-engine-plugin
-   strategy-plugin
-   plugins
--- a/doc/source/deploy/conf-files.rst
+++ b/doc/source/deploy/conf-files.rst
@@ -0,0 +1,14 @@
+.. _watcher_sample_configuration_files:
+
+==================================
+Watcher sample configuration files
+==================================
+
+watcher.conf
+~~~~~~~~~~~~
+
+The ``watcher.conf`` file contains most of the options to configure the
+Watcher services.
+
+.. literalinclude:: ../watcher.conf.sample
+   :language: ini
--- a/doc/source/configuration/configuring.rst
+++ b/doc/source/configuration/configuring.rst
@@ -15,7 +15,7 @@ Service overview
 ================

 The Watcher system is a collection of services that provides support to
-optimize your IaaS platform. The Watcher service may, depending upon
+optimize your IAAS platform. The Watcher service may, depending upon
 configuration, interact with several other OpenStack services. This includes:

 - the OpenStack Identity service (`keystone`_) for request authentication and
@@ -27,7 +27,7 @@ configuration, interact with several other OpenStack services. This includes:

 The Watcher service includes the following components:

- ``watcher-decision-engine``: runs audit on part of your IaaS and return an
+- ``watcher-decision-engine``: runs audit on part of your IAAS and return an
  action plan in order to optimize resource placement.
 - ``watcher-api``: A RESTful API that processes application requests by sending
  them to the watcher-decision-engine over RPC.
@@ -129,14 +129,10 @@ Configure the Identity service for the Watcher service

    .. code-block:: bash

-      $ openstack endpoint create --region YOUR_REGION
-        watcher public http://WATCHER_API_PUBLIC_IP:9322
-
-      $ openstack endpoint create --region YOUR_REGION
-        watcher internal http://WATCHER_API_INTERNAL_IP:9322
-
-      $ openstack endpoint create --region YOUR_REGION
-        watcher admin http://WATCHER_API_ADMIN_IP:9322
+      $ openstack endpoint create --region YOUR_REGION watcher \
+        --publicurl http://WATCHER_API_PUBLIC_IP:9322 \
+        --internalurl http://WATCHER_API_INTERNAL_IP:9322 \
+        --adminurl http://WATCHER_API_ADMIN_IP:9322

 .. _watcher-db_configuration:

@@ -169,7 +165,7 @@ You can easily generate and update a sample configuration file
 named :ref:`watcher.conf.sample <watcher_sample_configuration_files>` by using
 these following commands::

-    $ git clone git://git.openstack.org/openstack/watcher
+    $ git clone https://git.openstack.org/openstack/watcher
    $ cd watcher/
    $ tox -e genconfig
    $ vi etc/watcher/watcher.conf.sample
@@ -204,8 +200,8 @@ configuration file, in order:


 Although some configuration options are mentioned here, it is recommended that
-you review all the :ref:`available options
-<watcher_sample_configuration_files>`
+you review all the `available options
+<https://git.openstack.org/cgit/openstack/watcher/tree/etc/watcher/watcher.conf.sample>`_
 so that the watcher service is configured for your needs.

 #. The Watcher Service stores information in a database. This guide uses the
@@ -221,7 +217,7 @@ so that the watcher service is configured for your needs.
    # The SQLAlchemy connection string used to connect to the
    # database (string value)
    #connection=<None>
-    connection = mysql+pymysql://watcher:WATCHER_DBPASSWORD@DB_IP/watcher?charset=utf8
+    connection = mysql://watcher:WATCHER_DBPASSWORD@DB_IP/watcher?charset=utf8

 #. Configure the Watcher Service to use the RabbitMQ message broker by
   setting one or more of these options. Replace RABBIT_HOST with the
@@ -239,8 +235,21 @@ so that the watcher service is configured for your needs.
    # option. (string value)
    control_exchange = watcher

-    # ...
-    transport_url = rabbit://RABBITMQ_USER:RABBITMQ_PASSWORD@RABBIT_HOST
+    ...
+
+    [oslo_messaging_rabbit]
+
+    # The username used by the message broker (string value)
+    rabbit_userid = RABBITMQ_USER
+
+    # The password of user used by the message broker (string value)
+    rabbit_password = RABBITMQ_PASSWORD
+
+    # The host where the message brokeris installed (string value)
+    rabbit_host = RABBIT_HOST
+
+    # The port used bythe message broker (string value)
+    #rabbit_port = 5672


 #. Watcher API shall validate the token provided by every incoming request,
@@ -264,7 +273,7 @@ so that the watcher service is configured for your needs.

        # Authentication URL (unknown value)
        #auth_url = <None>
-        auth_url = http://IDENTITY_IP:5000
+        auth_url = http://IDENTITY_IP:35357

        # Username (unknown value)
        # Deprecated group/name - [DEFAULT]/username
@@ -310,7 +319,7 @@ so that the watcher service is configured for your needs.

        # Authentication URL (unknown value)
        #auth_url = <None>
-        auth_url = http://IDENTITY_IP:5000
+        auth_url = http://IDENTITY_IP:35357

        # Username (unknown value)
        # Deprecated group/name - [DEFAULT]/username
@@ -340,7 +349,7 @@ so that the watcher service is configured for your needs.
    [nova_client]

    # Version of Nova API to use in novaclient. (string value)
-    #api_version = 2.56
+    #api_version = 2
    api_version = 2.1

 #. Create the Watcher Service database tables::
@@ -357,14 +366,15 @@ Configure Nova compute
 Please check your hypervisor configuration to correctly handle
 `instance migration`_.

-.. _`instance migration`: https://docs.openstack.org/nova/latest/admin/migration.html
+.. _`instance migration`: http://docs.openstack.org/admin-guide/compute-live-migration-usage.html

 Configure Measurements
 ======================

 You can configure and install Ceilometer by following the documentation below :

-#. https://docs.openstack.org/ceilometer/latest
+#. http://docs.openstack.org/developer/ceilometer
+#. http://docs.openstack.org/kilo/install-guide/install/apt/content/ceilometer-nova.html

 The built-in strategy 'basic_consolidation' provided by watcher requires
 "**compute.node.cpu.percent**" and "**cpu_util**" measurements to be collected
@@ -376,13 +386,13 @@ the OpenStack site.
 You can use 'ceilometer meter-list' to list the available meters.

 For more information:
-https://docs.openstack.org/ceilometer/latest/admin/telemetry-measurements.html
+http://docs.openstack.org/developer/ceilometer/measurements.html

 Ceilometer is designed to collect measurements from OpenStack services and from
 other external components. If you would like to add new meters to the currently
 existing ones, you need to follow the documentation below:

-#. https://docs.openstack.org/ceilometer/latest/contributor/measurements.html#new-measurements
+#. http://docs.openstack.org/developer/ceilometer/new_meters.html

 The Ceilometer collector uses a pluggable storage system, meaning that you can
 pick any database system you prefer.
@@ -414,32 +424,12 @@ to Watcher receives Nova notifications in ``watcher_notifications`` as well.
    into which Nova services will publish events ::

      [oslo_messaging_notifications]
-      driver = messagingv2
+      driver = messaging
      topics = notifications,watcher_notifications

  * Restart the Nova services.


-Configure Cinder Notifications
-==============================
-
-Watcher can also consume notifications generated by the Cinder services, in
-order to build or update, in real time, its cluster data model related to
-storage resources. To do so, you have to update the Cinder configuration
-file on controller and volume nodes, in order to let Watcher receive Cinder
-notifications in a dedicated ``watcher_notifications`` channel.
-
-  * In the file ``/etc/cinder/cinder.conf``, update the section
-    ``[oslo_messaging_notifications]``, by redefining the list of topics
-    into which Cinder services will publish events ::
-
-      [oslo_messaging_notifications]
-      driver = messagingv2
-      topics = notifications,watcher_notifications
-
-  * Restart the Cinder services.
-
-
 Workers
 =======

--- a/doc/source/deploy/gmr.rst
+++ b/doc/source/deploy/gmr.rst
--- a/doc/source/admin/ways-to-install.rst
+++ b/doc/source/admin/ways-to-install.rst
@@ -4,13 +4,12 @@

          https://creativecommons.org/licenses/by/3.0/

-=======================
-Ways to install Watcher
-=======================
+==================
+Installing Watcher
+==================

-This document describes some ways to install Watcher in order to use it.
-If you are intending to develop on or with Watcher,
-please read :doc:`../contributor/environment`.
+This document describes how to install Watcher in order to use it. If you are
+intending to develop on or with Watcher, please read :doc:`../dev/environment`.

 Prerequisites
 -------------
@@ -19,14 +18,14 @@ The source install instructions specifically avoid using platform specific
 packages, instead using the source for the code and the Python Package Index
 (PyPi_).

-.. _PyPi: https://pypi.org/
+.. _PyPi: http://pypi.python.org/pypi

 It's expected that your system already has python2.7_, latest version of pip_,
 and git_ available.

-.. _python2.7: https://www.python.org
-.. _pip: https://pip.pypa.io/en/latest/installing/
-.. _git: https://git-scm.com/
+.. _python2.7: http://www.python.org
+.. _pip: http://www.pip-installer.org/en/latest/installing.html
+.. _git: http://git-scm.com/

 Your system shall also have some additional system libraries:

@@ -78,10 +77,9 @@ Install the Watcher modules dependencies:

    # pip install -r requirements.txt

-From here, refer to :doc:`../configuration/configuring` to declare Watcher
-as a new service into Keystone and to configure its different modules.
-Once configured, you should be able to run the Watcher services by issuing
-these commands:
+From here, refer to :doc:`configuration` to declare Watcher as a new service
+into Keystone and to configure its different modules. Once configured, you
+should be able to run the Watcher services by issuing these commands:

 .. code-block:: bash

@@ -109,7 +107,7 @@ installed on your system.

 Once installed, you still need to declare Watcher as a new service into
 Keystone and to configure its different modules, which you can find described
-in :doc:`../configuration/configuring`.
+in :doc:`configuration`.


 Installing from packages: Debian (experimental)
@@ -126,9 +124,9 @@ Here is single Dockerfile snippet you can use to run your Docker container:
    MAINTAINER David TARDIVEL <david.tardivel@b-com.com>

    RUN  apt-get update
-    RUN  apt-get dist-upgrade
-    RUN  apt-get install vim  net-tools
-    RUN  apt-get install experimental watcher-api
+    RUN  apt-get dist-upgrade -y
+    RUN  apt-get install -y vim  net-tools
+    RUN  apt-get install -yt experimental watcher-api

    CMD ["/usr/bin/watcher-api"]

--- a/doc/source/deploy/policy.rst
+++ b/doc/source/deploy/policy.rst
--- a/doc/source/deploy/user-guide.rst
+++ b/doc/source/deploy/user-guide.rst
@@ -11,7 +11,7 @@ Watcher User Guide
 ==================

 See the
-`architecture page <https://docs.openstack.org/watcher/latest/architecture.html>`_
+`architecture page <http://docs.openstack.org/developer/watcher/architecture.html>`_
 for an architectural overview of the different components of Watcher and how
 they fit together.

@@ -39,26 +39,10 @@ named ``watcher``, or by using the `OpenStack CLI`_ ``openstack``.
 If you want to deploy Watcher in Horizon, please refer to the `Watcher Horizon
 plugin installation guide`_.

-.. note::
-
-   Notice, that in this guide we'll use `OpenStack CLI`_ as major interface.
-   Nevertheless, you can use `Watcher CLI`_ in the same way. It can be
-   achieved by replacing
-
-   .. code:: bash
-
-     $ openstack optimize ...
-
-   with
-
-   .. code:: bash
-
-     $ watcher ...
-
-.. _`installation guide`: https://docs.openstack.org/python-watcherclient/latest
-.. _`Watcher Horizon plugin installation guide`: https://docs.openstack.org/watcher-dashboard/latest/install/installation.html
-.. _`OpenStack CLI`: https://docs.openstack.org/python-openstackclient/latest/cli/man/openstack.html
-.. _`Watcher CLI`: https://docs.openstack.org/python-watcherclient/latest/cli/index.html
+.. _`installation guide`: http://docs.openstack.org/developer/python-watcherclient
+.. _`Watcher Horizon plugin installation guide`: http://docs.openstack.org/developer/watcher-dashboard/deploy/installation.html
+.. _`OpenStack CLI`: http://docs.openstack.org/developer/python-openstackclient/man/openstack.html
+.. _`Watcher CLI`: http://docs.openstack.org/developer/python-watcherclient/index.html

 Seeing what the Watcher CLI can do ?
 ------------------------------------
@@ -67,6 +51,10 @@ watcher binary without options.

 .. code:: bash

+  $ watcher help
+
+or::
+
  $ openstack help optimize

 How do I run an audit of my cluster ?
@@ -76,6 +64,10 @@ First, you need to find the :ref:`goal <goal_definition>` you want to achieve:

 .. code:: bash

+  $ watcher goal list
+
+or::
+
  $ openstack optimize goal list

 .. note::
@@ -89,6 +81,10 @@ An :ref:`audit template <audit_template_definition>` defines an optimization

 .. code:: bash

+  $ watcher audittemplate create my_first_audit_template <your_goal>
+
+or::
+
  $ openstack optimize audittemplate create my_first_audit_template <your_goal>

 Although optional, you may want to actually set a specific strategy for your
@@ -97,6 +93,10 @@ following command:

 .. code:: bash

+  $ watcher strategy list --goal <your_goal_uuid_or_name>
+
+or::
+
  $ openstack optimize strategy list --goal <your_goal_uuid_or_name>

 You can use the following command to check strategy details including which
@@ -104,12 +104,21 @@ parameters of which format it supports:

 .. code:: bash

+  $ watcher strategy show <your_strategy>
+
+or::
+
  $ openstack optimize strategy show <your_strategy>

 The command to create your audit template would then be:

 .. code:: bash

+  $ watcher audittemplate create my_first_audit_template <your_goal> \
+    --strategy <your_strategy>
+
+or::
+
  $ openstack optimize audittemplate create my_first_audit_template <your_goal> \
    --strategy <your_strategy>

@@ -124,6 +133,10 @@ audit) that you want to use.

 .. code:: bash

+  $ watcher audittemplate list
+
+or::
+
  $ openstack optimize audittemplate list

 - Start an audit based on this :ref:`audit template
@@ -131,6 +144,10 @@ audit) that you want to use.

 .. code:: bash

+  $ watcher audit create -a <your_audit_template>
+
+or::
+
  $ openstack optimize audit create -a <your_audit_template>

 If your_audit_template was created by --strategy <your_strategy>, and it
@@ -139,6 +156,11 @@ format), your can append `-p` to input required parameters:

 .. code:: bash

+  $ watcher audit create -a <your_audit_template> \
+    -p <your_strategy_para1>=5.5 -p <your_strategy_para2>=hi
+
+or::
+
  $ openstack optimize audit create -a <your_audit_template> \
    -p <your_strategy_para1>=5.5 -p <your_strategy_para2>=hi

@@ -151,13 +173,19 @@ Input parameter could cause audit creation failure, when:
 Watcher service will compute an :ref:`Action Plan <action_plan_definition>`
 composed of a list of potential optimization :ref:`actions <action_definition>`
 (instance migration, disabling of a compute node, ...) according to the
-:ref:`goal <goal_definition>` to achieve.
+:ref:`goal <goal_definition>` to achieve. You can see all of the goals
+available in section ``[watcher_strategies]`` of the Watcher service
+configuration file.

 - Wait until the Watcher audit has produced a new :ref:`action plan
  <action_plan_definition>`, and get it:

 .. code:: bash

+  $ watcher actionplan list --audit <the_audit_uuid>
+
+or::
+
  $ openstack optimize actionplan list --audit <the_audit_uuid>

 - Have a look on the list of optimization :ref:`actions <action_definition>`
@@ -165,6 +193,10 @@ composed of a list of potential optimization :ref:`actions <action_definition>`

 .. code:: bash

+  $ watcher action list --action-plan <the_action_plan_uuid>
+
+or::
+
  $ openstack optimize action list --action-plan <the_action_plan_uuid>

 Once you have learned how to create an :ref:`Action Plan
@@ -175,6 +207,10 @@ cluster:

 .. code:: bash

+  $ watcher actionplan start <the_action_plan_uuid>
+
+or::
+
  $ openstack optimize actionplan start <the_action_plan_uuid>

 You can follow the states of the :ref:`actions <action_definition>` by
@@ -182,11 +218,19 @@ periodically calling:

 .. code:: bash

+  $ watcher action list
+
+or::
+
  $ openstack optimize action list

 You can also obtain more detailed information about a specific action:

 .. code:: bash

+  $ watcher action show <the_action_uuid>
+
+or::
+
  $ openstack optimize action show <the_action_uuid>

--- a/doc/source/contributor/contributing.rst
+++ b/doc/source/contributor/contributing.rst
@@ -24,8 +24,8 @@ signed OpenStack's contributor's agreement.

 .. seealso::

-   * https://docs.openstack.org/infra/manual/developers.html
-   * https://wiki.openstack.org/CLA
+   * http://docs.openstack.org/infra/manual/developers.html
+   * http://wiki.openstack.org/CLA

 LaunchPad Project
 -----------------
@@ -37,22 +37,22 @@ notifications of important events.

 .. seealso::

-   * https://launchpad.net
-   * https://launchpad.net/watcher
-   * https://launchpad.net/openstack
+   * http://launchpad.net
+   * http://launchpad.net/watcher
+   * http://launchpad.net/~openstack


 Project Hosting Details
 -----------------------

 Bug tracker
-    https://launchpad.net/watcher
+    http://launchpad.net/watcher

 Mailing list (prefix subjects with ``[watcher]`` for faster responses)
-    http://lists.openstack.org/pipermail/openstack-dev/
+    http://lists.openstack.org/cgi-bin/mailman/listinfo/openstack-dev

 Wiki
-    https://wiki.openstack.org/Watcher
+    http://wiki.openstack.org/Watcher

 Code Hosting
    https://git.openstack.org/cgit/openstack/watcher
@@ -64,9 +64,8 @@ IRC Channel
    ``#openstack-watcher`` (changelog_)

 Weekly Meetings
-    On Wednesdays at 14:00 UTC on even weeks in the ``#openstack-meeting-4``
-    IRC channel, 08:00 UTC on odd weeks in the ``#openstack-meeting-alt``
-    IRC channel (`meetings logs`_)
+    on Wednesdays at 14:00 UTC on even weeks, 9:00 UTC on odd weeks, in the
+    ``#openstack-meeting-4`` IRC channel (`meetings logs`_)

 .. _changelog: http://eavesdrop.openstack.org/irclogs/%23openstack-watcher/
 .. _meetings logs:  http://eavesdrop.openstack.org/meetings/watcher/
--- a/doc/source/contributor/devstack.rst
+++ b/doc/source/contributor/devstack.rst
@@ -19,13 +19,13 @@ model. To enable the Watcher plugin with DevStack, add the following to the
 `[[local|localrc]]` section of your controller's `local.conf` to enable the
 Watcher plugin::

-    enable_plugin watcher git://git.openstack.org/openstack/watcher
+    enable_plugin watcher https://git.openstack.org/openstack/watcher

 For more detailed instructions, see `Detailed DevStack Instructions`_. Check
 out the `DevStack documentation`_ for more information regarding DevStack.

-.. _PluginModelDocs: https://docs.openstack.org/devstack/latest/plugins.html
-.. _DevStack documentation: https://docs.openstack.org/devstack/latest
+.. _PluginModelDocs: http://docs.openstack.org/developer/devstack/plugins.html
+.. _DevStack documentation: http://docs.openstack.org/developer/devstack/

 Detailed DevStack Instructions
 ==============================
@@ -37,7 +37,7 @@ Detailed DevStack Instructions
   needed (i.e., no computes are needed if you want to just experiment with
   the Watcher services). These servers can be VMs running on your local
   machine via VirtualBox if you prefer. DevStack currently recommends that
-   you use Ubuntu 16.04 LTS. The servers should also have connections to the
+   you use Ubuntu 14.04 LTS. The servers should also have connections to the
   same network such that they are all able to communicate with one another.

 #. For each server, clone the DevStack repository and create the stack user::
@@ -92,12 +92,6 @@ Detailed DevStack Instructions
   Note: if you want to use a specific branch, specify WATCHER_BRANCH in the
   local.conf file. By default it will use the master branch.

-   Note: watcher-api will default run under apache/httpd, set the variable
-   WATCHER_USE_MOD_WSGI=FALSE if you do not wish to run under apache/httpd.
-   For development environment it is suggested to set WATHCER_USE_MOD_WSGI
-   to FALSE. For Production environment it is suggested to keep it at the
-   default TRUE value.
-
 #. Start stacking from the controller node::

       ./devstack/stack.sh
--- a/doc/source/contributor/environment.rst
+++ b/doc/source/contributor/environment.rst
@@ -4,7 +4,7 @@

          https://creativecommons.org/licenses/by/3.0/

-.. _watcher_development_environment:
+.. _watcher_developement_environment:

 =========================================
 Set up a development environment manually
@@ -16,8 +16,8 @@ for development purposes.
 To install Watcher from packaging, refer instead to Watcher `User
 Documentation`_.

-.. _`Git Repository`: https://git.openstack.org/cgit/openstack/watcher
-.. _`User Documentation`: https://docs.openstack.org/watcher/latest/
+.. _`Git Repository`: http://git.openstack.org/cgit/openstack/watcher
+.. _`User Documentation`: http://docs.openstack.org/developer/watcher/

 Prerequisites
 =============
@@ -25,7 +25,7 @@ Prerequisites
 This document assumes you are using Ubuntu or Fedora, and that you have the
 following tools available on your system:

- Python_ 2.7 and 3.5
+- Python_ 2.7 and 3.4
 - git_
 - setuptools_
 - pip_
@@ -35,10 +35,10 @@ following tools available on your system:
 **Reminder**: If you're successfully using a different platform, or a
 different version of the above, please document your configuration here!

-.. _Python: https://www.python.org/
-.. _git: https://git-scm.com/
-.. _setuptools: https://pypi.org/project/setuptools
-.. _virtualenvwrapper: https://virtualenvwrapper.readthedocs.io/en/latest/install.html
+.. _Python: http://www.python.org/
+.. _git: http://git-scm.com/
+.. _setuptools: http://pypi.python.org/pypi/setuptools
+.. _virtualenvwrapper: https://virtualenvwrapper.readthedocs.org/en/latest/install.html

 Getting the latest code
 =======================
@@ -69,21 +69,21 @@ itself.

 These dependencies can be installed from PyPi_ using the Python tool pip_.

-.. _PyPi: https://pypi.org/
-.. _pip: https://pypi.org/project/pip
+.. _PyPi: http://pypi.python.org/
+.. _pip: http://pypi.python.org/pypi/pip

 However, your system *may* need additional dependencies that `pip` (and by
 extension, PyPi) cannot satisfy. These dependencies should be installed
 prior to using `pip`, and the installation method may vary depending on
 your platform.

-* Ubuntu 16.04::
+* Ubuntu 14.04::

    $ sudo apt-get install python-dev libssl-dev libmysqlclient-dev libffi-dev

-* Fedora 24+::
+* Fedora 19+::

-    $ sudo dnf install redhat-rpm-config gcc python-devel libxml2-devel
+    $ sudo yum install openssl-devel libffi-devel mysql-devel

 * CentOS 7::

@@ -123,10 +123,9 @@ You can re-activate this virtualenv for your current shell using:

    $ workon watcher

-For more information on virtual environments, see virtualenv_ and
-virtualenvwrapper_.
+For more information on virtual environments, see virtualenv_.

-.. _virtualenv: https://pypi.org/project/virtualenv/
+.. _virtualenv: http://www.virtualenv.org/



@@ -176,12 +175,11 @@ The HTML files are available into ``doc/build`` directory.
 Configure the Watcher services
 ==============================

-Watcher services require a configuration file. Use tox to generate
-a sample configuration file that can be used to get started:
+Watcher services require a configuration file. There is a sample configuration
+file that can be used to get started:

 .. code-block:: bash

-  $ tox -e genconfig
  $ cp etc/watcher.conf.sample etc/watcher.conf

 Most of the default configuration should be enough to get you going, but you
@@ -195,7 +193,7 @@ still need to configure the following sections:
  message bus

 So if you need some more details on how to configure one or more of these
-sections, please do have a look at :doc:`../configuration/configuring` before
+sections, please do have a look at :doc:`../deploy/configuration` before
 continuing.


@@ -241,7 +239,7 @@ To run the Watcher Applier service, use:
    (watcher) $ watcher-applier

 Default configuration of these services are available into ``/etc/watcher``
-directory. See :doc:`../configuration/configuring` for details on how Watcher is
+directory. See :doc:`../deploy/configuration` for details on how Watcher is
 configured. By default, Watcher is configured with SQL backends.


--- a/doc/source/contributor/notifications.rst
+++ b/doc/source/contributor/notifications.rst
--- a/doc/source/contributor/plugin/action-plugin.rst
+++ b/doc/source/contributor/plugin/action-plugin.rst
@@ -178,7 +178,7 @@ Here below is how you would proceed to register ``DummyAction`` using pbr_:
    watcher_actions =
        dummy = thirdparty.dummy:DummyAction

-.. _pbr: https://docs.openstack.org/pbr/latest
+.. _pbr: http://docs.openstack.org/developer/pbr/


 Using action plugins
@@ -217,11 +217,3 @@ which is only able to process the Watcher built-in actions. Therefore, you will
 either have to use an existing third-party planner or :ref:`implement another
 planner <implement_planner_plugin>` that will be able to take into account your
 new action plugin.
-
-
-Test your new action
-====================
-
-In order to test your new action via a manual test or a Tempest test, you can
-use the  :py:class:`~.Actuator` strategy and pass it one or more actions to
-execute. This way, you can isolate your action to see if it works as expected.
--- a/doc/source/contributor/plugin/base-setup.rst
+++ b/doc/source/contributor/plugin/base-setup.rst
@@ -22,7 +22,7 @@ Pre-requisites
 We assume that you have set up a working Watcher development environment. So if
 this not already the case, you can check out our documentation which explains
 how to set up a :ref:`development environment
-<watcher_development_environment>`.
+<watcher_developement_environment>`.

 .. _development environment:

@@ -34,7 +34,7 @@ First off, we need to create the project structure. To do so, we can use
 generate the skeleton of our project::

    $ virtualenv thirdparty
-    $ . thirdparty/bin/activate
+    $ source thirdparty/bin/activate
    $ pip install cookiecutter
    $ cookiecutter https://github.com/openstack-dev/cookiecutter

@@ -79,7 +79,7 @@ requirements.txt file::

 .. _cookiecutter: https://github.com/audreyr/cookiecutter
 .. _OpenStack cookiecutter: https://github.com/openstack-dev/cookiecutter
-.. _python-watcher: https://pypi.org/project/python-watcher
+.. _python-watcher: https://pypi.python.org/pypi/python-watcher

 Implementing a plugin for Watcher
 =================================
--- a/doc/source/contributor/plugin/cdmc-plugin.rst
+++ b/doc/source/contributor/plugin/cdmc-plugin.rst
@@ -28,8 +28,6 @@ In order to create a new cluster data model collector, you have to:
 - Implement its :py:meth:`~.BaseClusterDataModelCollector.execute` abstract
  method to return your entire cluster data model that this method should
  build.
- Implement its :py:meth:`~.BaseClusterDataModelCollector.audit_scope_handler`
-  abstract property to return your audit scope handler.
 - Implement its :py:meth:`~.Goal.notification_endpoints` abstract property to
  return the list of all the :py:class:`~.base.NotificationEndpoint` instances
  that will be responsible for handling incoming notifications in order to
@@ -59,10 +57,6 @@ Here is an example showing how you can write a plugin called
            # Do something here...
            return model

-        @property
-        def audit_scope_handler(self):
-            return None
-
        @property
        def notification_endpoints(self):
            return []
@@ -141,10 +135,6 @@ class method as followed:
            # Do something here...
            return model

-        @property
-        def audit_scope_handler(self):
-            return None
-
        @property
        def notification_endpoints(self):
            return []
@@ -208,7 +198,7 @@ Here below is how to register ``DummyClusterDataModelCollector`` using pbr_:
    watcher_cluster_data_model_collectors =
        dummy = thirdparty.dummy:DummyClusterDataModelCollector

-.. _pbr: https://docs.openstack.org/pbr/latest/
+.. _pbr: http://docs.openstack.org/developer/pbr/


 Add new notification endpoints
--- a/doc/source/contributor/plugin/goal-plugin.rst
+++ b/doc/source/contributor/plugin/goal-plugin.rst
@@ -123,11 +123,10 @@ Here below is how you would proceed to register ``NewGoal`` using pbr_:
        new_goal = thirdparty.new:NewGoal


-To get a better understanding on how to implement a more advanced goal, have
-a look at the
-:py:class:`watcher.decision_engine.goal.goals.ServerConsolidation` class.
+To get a better understanding on how to implement a more advanced goal,
+have a look at the :py:class:`~.ServerConsolidation` class.

-.. _pbr: https://docs.openstack.org/pbr/latest
+.. _pbr: http://docs.openstack.org/developer/pbr/

 .. _implement_efficacy_specification:

--- a/doc/source/contributor/plugin/planner-plugin.rst
+++ b/doc/source/contributor/plugin/planner-plugin.rst
@@ -145,7 +145,7 @@ Here below is how you would proceed to register ``DummyPlanner`` using pbr_:
    watcher_planners =
        dummy = third_party.dummy:DummyPlanner

-.. _pbr: https://docs.openstack.org/pbr/latest
+.. _pbr: http://docs.openstack.org/developer/pbr/


 Using planner plugins
--- a/doc/source/contributor/plugin/scoring-engine-plugin.rst
+++ b/doc/source/contributor/plugin/scoring-engine-plugin.rst
@@ -37,8 +37,7 @@ Create a new scoring engine plugin

 In order to create a new scoring engine you have to:

- Extend the :py:class:`watcher.decision_engine.scoring.base.ScoringEngine`
-  class
+- Extend the :py:class:`~.ScoringEngine` class
 - Implement its :py:meth:`~.ScoringEngine.get_name` method to return the
  **unique** ID of the new scoring engine you want to create. This unique ID
  should be the same as the name of :ref:`the entry point we will declare later
@@ -125,8 +124,7 @@ scoring engine deployed as a web service on external servers:
 Abstract Plugin Class
 =====================

-Here below is the abstract
-:py:class:`watcher.decision_engine.scoring.base.ScoringEngine` class:
+Here below is the abstract :py:class:`~.ScoringEngine` class:

 .. autoclass:: watcher.decision_engine.scoring.base.ScoringEngine
    :members:
@@ -190,7 +188,7 @@ the :py:class:`~.DummyScoringContainer` and the way it is configured in
    watcher_scoring_engine_containers =
        new_scoring_container = thirdparty.new:NewContainer

-.. _pbr: https://docs.openstack.org/pbr/latest/
+.. _pbr: http://docs.openstack.org/developer/pbr/


 Using scoring engine plugins
--- a/doc/source/contributor/plugin/strategy-plugin.rst
+++ b/doc/source/contributor/plugin/strategy-plugin.rst
@@ -219,7 +219,7 @@ Here below is how you would proceed to register ``NewStrategy`` using pbr_:
 To get a better understanding on how to implement a more advanced strategy,
 have a look at the :py:class:`~.BasicConsolidation` class.

-.. _pbr: https://docs.openstack.org/pbr/latest
+.. _pbr: http://docs.openstack.org/developer/pbr/

 Using strategy plugins
 ======================
@@ -263,12 +263,12 @@ requires new metrics not covered by Ceilometer, you can add them through a
 `Ceilometer plugin`_.


-.. _`Helper`: https://github.com/openstack/watcher/blob/master/watcher/datasource/ceilometer.py
-.. _`Ceilometer developer guide`: https://docs.openstack.org/ceilometer/latest/contributor/architecture.html#storing-accessing-the-data
-.. _`Ceilometer`: https://docs.openstack.org/ceilometer/latest
+.. _`Helper`: https://github.com/openstack/watcher/blob/master/watcher/decision_engine/cluster/history/ceilometer.py
+.. _`Ceilometer developer guide`: http://docs.openstack.org/developer/ceilometer/architecture.html#storing-the-data
+.. _`Ceilometer`: http://docs.openstack.org/developer/ceilometer/
 .. _`Monasca`: https://github.com/openstack/monasca-api/blob/master/docs/monasca-api-spec.md
-.. _`here`: https://docs.openstack.org/ceilometer/latest/contributor/install/dbreco.html#choosing-a-database-backend
-.. _`Ceilometer plugin`: https://docs.openstack.org/ceilometer/latest/contributor/plugins.html
+.. _`here`: http://docs.openstack.org/developer/ceilometer/install/dbreco.html#choosing-a-database-backend
+.. _`Ceilometer plugin`: http://docs.openstack.org/developer/ceilometer/plugins.html
 .. _`Ceilosca`: https://github.com/openstack/monasca-ceilometer/blob/master/ceilosca/ceilometer/storage/impl_monasca.py

 Read usage metrics using the Watcher Datasource Helper
--- a/doc/source/contributor/plugin/plugins.rst
+++ b/doc/source/contributor/plugin/plugins.rst
--- a/doc/source/contributor/rally_link.rst
+++ b/doc/source/contributor/rally_link.rst
--- a/doc/source/contributor/testing.rst
+++ b/doc/source/contributor/testing.rst
@@ -14,7 +14,7 @@ Unit tests
 ==========

 All unit tests should be run using `tox`_. To run the same unit tests that are
-executing onto `Gerrit`_ which includes ``py35``, ``py27`` and ``pep8``, you
+executing onto `Gerrit`_ which includes ``py34``, ``py27`` and ``pep8``, you
 can issue the following command::

    $ workon watcher
@@ -26,12 +26,12 @@ If you want to only run one of the aforementioned, you can then issue one of
 the following::

    $ workon watcher
-    (watcher) $ tox -e py35
+    (watcher) $ tox -e py34
    (watcher) $ tox -e py27
    (watcher) $ tox -e pep8

 .. _tox: https://tox.readthedocs.org/
-.. _Gerrit: https://review.openstack.org/
+.. _Gerrit: http://review.openstack.org/

 You may pass options to the test programs using positional arguments. To run a
 specific unit test, you can pass extra options to `os-testr`_ after putting
@@ -41,18 +41,10 @@ you can run the desired test::
    $ workon watcher
    (watcher) $ tox -e py27 -- -r watcher.tests.api

-.. _os-testr: https://docs.openstack.org/os-testr/latest
+.. _os-testr: http://docs.openstack.org/developer/os-testr/

 When you're done, deactivate the virtualenv::

    $ deactivate

-.. _tempest_tests:
-
-Tempest tests
-=============
-
-Tempest tests for Watcher has been migrated to the external repo
-`watcher-tempest-plugin`_.
-
-.. _watcher-tempest-plugin: https://github.com/openstack/watcher-tempest-plugin
+.. include:: ../../../watcher_tempest_plugin/README.rst
--- a/doc/source/glossary.rst
+++ b/doc/source/glossary.rst
@@ -65,14 +65,6 @@ Audit

 .. _audit_template_definition:

-Audit Scope
-===========
-
-An Audit Scope is a set of audited resources. Audit Scope should be defined
-in each Audit Template (which contains the Audit settings).
-
-.. _audit_scope_definition:
-
 Audit Template
 ==============

@@ -83,7 +75,7 @@ Audit Template
 Availability Zone
 =================

-Please, read `the official OpenStack definition of an Availability Zone <https://docs.openstack.org/nova/latest/user/aggregates.html#availability-zones-azs>`_.
+Please, read `the official OpenStack definition of an Availability Zone <http://docs.openstack.org/developer/nova/aggregates.html#availability-zones-azs>`_.

 .. _cluster_definition:

@@ -115,8 +107,15 @@ Cluster Data Model (CDM)
 Controller Node
 ===============

-Please, read `the official OpenStack definition of a Controller Node
-<https://docs.openstack.org/nova/latest/install/overview.html#controller>`_.
+A controller node is a machine that typically runs the following core OpenStack
+services:
+
+-  Keystone: for identity and service management
+-  Cinder scheduler: for volumes management
+-  Glance controller: for image management
+-  Neutron controller: for network management
+-  Nova controller: for global compute resources management with services
+   such as nova-scheduler, nova-conductor and nova-network.

 In many configurations, Watcher will reside on a controller node even if it
 can potentially be hosted on a dedicated machine.
@@ -127,7 +126,7 @@ Compute node
 ============

 Please, read `the official OpenStack definition of a Compute Node
-<https://docs.openstack.org/nova/latest/install/overview.html#compute>`_.
+<http://docs.openstack.org/ops-guide/arch-compute-nodes.html>`_.

 .. _customer_definition:

@@ -160,7 +159,7 @@ Host Aggregate
 ==============

 Please, read `the official OpenStack definition of a Host Aggregate
-<https://docs.openstack.org/nova/latest/user/aggregates.html>`_.
+<http://docs.openstack.org/developer/nova/aggregates.html>`_.

 .. _instance_definition:

@@ -199,18 +198,18 @@ the Watcher system can act on.
 Here are some examples of
 :ref:`Managed resource types <managed_resource_definition>`:

-  `Nova Host Aggregates <https://docs.openstack.org/heat/latest/template_guide/openstack.html#OS::Nova::HostAggregate>`_
-  `Nova Servers <https://docs.openstack.org/heat/latest/template_guide/openstack.html#OS::Nova::Server>`_
-  `Cinder Volumes <https://docs.openstack.org/heat/latest/template_guide/openstack.html#OS::Cinder::Volume>`_
-  `Neutron Routers <https://docs.openstack.org/heat/latest/template_guide/openstack.html#OS::Neutron::Router>`_
-  `Neutron Networks <https://docs.openstack.org/heat/latest/template_guide/openstack.html#OS::Neutron::Net>`_
-  `Neutron load-balancers <https://docs.openstack.org/heat/latest/template_guide/openstack.html#OS::Neutron::LoadBalancer>`_
-  `Sahara Hadoop Cluster <https://docs.openstack.org/heat/latest/template_guide/openstack.html#OS::Sahara::Cluster>`_
+-  `Nova Host Aggregates <http://docs.openstack.org/developer/heat/template_guide/openstack.html#OS::Nova::HostAggregate>`_
+-  `Nova Servers <http://docs.openstack.org/developer/heat/template_guide/openstack.html#OS::Nova::Server>`_
+-  `Cinder Volumes <http://docs.openstack.org/developer/heat/template_guide/openstack.html#OS::Cinder::Volume>`_
+-  `Neutron Routers <http://docs.openstack.org/developer/heat/template_guide/openstack.html#OS::Neutron::Router>`_
+-  `Neutron Networks <http://docs.openstack.org/developer/heat/template_guide/openstack.html#OS::Neutron::Net>`_
+-  `Neutron load-balancers <http://docs.openstack.org/developer/heat/template_guide/openstack.html#OS::Neutron::LoadBalancer>`_
+-  `Sahara Hadoop Cluster <http://docs.openstack.org/developer/heat/template_guide/openstack.html#OS::Sahara::Cluster>`_
 -  ...

-It can be any of `the official list of available resource types defined in
+It can be any of the `the official list of available resource types defined in
 OpenStack for HEAT
-<https://docs.openstack.org/heat/latest/template_guide/openstack.html>`_.
+<http://docs.openstack.org/developer/heat/template_guide/openstack.html>`_.

 .. _efficacy_indicator_definition:

@@ -267,14 +266,14 @@ the same goal and same workload of the :ref:`Cluster <cluster_definition>`.
 Project
 =======

-:ref:`Projects <project_definition>` represent the base unit of "ownership"
+:ref:`Projects <project_definition>` represent the base unit of “ownership”
 in OpenStack, in that all :ref:`resources <managed_resource_definition>` in
 OpenStack should be owned by a specific :ref:`project <project_definition>`.
 In OpenStack Identity, a :ref:`project <project_definition>` must be owned by a
 specific domain.

 Please, read `the official OpenStack definition of a Project
-<https://docs.openstack.org/doc-contrib-guide/common/glossary.html>`_.
+<http://docs.openstack.org/glossary/content/glossary.html>`_.

 .. _scoring_engine_definition:

--- a/doc/source/image_src/plantuml/action_plan_state_machine.png
+++ b/doc/source/image_src/plantuml/action_plan_state_machine.png
--- a/doc/source/image_src/plantuml/action_plan_state_machine.txt
+++ b/doc/source/image_src/plantuml/action_plan_state_machine.txt
@@ -7,9 +7,7 @@ ONGOING --> FAILED: Something failed while executing\nthe Action Plan in the Wat
 ONGOING --> SUCCEEDED: The Watcher Applier executed\nthe Action Plan successfully
 FAILED --> DELETED : Administrator removes\nAction Plan
 SUCCEEDED --> DELETED : Administrator removes\nAction Plan
-ONGOING --> CANCELLING : Administrator cancels\nAction Plan
-CANCELLING --> CANCELLED : The Watcher Applier cancelled\nthe Action Plan successfully
-CANCELLING --> FAILED : Something failed while cancelling\nthe Action Plan in the Watcher Applier
+ONGOING --> CANCELLED : Administrator cancels\nAction Plan
 RECOMMENDED --> CANCELLED : Administrator cancels\nAction Plan
 RECOMMENDED --> SUPERSEDED : The Watcher Decision Engine supersedes\nAction Plan
 PENDING --> CANCELLED : Administrator cancels\nAction Plan
--- a/doc/source/image_src/plantuml/audit_state_machine.txt
+++ b/doc/source/image_src/plantuml/audit_state_machine.txt
@@ -4,14 +4,11 @@
 PENDING --> ONGOING: Audit request is received\nby the Watcher Decision Engine
 ONGOING --> FAILED: Audit fails\n(no solution found, technical error, ...)
 ONGOING --> SUCCEEDED: The Watcher Decision Engine\ncould find at least one Solution
-ONGOING --> SUSPENDED: Administrator wants to\nsuspend the Audit
-SUSPENDED --> ONGOING: Administrator wants to\nresume the Audit
 FAILED --> DELETED : Administrator wants to\narchive/delete the Audit
 SUCCEEDED --> DELETED : Administrator wants to\narchive/delete the Audit
 PENDING --> CANCELLED : Administrator cancels\nthe Audit
 ONGOING --> CANCELLED : Administrator cancels\nthe Audit
 CANCELLED --> DELETED : Administrator wants to\narchive/delete the Audit
-SUSPENDED --> DELETED: Administrator wants to\narchive/delete the Audit
 DELETED --> [*]

@enduml
--- a/doc/source/image_src/plantuml/watcher_db_schema_diagram.png
+++ b/doc/source/image_src/plantuml/watcher_db_schema_diagram.png
--- a/doc/source/image_src/plantuml/watcher_db_schema_diagram.txt
+++ b/doc/source/image_src/plantuml/watcher_db_schema_diagram.txt
@@ -75,7 +75,7 @@ table(action_plans) {
    foreign_key("strategy_id : Integer")
    uuid : String[36]
    state : String[20], nullable
-    global_efficacy : JSONEncodedList, nullable
+    global_efficacy : JSONEncodedDict, nullable

    created_at : DateTime
    updated_at : DateTime
--- a/doc/source/images/action_plan_state_machine.png
+++ b/doc/source/images/action_plan_state_machine.png
--- a/doc/source/images/architecture.svg
+++ b/doc/source/images/architecture.svg
@@ -13,7 +13,7 @@
   height="210mm"
   id="svg4946"
   version="1.1"
-   inkscape:version="0.91 r13725"
+   inkscape:version="0.48.4 r9939"
   sodipodi:docname="architecture.svg">
  <defs
     id="defs4948">
@@ -325,48 +325,6 @@
         style="fill:#ffffff;fill-rule:evenodd;stroke:#000000;stroke-width:1pt"
         transform="matrix(-0.8,0,0,-0.8,4.8,0)" />
    </marker>
-    <marker
-       inkscape:stockid="EmptyTriangleInL"
-       orient="auto"
-       refY="0"
-       refX="0"
-       id="EmptyTriangleInL-5"
-       style="overflow:visible">
-      <path
-         inkscape:connector-curvature="0"
-         id="path7091-3"
-         d="m 5.77,0 -8.65,5 0,-10 8.65,5 z"
-         style="fill:#ffffff;fill-rule:evenodd;stroke:#000000;stroke-width:1pt"
-         transform="matrix(-0.8,0,0,-0.8,4.8,0)" />
-    </marker>
-    <marker
-       inkscape:stockid="EmptyTriangleInL"
-       orient="auto"
-       refY="0"
-       refX="0"
-       id="EmptyTriangleInL-6"
-       style="overflow:visible">
-      <path
-         inkscape:connector-curvature="0"
-         id="path7091-2"
-         d="m 5.77,0 -8.65,5 0,-10 8.65,5 z"
-         style="fill:#ffffff;fill-rule:evenodd;stroke:#000000;stroke-width:1pt"
-         transform="matrix(-0.8,0,0,-0.8,4.8,0)" />
-    </marker>
-    <marker
-       inkscape:stockid="EmptyTriangleInL"
-       orient="auto"
-       refY="0"
-       refX="0"
-       id="EmptyTriangleInL-12"
-       style="overflow:visible">
-      <path
-         inkscape:connector-curvature="0"
-         id="path7091-70"
-         d="m 5.77,0 -8.65,5 0,-10 8.65,5 z"
-         style="fill:#ffffff;fill-rule:evenodd;stroke:#000000;stroke-width:1pt"
-         transform="matrix(-0.8,0,0,-0.8,4.8,0)" />
-    </marker>
  </defs>
  <sodipodi:namedview
     inkscape:document-units="mm"
@@ -375,21 +333,17 @@
     borderopacity="1.0"
     inkscape:pageopacity="0.0"
     inkscape:pageshadow="2"
-     inkscape:zoom="1.4142136"
-     inkscape:cx="665.19215"
+     inkscape:zoom="4"
+     inkscape:cx="261.24633"
     inkscape:cy="108.90512"
-     inkscape:current-layer="g4866-2-3"
+     inkscape:current-layer="g5356"
     id="namedview4950"
-     showgrid="true"
-     inkscape:window-width="1211"
-     inkscape:window-height="698"
-     inkscape:window-x="65"
-     inkscape:window-y="24"
-     inkscape:window-maximized="1">
-    <inkscape:grid
-       type="xygrid"
-       id="grid4203" />
-  </sodipodi:namedview>
+     showgrid="false"
+     inkscape:window-width="1846"
+     inkscape:window-height="1053"
+     inkscape:window-x="1911"
+     inkscape:window-y="37"
+     inkscape:window-maximized="1" />
  <metadata
     id="metadata4952">
    <rdf:RDF>
@@ -409,12 +363,6 @@
    <g
       id="g5356"
       transform="translate(-15.096057,-107.16694)">
-      <path
-         sodipodi:nodetypes="cc"
-         inkscape:connector-curvature="0"
-         id="path3284-4-2-3-77-5-9"
-         d="m 813.66791,753.1462 0,-92.21768"
-         style="display:inline;fill:none;stroke:#000000;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;marker-start:url(#EmptyTriangleInL-6)" />
      <rect
         y="377.8927"
         x="96.920677"
@@ -462,7 +410,7 @@
           sodipodi:cy="358.94418"
           sodipodi:rx="70.677063"
           sodipodi:ry="70.677063"
-           d="m 394.67978,358.94418 a 70.677063,70.677063 0 0 1 -70.67706,70.67707 70.677063,70.677063 0 0 1 -70.67707,-70.67707 70.677063,70.677063 0 0 1 70.67707,-70.67706 70.677063,70.677063 0 0 1 70.67706,70.67706 z"
+           d="m 394.67978,358.94418 c 0,39.03387 -31.6432,70.67707 -70.67706,70.67707 -39.03387,0 -70.67707,-31.6432 -70.67707,-70.67707 0,-39.03386 31.6432,-70.67706 70.67707,-70.67706 39.03386,0 70.67706,31.6432 70.67706,70.67706 z"
           transform="matrix(0.36664048,0,0,0.36664048,0.86684619,-80.697844)" />
        <g
           id="g5262">
@@ -588,29 +536,29 @@
      </g>
      <rect
         y="754.5235"
-         x="231.29219"
+         x="225.29219"
         height="42.939091"
         width="118.56741"
         id="rect4267-4-7-7-3-3"
-         style="display:inline;fill:#ffffff;stroke:#000000;stroke-width:1;stroke-opacity:1" />
+         style="fill:#ffffff;stroke:#000000;stroke-width:1;stroke-opacity:1;display:inline" />
      <text
         sodipodi:linespacing="125%"
         id="text5037-4-6-9-1-4"
         y="783.03412"
-         x="290.34656"
-         style="font-style:normal;font-weight:normal;font-size:20.86613655px;line-height:125%;font-family:Sans;text-align:center;letter-spacing:0px;word-spacing:0px;text-anchor:middle;display:inline;fill:#000000;fill-opacity:1;stroke:none"
+         x="284.34656"
+         style="font-size:20.86613655px;font-style:normal;font-weight:normal;text-align:center;line-height:125%;letter-spacing:0px;word-spacing:0px;text-anchor:middle;fill:#000000;fill-opacity:1;stroke:none;display:inline;font-family:Sans"
         xml:space="preserve"><tspan
           id="tspan5184-3-5-2-1"
           style="font-size:20px;text-align:center;text-anchor:middle"
           y="783.03412"
-           x="290.34656"
+           x="284.34656"
           sodipodi:role="line">ceilometer</tspan></text>
      <g
-         transform="matrix(1.7775787,0,0,1.7775787,599.58186,304.14299)"
+         transform="matrix(1.7775787,0,0,1.7775787,593.58186,304.14299)"
         id="g4982"
         style="display:inline">
        <rect
-           style="display:inline;fill:#ffffff;stroke:#000000;stroke-width:0.562563;stroke-opacity:1"
+           style="fill:#ffffff;stroke:#000000;stroke-width:0.562563;stroke-opacity:1;display:inline"
           id="rect4267-4-7-7-3-3-1"
           width="66.701637"
           height="24.155943"
@@ -618,7 +566,7 @@
           y="253.36743" />
        <text
           xml:space="preserve"
-           style="font-style:normal;font-weight:normal;font-size:11.73851585px;line-height:125%;font-family:Sans;text-align:center;letter-spacing:0px;word-spacing:0px;text-anchor:middle;display:inline;fill:#000000;fill-opacity:1;stroke:none"
+           style="font-size:11.73851585px;font-style:normal;font-weight:normal;text-align:center;line-height:125%;letter-spacing:0px;word-spacing:0px;text-anchor:middle;fill:#000000;fill-opacity:1;stroke:none;display:inline;font-family:Sans"
           x="-100.86156"
           y="268.36258"
           id="text5037-4-6-9-1-4-3"
@@ -672,6 +620,12 @@
             style="font-size:11.2512598px;text-align:center;text-anchor:middle"
             id="tspan5022">drivers</tspan></text>
      </g>
+      <path
+         sodipodi:nodetypes="cc"
+         inkscape:connector-curvature="0"
+         id="path5110"
+         d="m 376.75141,726.9703 -57.95106,0"
+         style="fill:none;stroke:#000000;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;display:inline" />
      <g
         transform="matrix(1.7775787,0,0,1.7775787,704.59677,780.35846)"
         id="g5267"
@@ -909,8 +863,8 @@
         sodipodi:nodetypes="cc"
         inkscape:connector-curvature="0"
         id="path5110-9"
-         d="m 472.18905,726.66568 331.45651,0"
-         style="display:inline;fill:none;stroke:#000000;stroke-width:1.22230256px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
+         d="m 472.18905,726.66568 221.85496,0"
+         style="fill:none;stroke:#000000;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;display:inline" />
      <path
         sodipodi:nodetypes="cc"
         inkscape:connector-curvature="0"
@@ -953,8 +907,8 @@
         sodipodi:nodetypes="cc"
         inkscape:connector-curvature="0"
         id="path3284-4-2-3-4-6"
-         d="m 543.75943,651.7922 280.63651,0"
-         style="display:inline;fill:none;stroke:#000000;stroke-width:1.25154257;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:2.50308524, 2.50308524;stroke-dashoffset:0;stroke-opacity:1;marker-start:url(#TriangleInL)" />
+         d="m 540.57926,651.7922 179.16488,0"
+         style="fill:none;stroke:#000000;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:1.99999999, 1.99999999;stroke-dashoffset:0;marker-start:url(#TriangleInL);display:inline" />
      <rect
         y="262.01205"
         x="451.89563"
@@ -1098,8 +1052,8 @@
         sodipodi:nodetypes="cc"
         inkscape:connector-curvature="0"
         id="path5112-89"
-         d="m 324.87061,655.34778 0,71.7093"
-         style="display:inline;fill:none;stroke:#000000;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
+         d="m 328.87061,655.34778 0,71.7093"
+         style="fill:none;stroke:#000000;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;display:inline" />
      <path
         sodipodi:nodetypes="cc"
         inkscape:connector-curvature="0"
@@ -1224,7 +1178,7 @@
           sodipodi:role="line">extensions</tspan></text>
      <path
         transform="translate(68.397849,130.15566)"
-         d="m 519.41589,367.58817 a 4.4922457,7.2686057 0 0 1 -4.49224,7.2686 4.4922457,7.2686057 0 0 1 -4.49225,-7.2686 4.4922457,7.2686057 0 0 1 4.49225,-7.26861 4.4922457,7.2686057 0 0 1 4.49224,7.26861 z"
+         d="m 519.41589,367.58817 c 0,4.01434 -2.01125,7.2686 -4.49224,7.2686 -2.481,0 -4.49225,-3.25426 -4.49225,-7.2686 0,-4.01434 2.01125,-7.26861 4.49225,-7.26861 2.48099,0 4.49224,3.25427 4.49224,7.26861 z"
         sodipodi:ry="7.2686057"
         sodipodi:rx="4.4922457"
         sodipodi:cy="367.58817"
@@ -1234,7 +1188,7 @@
         sodipodi:type="arc" />
      <path
         transform="matrix(0.36538461,0,0,0.36538461,397.30905,368.17877)"
-         d="m 521.38126,368.43045 a 7.2998991,7.2998991 0 0 1 -7.2999,7.2999 7.2998991,7.2998991 0 0 1 -7.2999,-7.2999 7.2998991,7.2998991 0 0 1 7.2999,-7.2999 7.2998991,7.2998991 0 0 1 7.2999,7.2999 z"
+         d="m 521.38126,368.43045 c 0,4.03162 -3.26828,7.2999 -7.2999,7.2999 -4.03162,0 -7.2999,-3.26828 -7.2999,-7.2999 0,-4.03162 3.26828,-7.2999 7.2999,-7.2999 4.03162,0 7.2999,3.26828 7.2999,7.2999 z"
         sodipodi:ry="7.2998991"
         sodipodi:rx="7.2998991"
         sodipodi:cy="368.43045"
@@ -1244,7 +1198,7 @@
         sodipodi:type="arc" />
      <path
         transform="matrix(0.36538461,0,0,0.36538461,-27.122619,99.964199)"
-         d="m 521.38126,368.43045 a 7.2998991,7.2998991 0 0 1 -7.2999,7.2999 7.2998991,7.2998991 0 0 1 -7.2999,-7.2999 7.2998991,7.2998991 0 0 1 7.2999,-7.2999 7.2998991,7.2998991 0 0 1 7.2999,7.2999 z"
+         d="m 521.38126,368.43045 c 0,4.03162 -3.26828,7.2999 -7.2999,7.2999 -4.03162,0 -7.2999,-3.26828 -7.2999,-7.2999 0,-4.03162 3.26828,-7.2999 7.2999,-7.2999 4.03162,0 7.2999,3.26828 7.2999,7.2999 z"
         sodipodi:ry="7.2998991"
         sodipodi:rx="7.2998991"
         sodipodi:cy="368.43045"
@@ -1260,7 +1214,7 @@
         style="fill:none;stroke:#000000;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:3.99999997, 1.99999998, 0.99999999, 1.99999998;stroke-dashoffset:0;marker-start:none;display:inline" />
      <path
         transform="matrix(0.36538461,0,0,0.36538461,396.74123,268.71562)"
-         d="m 521.38126,368.43045 a 7.2998991,7.2998991 0 0 1 -7.2999,7.2999 7.2998991,7.2998991 0 0 1 -7.2999,-7.2999 7.2998991,7.2998991 0 0 1 7.2999,-7.2999 7.2998991,7.2998991 0 0 1 7.2999,7.2999 z"
+         d="m 521.38126,368.43045 c 0,4.03162 -3.26828,7.2999 -7.2999,7.2999 -4.03162,0 -7.2999,-3.26828 -7.2999,-7.2999 0,-4.03162 3.26828,-7.2999 7.2999,-7.2999 4.03162,0 7.2999,3.26828 7.2999,7.2999 z"
         sodipodi:ry="7.2998991"
         sodipodi:rx="7.2998991"
         sodipodi:cy="368.43045"
@@ -1270,7 +1224,7 @@
         sodipodi:type="arc" />
      <path
         transform="matrix(0.36538461,0,0,0.36538461,428.69747,559.36511)"
-         d="m 521.38126,368.43045 a 7.2998991,7.2998991 0 0 1 -7.2999,7.2999 7.2998991,7.2998991 0 0 1 -7.2999,-7.2999 7.2998991,7.2998991 0 0 1 7.2999,-7.2999 7.2998991,7.2998991 0 0 1 7.2999,7.2999 z"
+         d="m 521.38126,368.43045 c 0,4.03162 -3.26828,7.2999 -7.2999,7.2999 -4.03162,0 -7.2999,-3.26828 -7.2999,-7.2999 0,-4.03162 3.26828,-7.2999 7.2999,-7.2999 4.03162,0 7.2999,3.26828 7.2999,7.2999 z"
         sodipodi:ry="7.2998991"
         sodipodi:rx="7.2998991"
         sodipodi:cy="368.43045"
@@ -1280,7 +1234,7 @@
         sodipodi:type="arc" />
      <path
         transform="matrix(0.36538461,0,0,0.36538461,531.88959,559.36511)"
-         d="m 521.38126,368.43045 a 7.2998991,7.2998991 0 0 1 -7.2999,7.2999 7.2998991,7.2998991 0 0 1 -7.2999,-7.2999 7.2998991,7.2998991 0 0 1 7.2999,-7.2999 7.2998991,7.2998991 0 0 1 7.2999,7.2999 z"
+         d="m 521.38126,368.43045 c 0,4.03162 -3.26828,7.2999 -7.2999,7.2999 -4.03162,0 -7.2999,-3.26828 -7.2999,-7.2999 0,-4.03162 3.26828,-7.2999 7.2999,-7.2999 4.03162,0 7.2999,3.26828 7.2999,7.2999 z"
         sodipodi:ry="7.2998991"
         sodipodi:rx="7.2998991"
         sodipodi:cy="368.43045"
@@ -1296,7 +1250,7 @@
         style="fill:none;stroke:#000000;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:1.99999998, 1.99999998;stroke-dashoffset:0;marker-start:none;display:inline" />
      <path
         transform="matrix(0.36538461,0,0,0.36538461,748.91653,525.25993)"
-         d="m 521.38126,368.43045 a 7.2998991,7.2998991 0 0 1 -7.2999,7.2999 7.2998991,7.2998991 0 0 1 -7.2999,-7.2999 7.2998991,7.2998991 0 0 1 7.2999,-7.2999 7.2998991,7.2998991 0 0 1 7.2999,7.2999 z"
+         d="m 521.38126,368.43045 c 0,4.03162 -3.26828,7.2999 -7.2999,7.2999 -4.03162,0 -7.2999,-3.26828 -7.2999,-7.2999 0,-4.03162 3.26828,-7.2999 7.2999,-7.2999 4.03162,0 7.2999,3.26828 7.2999,7.2999 z"
         sodipodi:ry="7.2998991"
         sodipodi:rx="7.2998991"
         sodipodi:cy="368.43045"
@@ -1306,7 +1260,7 @@
         sodipodi:type="arc" />
      <path
         transform="matrix(0.36538461,0,0,0.36538461,748.91653,495.84628)"
-         d="m 521.38126,368.43045 a 7.2998991,7.2998991 0 0 1 -7.2999,7.2999 7.2998991,7.2998991 0 0 1 -7.2999,-7.2999 7.2998991,7.2998991 0 0 1 7.2999,-7.2999 7.2998991,7.2998991 0 0 1 7.2999,7.2999 z"
+         d="m 521.38126,368.43045 c 0,4.03162 -3.26828,7.2999 -7.2999,7.2999 -4.03162,0 -7.2999,-3.26828 -7.2999,-7.2999 0,-4.03162 3.26828,-7.2999 7.2999,-7.2999 4.03162,0 7.2999,3.26828 7.2999,7.2999 z"
         sodipodi:ry="7.2998991"
         sodipodi:rx="7.2998991"
         sodipodi:cy="368.43045"
@@ -1359,7 +1313,7 @@
      </g>
      <path
         transform="matrix(0.36538461,0,0,0.36538461,396.74122,268.71562)"
-         d="m 521.38126,368.43045 a 7.2998991,7.2998991 0 0 1 -7.2999,7.2999 7.2998991,7.2998991 0 0 1 -7.2999,-7.2999 7.2998991,7.2998991 0 0 1 7.2999,-7.2999 7.2998991,7.2998991 0 0 1 7.2999,7.2999 z"
+         d="m 521.38126,368.43045 c 0,4.03162 -3.26828,7.2999 -7.2999,7.2999 -4.03162,0 -7.2999,-3.26828 -7.2999,-7.2999 0,-4.03162 3.26828,-7.2999 7.2999,-7.2999 4.03162,0 7.2999,3.26828 7.2999,7.2999 z"
         sodipodi:ry="7.2998991"
         sodipodi:rx="7.2998991"
         sodipodi:cy="368.43045"
@@ -1369,7 +1323,7 @@
         sodipodi:type="arc" />
      <path
         transform="matrix(0.36538461,0,0,0.36538461,-27.122619,74.87915)"
-         d="m 521.38126,368.43045 a 7.2998991,7.2998991 0 0 1 -7.2999,7.2999 7.2998991,7.2998991 0 0 1 -7.2999,-7.2999 7.2998991,7.2998991 0 0 1 7.2999,-7.2999 7.2998991,7.2998991 0 0 1 7.2999,7.2999 z"
+         d="m 521.38126,368.43045 c 0,4.03162 -3.26828,7.2999 -7.2999,7.2999 -4.03162,0 -7.2999,-3.26828 -7.2999,-7.2999 0,-4.03162 3.26828,-7.2999 7.2999,-7.2999 4.03162,0 7.2999,3.26828 7.2999,7.2999 z"
         sodipodi:ry="7.2998991"
         sodipodi:rx="7.2998991"
         sodipodi:cy="368.43045"
@@ -1385,7 +1339,7 @@
         style="fill:none;stroke:#000000;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:3.99999997, 1.99999998, 0.99999999, 1.99999998;stroke-dashoffset:0;marker-start:url(#TriangleInL);display:inline" />
      <path
         transform="matrix(0.36538461,0,0,0.36538461,422.9095,223.59883)"
-         d="m 521.38126,368.43045 a 7.2998991,7.2998991 0 0 1 -7.2999,7.2999 7.2998991,7.2998991 0 0 1 -7.2999,-7.2999 7.2998991,7.2998991 0 0 1 7.2999,-7.2999 7.2998991,7.2998991 0 0 1 7.2999,7.2999 z"
+         d="m 521.38126,368.43045 c 0,4.03162 -3.26828,7.2999 -7.2999,7.2999 -4.03162,0 -7.2999,-3.26828 -7.2999,-7.2999 0,-4.03162 3.26828,-7.2999 7.2999,-7.2999 4.03162,0 7.2999,3.26828 7.2999,7.2999 z"
         sodipodi:ry="7.2998991"
         sodipodi:rx="7.2998991"
         sodipodi:cy="368.43045"
@@ -1397,87 +1351,15 @@
         sodipodi:nodetypes="cc"
         inkscape:connector-curvature="0"
         id="path3284-4-2-3-40"
-         d="m 325.23661,753.47677 0,-27.00021"
-         style="display:inline;fill:none;stroke:#000000;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;marker-start:url(#EmptyTriangleInL)" />
+         d="m 319.30136,753.47677 0,-27.00021"
+         style="fill:none;stroke:#000000;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;marker-start:url(#EmptyTriangleInL);display:inline" />
      <path
         sodipodi:nodetypes="cc"
         inkscape:connector-curvature="0"
         id="path3284-4-2-3-8"
-         d="m 414.2546,753.65849 0,-27.00021"
-         style="display:inline;fill:none;stroke:#000000;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;marker-start:url(#EmptyTriangleInL)" />
-      <rect
-         y="754.5235"
-         x="102.92204"
-         height="42.939091"
-         width="118.56741"
-         id="rect4267-4-7-7-3-3-3"
-         style="display:inline;fill:#ffffff;stroke:#000000;stroke-width:1;stroke-opacity:1" />
-      <text
-         sodipodi:linespacing="125%"
-         id="text5037-4-6-9-1-4-6"
-         y="783.03412"
-         x="160.34656"
-         style="font-style:normal;font-weight:normal;font-size:20.86613655px;line-height:125%;font-family:Sans;text-align:center;letter-spacing:0px;word-spacing:0px;text-anchor:middle;display:inline;fill:#000000;fill-opacity:1;stroke:none"
-         xml:space="preserve"><tspan
-           id="tspan5184-3-5-2-1-7"
-           style="font-size:20px;text-align:center;text-anchor:middle"
-           y="783.03412"
-           x="160.34656"
-           sodipodi:role="line">gnocchi</tspan></text>
-      <path
-         sodipodi:nodetypes="cc"
-         inkscape:connector-curvature="0"
-         id="path3284-4-2-3-40-5"
-         d="m 191.30136,753.47677 0,-27.00021"
-         style="display:inline;fill:none;stroke:#000000;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;marker-start:url(#EmptyTriangleInL-5)" />
-      <path
-         sodipodi:nodetypes="cc"
-         inkscape:connector-curvature="0"
-         id="path5110-9-6"
-         d="m 192.18905,726.66568 221.85496,0"
-         style="display:inline;fill:none;stroke:#000000;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
-      <g
-         id="g4866-2-3"
-         style="display:inline"
-         transform="matrix(1.7775787,0,0,1.7775787,991.15946,596.08131)">
-        <rect
-           style="display:inline;fill:#ffffff;stroke:#000000;stroke-width:0.562563;stroke-opacity:1"
-           id="rect4267-4-7-7-6"
-           width="49.81258"
-           height="24.243191"
-           x="-116.67716"
-           y="88.977051" />
-        <text
-           xml:space="preserve"
-           style="font-style:normal;font-weight:normal;font-size:11.73851585px;line-height:125%;font-family:Sans;text-align:center;letter-spacing:0px;word-spacing:0px;text-anchor:middle;display:inline;fill:#000000;fill-opacity:1;stroke:none"
-           x="-91.899979"
-           y="104.01585"
-           id="text5037-4-6-9-7"
-           sodipodi:linespacing="125%"><tspan
-             sodipodi:role="line"
-             x="-91.899979"
-             y="104.01585"
-             style="font-size:11.2512598px;text-align:center;text-anchor:middle"
-             id="tspan5184-3-5-5">cinder</tspan></text>
-      </g>
-      <path
-         sodipodi:nodetypes="cc"
-         inkscape:connector-curvature="0"
-         id="path3284-4-2-3-4-9-3"
-         d="m 824.37881,651.58554 0,102.98987"
-         style="display:inline;fill:none;stroke:#000000;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:1.99999999, 1.99999999;stroke-dashoffset:0;stroke-opacity:1;marker-start:none" />
-      <circle
-         r="2.6672709"
-         cy="693.98395"
-         cx="823.72699"
-         id="path13407-89-5"
-         style="color:#000000;display:inline;overflow:visible;visibility:visible;fill:#ececec;fill-opacity:1;fill-rule:nonzero;stroke:#000000;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;enable-background:accumulate" />
-      <path
-         sodipodi:nodetypes="cc"
-         inkscape:connector-curvature="0"
-         id="path3284-4-2-3-7-9"
-         d="m 804.16781,752.35205 0,-26.2061"
-         style="display:inline;fill:none;stroke:#000000;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;marker-start:url(#EmptyTriangleInL-12)" />
+         d="m 376.2546,753.65849 0,-27.00021"
+         style="fill:none;stroke:#000000;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;marker-start:url(#EmptyTriangleInL);display:inline" />
    </g>
  </g>
 </svg>
+
--- a/doc/source/images/audit_state_machine.png
+++ b/doc/source/images/audit_state_machine.png
--- a/doc/source/index.rst
+++ b/doc/source/index.rst
@@ -15,7 +15,7 @@ metrics receiver, complex event processor and profiler, optimization processor
 and an action plan applier. This provides a robust framework to realize a wide
 range of cloud optimization goals, including the reduction of data center
 operating costs, increased system performance via intelligent virtual machine
-migration, increased energy efficiency and more!
+migration, increased energy efficiency—and more!

 Watcher project consists of several source code repositories:

@@ -43,7 +43,7 @@ Introduction

  glossary
  architecture
-  contributor/contributing
+  dev/contributing


 Getting Started
@@ -52,7 +52,13 @@ Getting Started
 .. toctree::
  :maxdepth: 1

-  contributor/index
+  dev/environment
+  dev/devstack
+  deploy/configuration
+  deploy/conf-files
+  dev/notifications
+  dev/testing
+  dev/rally_link

 API References
 --------------
@@ -60,7 +66,7 @@ API References
 .. toctree::
  :maxdepth: 1

-  api/index
+  webapi/v1

 Plugins
 -------
@@ -68,38 +74,30 @@ Plugins
 .. toctree::
  :maxdepth: 1

-  contributor/plugin/index
+  dev/plugin/base-setup
+  dev/plugin/goal-plugin
+  dev/plugin/scoring-engine-plugin
+  dev/plugin/strategy-plugin
+  dev/plugin/cdmc-plugin
+  dev/plugin/action-plugin
+  dev/plugin/planner-plugin
+  dev/plugins

-Installation
-============
-.. toctree::
-  :maxdepth: 2
-
-  install/index
-
-Watcher Configuration Options
-=============================
-
-.. toctree::
-  :maxdepth: 2
-
-  configuration/index

 Admin Guide
 ===========

-.. toctree::
-  :maxdepth: 2
-
-  admin/index
-
-User Guide
-==========
+Introduction
+------------

 .. toctree::
-  :maxdepth: 2
+  :maxdepth: 1

-  user/index
+  deploy/installation
+  deploy/user-guide
+  deploy/policy
+  deploy/gmr
+  strategies/strategies

 Watcher Manual Pages
 ====================
@@ -108,7 +106,7 @@ Watcher Manual Pages
   :glob:
   :maxdepth: 1

-   man/index
+   man/*

 .. # NOTE(mriedem): This is the section where we hide things that we don't
   # actually want in the table of contents but sphinx build would fail if
--- a/doc/source/install/common_configure.rst
+++ b/doc/source/install/common_configure.rst
@@ -1,81 +0,0 @@
-2. Edit the ``/etc/watcher/watcher.conf`` file and complete the following
-   actions:
-
-   * In the ``[database]`` section, configure database access:
-
-     .. code-block:: ini
-
-        [database]
-        ...
-        connection = mysql+pymysql://watcher:WATCHER_DBPASS@controller/watcher?charset=utf8
-
-   * In the `[DEFAULT]` section, configure the transport url for RabbitMQ message broker.
-
-     .. code-block:: ini
-
-        [DEFAULT]
-        ...
-        control_exchange = watcher
-        transport_url = rabbit://openstack:RABBIT_PASS@controller
-
-     Replace the RABBIT_PASS with the password you chose for OpenStack user in RabbitMQ.
-
-   * In the `[keystone_authtoken]` section, configure Identity service access.
-
-     .. code-block:: ini
-
-        [keystone_authtoken]
-        ...
-        www_authenticate_uri = http://controller:5000
-        auth_url = http://controller:5000
-        memcached_servers = controller:11211
-        auth_type = password
-        project_domain_name = default
-        user_domain_name = default
-        project_name = service
-        username = watcher
-        password = WATCHER_PASS
-
-     Replace WATCHER_PASS with the password you chose for the watcher user in the Identity service.
-
-   * Watcher interacts with other OpenStack projects via project clients, in order to instantiate these
-     clients, Watcher requests new session from Identity service. In the `[watcher_clients_auth]` section,
-     configure the identity service access to interact with other OpenStack project clients.
-
-     .. code-block:: ini
-
-        [watcher_clients_auth]
-        ...
-        auth_type = password
-        auth_url = http://controller:5000
-        username = watcher
-        password = WATCHER_PASS
-        project_domain_name = default
-        user_domain_name = default
-        project_name = service
-
-     Replace WATCHER_PASS with the password you chose for the watcher user in the Identity service.
-
-   * In the `[api]` section, configure host option.
-
-     .. code-block:: ini
-
-        [api]
-        ...
-        host = controller
-
-     Replace controller with the IP address of the management network interface on your controller node, typically 10.0.0.11 for the first node in the example architecture.
-
-   * In the `[oslo_messaging_notifications]` section, configure the messaging driver.
-
-     .. code-block:: ini
-
-        [oslo_messaging_notifications]
-        ...
-        driver = messagingv2
-
-3. Populate watcher database:
-
-   .. code-block:: ini
-
-     su -s /bin/sh -c "watcher-db-manage --config-file /etc/watcher/watcher.conf upgrade"
--- a/doc/source/install/common_prerequisites.rst
+++ b/doc/source/install/common_prerequisites.rst
@@ -1,139 +0,0 @@
-Prerequisites
-------------
-
-Before you install and configure the Infrastructure Optimization service,
-you must create a database, service credentials, and API endpoints.
-
-1. Create the database, complete these steps:
-
-   * Use the database access client to connect to the database
-     server as the ``root`` user:
-
-     .. code-block:: console
-
-        $ mysql -u root -p
-
-   * Create the ``watcher`` database:
-
-     .. code-block:: console
-
-        CREATE DATABASE watcher CHARACTER SET utf8;
-
-   * Grant proper access to the ``watcher`` database:
-
-     .. code-block:: console
-
-        GRANT ALL PRIVILEGES ON watcher.* TO 'watcher'@'localhost' \
-          IDENTIFIED BY 'WATCHER_DBPASS';
-        GRANT ALL PRIVILEGES ON watcher.* TO 'watcher'@'%' \
-          IDENTIFIED BY 'WATCHER_DBPASS';
-
-     Replace ``WATCHER_DBPASS`` with a suitable password.
-
-   * Exit the database access client.
-
-     .. code-block:: console
-
-        exit;
-
-2. Source the ``admin`` credentials to gain access to
-   admin-only CLI commands:
-
-   .. code-block:: console
-
-      $ . admin-openrc
-
-3. To create the service credentials, complete these steps:
-
-   * Create the ``watcher`` user:
-
-     .. code-block:: console
-
-        $ openstack user create --domain default --password-prompt watcher
-          User Password:
-          Repeat User Password:
-          +---------------------+----------------------------------+
-          | Field               | Value                            |
-          +---------------------+----------------------------------+
-          | domain_id           | default                          |
-          | enabled             | True                             |
-          | id                  | b18ee38e06034b748141beda8fc8bfad |
-          | name                | watcher                          |
-          | options             | {}                               |
-          | password_expires_at | None                             |
-          +---------------------+----------------------------------+
-
-
-   * Add the ``admin`` role to the ``watcher`` user:
-
-     .. code-block:: console
-
-        $ openstack role add --project service --user watcher admin
-
-     .. note::
-
-        This command produces no output.
-
-   * Create the watcher service entities:
-
-     .. code-block:: console
-
-        $ openstack service create --name watcher --description "Infrastructure Optimization" infra-optim
-          +-------------+----------------------------------+
-          | Field       | Value                            |
-          +-------------+----------------------------------+
-          | description | Infrastructure Optimization      |
-          | enabled     | True                             |
-          | id          | d854f6fff0a64f77bda8003c8dedfada |
-          | name        | watcher                          |
-          | type        | infra-optim                      |
-          +-------------+----------------------------------+
-
-
-4. Create the Infrastructure Optimization service API endpoints:
-
-   .. code-block:: console
-
-      $ openstack endpoint create --region RegionOne \
-        infra-optim public http://controller:9322
-        +-------------+----------------------------------+
-        | Field       | Value                            |
-        +-------------+----------------------------------+
-        | description | Infrastructure Optimization      |
-        | enabled     | True                             |
-        | id          | d854f6fff0a64f77bda8003c8dedfada |
-        | name        | watcher                          |
-        | type        | infra-optim                      |
-        +-------------+----------------------------------+
-
-      $ openstack endpoint create --region RegionOne \
-        infra-optim internal http://controller:9322
-        +--------------+----------------------------------+
-        | Field        | Value                            |
-        +--------------+----------------------------------+
-        | enabled      | True                             |
-        | id           | 225aef8465ef4df48a341aaaf2b0a390 |
-        | interface    | internal                         |
-        | region       | RegionOne                        |
-        | region_id    | RegionOne                        |
-        | service_id   | d854f6fff0a64f77bda8003c8dedfada |
-        | service_name | watcher                          |
-        | service_type | infra-optim                      |
-        | url          | http://controller:9322           |
-        +--------------+----------------------------------+
-
-      $ openstack endpoint create --region RegionOne \
-        infra-optim admin http://controller:9322
-        +--------------+----------------------------------+
-        | Field        | Value                            |
-        +--------------+----------------------------------+
-        | enabled      | True                             |
-        | id           | 375eb5057fb546edbdf3ee4866179672 |
-        | interface    | admin                            |
-        | region       | RegionOne                        |
-        | region_id    | RegionOne                        |
-        | service_id   | d854f6fff0a64f77bda8003c8dedfada |
-        | service_name | watcher                          |
-        | service_type | infra-optim                      |
-        | url          | http://controller:9322           |
-        +--------------+----------------------------------+
--- a/doc/source/install/get_started.rst
+++ b/doc/source/install/get_started.rst
@@ -1,27 +0,0 @@
-============================================
-Infrastructure Optimization service overview
-============================================
-The Infrastructure Optimization service provides flexible and scalable
-optimization service for multi-tenant OpenStack based clouds.
-
-The Infrastructure Optimization service consists of the following components:
-
-``watcher`` command-line client
-  A CLI to communicate with ``watcher-api`` to optimize the cloud.
-
-``watcher-api`` service
-  An OpenStack-native REST API that accepts and responds to end-user calls
-  by processing them and forwarding to appropriate underlying watcher
-  services via AMQP.
-
-``watcher-decision-engine`` service
-  It runs audit and return an action plan to achieve optimization goal
-  specified by the end-user in audit.
-
-``watcher-applier`` service
-  It executes action plan built by watcher-decision-engine. It interacts with
-  other OpenStack components like nova to execute the given action
-  plan.
-
-``watcher-dashboard``
-  Watcher UI implemented as a plugin for the OpenStack Dashboard.
--- a/doc/source/install/index.rst
+++ b/doc/source/install/index.rst
@@ -1,39 +0,0 @@
-===================================
-Infrastructure Optimization service
-===================================
-
-.. toctree::
-   :maxdepth: 2
-
-   get_started.rst
-   install.rst
-   verify.rst
-   next-steps.rst
-
-The Infrastructure Optimization service (Watcher) provides
-flexible and scalable resource optimization service for
-multi-tenant OpenStack-based clouds.
-
-Watcher provides a complete optimization loop including
-everything from a metrics receiver, complex event processor
-and profiler, optimization processor and an action plan
-applier. This provides a robust framework to realize a wide
-range of cloud optimization goals, including the reduction
-of data center operating costs, increased system performance
-via intelligent virtual machine migration, increased energy
-efficiency and more!
-
-Watcher also supports a pluggable architecture by which custom
-optimization algorithms, data metrics and data profilers can be
-developed and inserted into the Watcher framework.
-
-Check the documentation for watcher optimization strategies at
-`Strategies <https://docs.openstack.org/watcher/latest/strategies/index.html>`_.
-
-Check watcher glossary at `Glossary
-<https://docs.openstack.org/watcher/latest/glossary.html>`_.
-
-
-This chapter assumes a working setup of OpenStack following the
-`OpenStack Installation Tutorial
-<https://docs.openstack.org/queens/install/>`_.
--- a/doc/source/install/install-rdo.rst
+++ b/doc/source/install/install-rdo.rst
@@ -1,38 +0,0 @@
-.. _install-rdo:
-
-Install and configure for Red Hat Enterprise Linux and CentOS
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-
-
-This section describes how to install and configure the Infrastructure
-Optimization service for Red Hat Enterprise Linux 7 and CentOS 7.
-
-.. include:: common_prerequisites.rst
-
-Install and configure components
--------------------------------
-
-1. Install the packages:
-
-   .. code-block:: console
-
-      # sudo yum install openstack-watcher-api openstack-watcher-applier \
-        openstack-watcher-decision-engine
-
-.. include:: common_configure.rst
-
-Finalize installation
---------------------
-
-Start the Infrastructure Optimization services and configure them to start when
-the system boots:
-
-.. code-block:: console
-
-   # systemctl enable openstack-watcher-api.service \
-     openstack-watcher-decision-engine.service \
-     openstack-watcher-applier.service
-
-   # systemctl start openstack-watcher-api.service \
-     openstack-watcher-decision-engine.service \
-     openstack-watcher-applier.service
--- a/doc/source/install/install-ubuntu.rst
+++ b/doc/source/install/install-ubuntu.rst
@@ -1,34 +0,0 @@
-.. _install-ubuntu:
-
-Install and configure for Ubuntu
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-
-This section describes how to install and configure the Infrastructure
-Optimization service for Ubuntu 14.04 (LTS).
-
-.. include:: common_prerequisites.rst
-
-Install and configure components
--------------------------------
-
-1. Install the packages:
-
-   .. code-block:: console
-
-      # apt install watcher-api watcher-decision-engine \
-        watcher-applier
-
-      # apt install python-watcherclient
-
-.. include:: common_configure.rst
-
-Finalize installation
---------------------
-
-Restart the Infrastructure Optimization services:
-
-.. code-block:: console
-
-   # service watcher-api restart
-   # service watcher-decision-engine restart
-   # service watcher-applier restart
--- a/doc/source/install/install.rst
+++ b/doc/source/install/install.rst
@@ -1,19 +0,0 @@
-.. _install:
-
-Install and configure
-~~~~~~~~~~~~~~~~~~~~~
-
-This section describes how to install and configure the Infrastructure
-Optimization service, code-named watcher, on the controller node.
-
-This section assumes that you already have a working OpenStack
-environment with at least the following components installed:
-Identity Service, Compute Service, Telemetry data collection service.
-
-Note that installation and configuration vary by distribution.
-
-.. toctree::
-   :maxdepth: 2
-
-   install-rdo.rst
-   install-ubuntu.rst
--- a/doc/source/install/next-steps.rst
+++ b/doc/source/install/next-steps.rst
@@ -1,9 +0,0 @@
-.. _next-steps:
-
-Next steps
-~~~~~~~~~~
-
-Your OpenStack environment now includes the watcher service.
-
-To add additional services, see
-https://docs.openstack.org/queens/install/.
--- a/doc/source/install/verify.rst
+++ b/doc/source/install/verify.rst
@@ -1,119 +0,0 @@
-.. _verify:
-
-Verify operation
-~~~~~~~~~~~~~~~~
-
-Verify operation of the Infrastructure Optimization service.
-
-.. note::
-
-   Perform these commands on the controller node.
-
-1. Source the ``admin`` project credentials to gain access to
-   admin-only CLI commands:
-
-   .. code-block:: console
-
-      $ . admin-openrc
-
-2. List service components to verify successful launch and registration
-   of each process:
-
-   .. code-block:: console
-
-      $ openstack optimize service list
-        +----+-------------------------+------------+--------+
-        | ID | Name                    | Host       | Status |
-        +----+-------------------------+------------+--------+
-        |  1 | watcher-decision-engine | controller | ACTIVE |
-        |  2 | watcher-applier         | controller | ACTIVE |
-        +----+-------------------------+------------+--------+
-
-3. List goals and strategies:
-
-   .. code-block:: console
-
-      $ openstack optimize goal list
-        +--------------------------------------+----------------------+----------------------+
-        | UUID                                 | Name                 | Display name         |
-        +--------------------------------------+----------------------+----------------------+
-        | a8cd6d1a-008b-4ff0-8dbc-b30493fcc5b9 | dummy                | Dummy goal           |
-        | 03953f2f-02d0-42b5-9a12-7ba500a54395 | workload_balancing   | Workload Balancing   |
-        | de0f8714-984b-4d6b-add1-9cad8120fbce | server_consolidation | Server Consolidation |
-        | f056bc80-c6d1-40dc-b002-938ccade9385 | thermal_optimization | Thermal Optimization |
-        | e7062856-892e-4f0f-b84d-b828464b3fd0 | airflow_optimization | Airflow Optimization |
-        | 1f038da9-b36c-449f-9f04-c225bf3eb478 | unclassified         | Unclassified         |
-        +--------------------------------------+----------------------+----------------------+
-
-      $ openstack optimize strategy list
-      +--------------------------------------+---------------------------+---------------------------------------------+----------------------+
-      | UUID                                 | Name                      | Display name                                | Goal                 |
-      +--------------------------------------+---------------------------+---------------------------------------------+----------------------+
-      | 98ae84c8-7c9b-4cbd-8d9c-4bd7c6b106eb | dummy                     | Dummy strategy                              | dummy                |
-      | 02a170b6-c72e-479d-95c0-8a4fdd4cc1ef | dummy_with_scorer         | Dummy Strategy using sample Scoring Engines | dummy                |
-      | 8bf591b8-57e5-4a9e-8c7d-c37bda735a45 | outlet_temperature        | Outlet temperature based strategy           | thermal_optimization |
-      | 8a0810fb-9d9a-47b9-ab25-e442878abc54 | vm_workload_consolidation | VM Workload Consolidation Strategy          | server_consolidation |
-      | 1718859c-3eb5-45cb-9220-9cb79fe42fa5 | basic                     | Basic offline consolidation                 | server_consolidation |
-      | b5e7f5f1-4824-42c7-bb52-cf50724f67bf | workload_stabilization    | Workload stabilization                      | workload_balancing   |
-      | f853d71e-9286-4df3-9d3e-8eaf0f598e07 | workload_balance          | Workload Balance Migration Strategy         | workload_balancing   |
-      | 58bdfa89-95b5-4630-adf6-fd3af5ff1f75 | uniform_airflow           | Uniform airflow migration strategy          | airflow_optimization |
-      | 66fde55d-a612-4be9-8cb0-ea63472b420b | dummy_with_resize         | Dummy strategy with resize                  | dummy                |
-      +--------------------------------------+---------------------------+---------------------------------------------+----------------------+
-
-4. Run an action plan by creating an audit with dummy goal:
-
-   .. code-block:: console
-
-      $ openstack optimize audit create --goal dummy
-        +--------------+--------------------------------------+
-        | Field        | Value                                |
-        +--------------+--------------------------------------+
-        | UUID         | e94d4826-ad4e-44df-ad93-dff489fde457 |
-        | Created At   | 2017-05-23T11:46:58.763394+00:00     |
-        | Updated At   | None                                 |
-        | Deleted At   | None                                 |
-        | State        | PENDING                              |
-        | Audit Type   | ONESHOT                              |
-        | Parameters   | {}                                   |
-        | Interval     | None                                 |
-        | Goal         | dummy                                |
-        | Strategy     | auto                                 |
-        | Audit Scope  | []                                   |
-        | Auto Trigger | False                                |
-        +--------------+--------------------------------------+
-
-      $ openstack optimize audit list
-        +--------------------------------------+------------+-----------+-------+----------+--------------+
-        | UUID                                 | Audit Type | State     | Goal  | Strategy | Auto Trigger |
-        +--------------------------------------+------------+-----------+-------+----------+--------------+
-        | e94d4826-ad4e-44df-ad93-dff489fde457 | ONESHOT    | SUCCEEDED | dummy | auto     | False        |
-        +--------------------------------------+------------+-----------+-------+----------+--------------+
-
-      $ openstack optimize actionplan list
-        +--------------------------------------+--------------------------------------+-------------+------------+-----------------+
-        | UUID                                 | Audit                                | State       | Updated At | Global efficacy |
-        +--------------------------------------+--------------------------------------+-------------+------------+-----------------+
-        | ba9ce6b3-969c-4b8e-bb61-ae24e8630f81 | e94d4826-ad4e-44df-ad93-dff489fde457 | RECOMMENDED | None       | None            |
-        +--------------------------------------+--------------------------------------+-------------+------------+-----------------+
-
-     $ openstack optimize actionplan start ba9ce6b3-969c-4b8e-bb61-ae24e8630f81
-       +---------------------+--------------------------------------+
-       | Field               | Value                                |
-       +---------------------+--------------------------------------+
-       | UUID                | ba9ce6b3-969c-4b8e-bb61-ae24e8630f81 |
-       | Created At          | 2017-05-23T11:46:58+00:00            |
-       | Updated At          | 2017-05-23T11:53:12+00:00            |
-       | Deleted At          | None                                 |
-       | Audit               | e94d4826-ad4e-44df-ad93-dff489fde457 |
-       | Strategy            | dummy                                |
-       | State               | ONGOING                              |
-       | Efficacy indicators | []                                   |
-       | Global efficacy     | {}                                   |
-       +---------------------+--------------------------------------+
-
-     $ openstack optimize actionplan list
-     +--------------------------------------+--------------------------------------+-----------+---------------------------+-----------------+
-     | UUID                                 | Audit                                | State     | Updated At                | Global efficacy |
-     +--------------------------------------+--------------------------------------+-----------+---------------------------+-----------------+
-     | ba9ce6b3-969c-4b8e-bb61-ae24e8630f81 | e94d4826-ad4e-44df-ad93-dff489fde457 | SUCCEEDED | 2017-05-23T11:53:16+00:00 | None            |
-     +--------------------------------------+--------------------------------------+-----------+---------------------------+-----------------+
--- a/doc/source/man/index.rst
+++ b/doc/source/man/index.rst
@@ -1,8 +0,0 @@
-.. toctree::
-   :glob:
-   :maxdepth: 1
-
-   watcher-api
-   watcher-applier
-   watcher-db-manage
-   watcher-decision-engine
--- a/doc/source/man/watcher-api.rst
+++ b/doc/source/man/watcher-api.rst
@@ -7,7 +7,9 @@ Service for the Watcher API
 ---------------------------

 :Author: openstack@lists.launchpad.net
+:Date:
 :Copyright: OpenStack Foundation
+:Version:
 :Manual section: 1
 :Manual group: cloud computing

--- a/doc/source/man/watcher-applier.rst
+++ b/doc/source/man/watcher-applier.rst
@@ -7,7 +7,9 @@ Service for the Watcher Applier
 -------------------------------

 :Author: openstack@lists.launchpad.net
+:Date:
 :Copyright: OpenStack Foundation
+:Version:
 :Manual section: 1
 :Manual group: cloud computing

--- a/doc/source/man/watcher-decision-engine.rst
+++ b/doc/source/man/watcher-decision-engine.rst
@@ -7,7 +7,9 @@ Service for the Watcher Decision Engine
 ---------------------------------------

 :Author: openstack@lists.launchpad.net
+:Date:
 :Copyright: OpenStack Foundation
+:Version:
 :Manual section: 1
 :Manual group: cloud computing

--- a/doc/source/strategies/actuation.rst
+++ b/doc/source/strategies/actuation.rst
@@ -1,86 +0,0 @@
-=============
-Actuator
-=============
-
-Synopsis
--------
-
-**display name**: ``Actuator``
-
-**goal**: ``unclassified``
-
-    .. watcher-term:: watcher.decision_engine.strategy.strategies.actuation.Actuator
-
-Requirements
------------
-
-Metrics
-*******
-
-None
-
-Cluster data model
-******************
-
-None
-
-Actions
-*******
-
-Default Watcher's actions.
-
-Planner
-*******
-
-Default Watcher's planner:
-
-    .. watcher-term:: watcher.decision_engine.planner.weight.WeightPlanner
-
-Configuration
-------------
-
-Strategy parameters are:
-
-==================== ====== ===================== =============================
-parameter            type   default Value         description
-==================== ====== ===================== =============================
-``actions``          array  None                  Actions to be executed.
-==================== ====== ===================== =============================
-
-The elements of actions array are:
-
-==================== ====== ===================== =============================
-parameter            type   default Value         description
-==================== ====== ===================== =============================
-``action_type``      string None                  Action name defined in
-                                                  setup.cfg(mandatory)
-``resource_id``      string None                  Resource_id of the action.
-``input_parameters`` object None                  Input_parameters of the
-                                                  action(mandatory).
-==================== ====== ===================== =============================
-
-Efficacy Indicator
------------------
-
-None
-
-Algorithm
---------
-
-This strategy create an action plan with a predefined set of actions.
-
-How to use it ?
---------------
-
-.. code-block:: shell
-
-    $ openstack optimize audittemplate create \
-      at1 unclassified --strategy actuator
-
-    $ openstack optimize audit create -a at1 \
-      -p actions='[{"action_type": "migrate", "resource_id": "56a40802-6fde-4b59-957c-c84baec7eaed", "input_parameters": {"migration_type": "live", "source_node": "s01"}}]'
-
-External Links
--------------
-
-None
--- a/doc/source/strategies/basic-server-consolidation.rst
+++ b/doc/source/strategies/basic-server-consolidation.rst
@@ -5,11 +5,11 @@ Basic Offline Server Consolidation
 Synopsis
 --------

-**display name**: ``Basic offline consolidation``
+**display name**: ``basic``

 **goal**: ``server_consolidation``

-    .. watcher-term:: watcher.decision_engine.strategy.strategies.basic_consolidation.BasicConsolidation
+    .. watcher-term:: watcher.decision_engine.strategy.strategies.basic_consolidation

 Requirements
 ------------
@@ -26,7 +26,7 @@ metric                       service name plugins comment
 ``cpu_util``                 ceilometer_  none
 ============================ ============ ======= =======

-.. _ceilometer: https://docs.openstack.org/ceilometer/latest/admin/telemetry-measurements.html#openstack-compute
+.. _ceilometer: http://docs.openstack.org/admin-guide/telemetry-measurements.html#openstack-compute

 Cluster data model
 ******************
@@ -57,7 +57,7 @@ Planner

 Default Watcher's planner:

-    .. watcher-term:: watcher.decision_engine.planner.weight.WeightPlanner
+    .. watcher-term:: watcher.decision_engine.planner.default.DefaultPlanner

 Configuration
 -------------
--- a/doc/source/strategies/host_maintenance.rst
+++ b/doc/source/strategies/host_maintenance.rst
@@ -1,92 +0,0 @@
-===========================
-Host Maintenance Strategy
-===========================
-
-Synopsis
--------
-
-**display name**: ``Host Maintenance Strategy``
-
-**goal**: ``cluster_maintaining``
-
-    .. watcher-term:: watcher.decision_engine.strategy.strategies.host_maintenance.HostMaintenance
-
-Requirements
------------
-
-None.
-
-Metrics
-*******
-
-None
-
-Cluster data model
-******************
-
-Default Watcher's Compute cluster data model:
-
-    .. watcher-term:: watcher.decision_engine.model.collector.nova.NovaClusterDataModelCollector
-
-Actions
-*******
-
-Default Watcher's actions:
-
-    .. list-table::
-       :widths: 30 30
-       :header-rows: 1
-
-       * - action
-         - description
-       * - ``migration``
-         - .. watcher-term:: watcher.applier.actions.migration.Migrate
-
-Planner
-*******
-
-Default Watcher's planner:
-
-    .. watcher-term:: watcher.decision_engine.planner.weight.WeightPlanner
-
-Configuration
-------------
-
-Strategy parameters are:
-
-==================== ====== ====================================
-parameter            type   default Value description
-==================== ====== ====================================
-``maintenance_node`` String The name of the compute node which
-                            need maintenance. Required.
-``backup_node``      String The name of the compute node which
-                            will backup the maintenance node.
-                            Optional.
-==================== ====== ====================================
-
-Efficacy Indicator
------------------
-
-None
-
-Algorithm
---------
-
-For more information on the Host Maintenance Strategy please refer
-to: https://specs.openstack.org/openstack/watcher-specs/specs/queens/approved/cluster-maintenance-strategy.html
-
-How to use it ?
---------------
-
-.. code-block:: shell
-
-    $ openstack optimize audit create \
-      -g cluster_maintaining -s host_maintenance \
-      -p maintenance_node=compute01 \
-      -p backup_node=compute02 \
-      --auto-trigger
-
-External Links
--------------
-
-None.
--- a/doc/source/strategies/outlet_temp_control.rst
+++ b/doc/source/strategies/outlet_temp_control.rst
@@ -5,11 +5,15 @@ Outlet Temperature Based Strategy
 Synopsis
 --------

-**display name**: ``Outlet temperature based strategy``
+**display name**: ``outlet_temperature``

 **goal**: ``thermal_optimization``

-    .. watcher-term:: watcher.decision_engine.strategy.strategies.outlet_temp_control
+Outlet (Exhaust Air) temperature is a new thermal telemetry which can be
+used to measure the host's thermal/workload status. This strategy makes
+decisions to migrate workloads to the hosts with good thermal condition
+(lowest outlet temperature) when the outlet temperature of source hosts
+reach a configurable threshold.

 Requirements
 ------------
@@ -29,7 +33,7 @@ metric                                    service name plugins comment
 ``hardware.ipmi.node.outlet_temperature`` ceilometer_  IPMI
 ========================================= ============ ======= =======

-.. _ceilometer: https://docs.openstack.org/ceilometer/latest/admin/telemetry-measurements.html#ipmi-based-meters
+.. _ceilometer: http://docs.openstack.org/admin-guide/telemetry-measurements.html#ipmi-based-meters

 Cluster data model
 ******************
@@ -57,7 +61,7 @@ Planner

 Default Watcher's planner:

-    .. watcher-term:: watcher.decision_engine.planner.weight.WeightPlanner
+    .. watcher-term:: watcher.decision_engine.planner.default.DefaultPlanner

 Configuration
 -------------
@@ -68,9 +72,6 @@ Strategy parameter is:
 parameter      type   default Value description
 ============== ====== ============= ====================================
 ``threshold``  Number 35.0          Temperature threshold for migration
-``period``     Number 30            The time interval in seconds for
-                                    getting statistic aggregation from
-                                    metric data source
 ============== ====== ============= ====================================

 Efficacy Indicator
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
OpenDev Sysadmins	8d5e816eaa	OpenDev Migration Patch This commit was bulk generated and pushed by the OpenDev sysadmins as a part of the Git hosting and code review systems migration detailed in these mailing list posts: http://lists.openstack.org/pipermail/openstack-discuss/2019-March/003603.html http://lists.openstack.org/pipermail/openstack-discuss/2019-April/004920.html Attempts have been made to correct repository namespaces and hostnames based on simple pattern matching, but it's possible some were updated incorrectly or missed entirely. Please reach out to us via the contact information listed at https://opendev.org/ with any questions you may have.	2019-04-19 19:40:45 +00:00
Ian Wienand	9c3736cb1b	Replace openstack.org git:// URLs with https:// This is a mechanically generated change to replace openstack.org git:// URLs with https:// equivalents. This is in aid of a planned future move of the git hosting infrastructure to a self-hosted instance of gitea (https://gitea.io), which does not support the git wire protocol at this stage. This update should result in no functional change. For more information see the thread at http://lists.openstack.org/pipermail/openstack-discuss/2019-March/003825.html Change-Id: I9e141aa8e7387a2a8d96fce1d3f54a159d33f4d9	2019-03-24 20:36:25 +00:00
Nguyen Hai	520cdb3c51	import zuul job settings from project-config This is a mechanically generated patch to complete step 1 of moving the zuul job settings out of project-config and into each project repository. Because there will be a separate patch on each branch, the branch specifiers for branch-specific jobs have been removed. Because this patch is generated by a script, there may be some cosmetic changes to the layout of the YAML file(s) as the contents are normalized. See the python3-first goal document for details: https://governance.openstack.org/tc/goals/stein/python3-first.html Change-Id: I3e87bc419d17348c71733c79016a27fa6c00955c Story: #2002586 Task: #24344	2018-08-19 00:58:37 +09:00
OpenStack Proposal Bot	4d8d1cd356	Updated from global requirements Change-Id: I8c3d97e4003ecc5aeeb1b5304fcb36a58367fa9f	2017-05-15 23:41:13 +00:00
OpenStack Proposal Bot	6d4fb3c3eb	Updated from global requirements Change-Id: Idb62b9824ccd8cad7a4084bd085ccf014d5610fa	2017-03-09 18:26:17 +00:00
Jenkins	1caf89686c	Merge "Add checking audit state" into stable/ocata	2017-02-16 13:53:58 +00:00
Hidekazu Nakamura	ed3224835a	Add checking audit state This patch adds checking audit state when updating an existing audit in accordance with audit state machine. Closes-Bug: #1662406 Change-Id: I20610c83169b77f141974a5cebe33818a4bf0728 (cherry picked from commit `0d83354c57`)	2017-02-16 13:16:06 +00:00
ericxiett	8a7e316f73	Fix that remove 'strategy' attribute does not work. The 'strategy_id' attribute is the one that not exposes to API. But the 'PATCH' API always update this attribute. So this change does not work when choose 'remove' op. This patch sets value for 'strategy_id' attribute. Change-Id: I1597fb5d4985bb8271ad3cea7ea5f0adb7de65f4 Closes-Bug: #1662395 (cherry picked from commit `e55c73be0e`)	2017-02-16 13:15:48 +00:00
Jenkins	112ac3bbdf	Merge "Fix log level error to warning" into stable/ocata	2017-02-14 10:27:17 +00:00
licanwei	d1ab697612	Fix the mapping between the instance and the node The argument to the add_edge function should be instance.uuid and node.uuid, not instance and node Change-Id: Ida694f9158d3eb26e7f31062a18844472ea3c6fa Closes-Bug: #1662810	2017-02-08 15:37:01 +00:00
Hidekazu Nakamura	095ca0ffb2	Fix log level error to warning When action plan is currently running, new action plan is set as SUPERSEDED and error log reported. This patch changes log level from error to warning. Change-Id: I931218843d8f09340bd5363256164807d514446b Closes-Bug: #1662450 (cherry picked from commit `58711aaaec`)	2017-02-08 00:05:44 +00:00
OpenStack Release Bot	e1131a65d8	Update UPPER_CONSTRAINTS_FILE for stable/ocata Change-Id: Ie56e3186f2c9e42aff817fc7c71c4da93abb1c5f	2017-02-02 18:23:36 +00:00
OpenStack Release Bot	5e507e56f4	Update .gitreview for stable/ocata Change-Id: I5a431c04e85183baf05736de3920d6610d4add03	2017-02-02 18:23:36 +00:00
				`@@ -0,0 +1 @@`
				`../../etc/watcher/watcher-config-generator.conf`