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:46 +00:00 · 2019-03-24 20:36:25 +00:00 · 2018-10-23 11:57:16 +00:00 · 2018-10-23 06:55:49 +00:00 · 2018-08-19 00:58:52 +09:00 · 2018-02-20 14:42:04 +00:00
360 changed files with 6490 additions and 13532 deletions
--- a/.gitignore
+++ b/.gitignore
@@ -24,7 +24,6 @@ pip-log.txt
 .coverage*
 .tox
 nosetests.xml
-.stestr/
 .testrepository
 .venv
 .idea
--- 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/pike
--- 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/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 https://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:: https://governance.openstack.org/badges/watcher.svg
+    :target: https://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
+* 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/
--- a/devstack/lib/watcher
+++ b/devstack/lib/watcher
@@ -42,7 +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_POLICY_JSON=$WATCHER_CONF_DIR/policy.json

 WATCHER_DEVSTACK_DIR=$WATCHER_DIR/devstack
 WATCHER_DEVSTACK_FILES_DIR=$WATCHER_DEVSTACK_DIR/files
@@ -106,25 +106,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
@@ -177,19 +159,15 @@ 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"

@@ -301,7 +279,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
 }

--- a/devstack/local.conf.compute
+++ b/devstack/local.conf.compute
@@ -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
@@ -24,18 +24,24 @@ MULTI_HOST=1
 # 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

--- 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-execution-end.json
+++ b/doc/notification_samples/action-execution-end.json
@@ -20,7 +20,7 @@
        "watcher_object.name": "TerseActionPlanPayload",
        "watcher_object.data": {
          "uuid": "76be87bd-3422-43f9-93a0-e85a577e3061",
-          "global_efficacy": [],
+          "global_efficacy": {},
          "created_at": "2016-10-18T09:52:05Z",
          "updated_at": null,
          "state": "ONGOING",
--- a/doc/notification_samples/action-execution-error.json
+++ b/doc/notification_samples/action-execution-error.json
@@ -30,7 +30,7 @@
        "watcher_object.name": "TerseActionPlanPayload",
        "watcher_object.data": {
          "uuid": "76be87bd-3422-43f9-93a0-e85a577e3061",
-          "global_efficacy":[],
+          "global_efficacy": {},
          "created_at": "2016-10-18T09:52:05Z",
          "updated_at": null,
          "state": "ONGOING",
--- a/doc/notification_samples/action-execution-start.json
+++ b/doc/notification_samples/action-execution-start.json
@@ -20,7 +20,7 @@
        "watcher_object.name": "TerseActionPlanPayload",
        "watcher_object.data": {
          "uuid": "76be87bd-3422-43f9-93a0-e85a577e3061",
-          "global_efficacy": [],
+          "global_efficacy": {},
          "created_at": "2016-10-18T09:52:05Z",
          "updated_at": null,
          "state": "ONGOING",
--- 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/source/admin/ways-to-install.rst
+++ b/doc/source/admin/ways-to-install.rst
@@ -19,7 +19,7 @@ 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: https://pypi.python.org/pypi

 It's expected that your system already has python2.7_, latest version of pip_,
 and git_ available.
@@ -126,9 +126,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/api/index.rst
+++ b/doc/source/api/index.rst
@@ -1,7 +1,3 @@
-==================================================
-OpenStack Infrastructure Optimization Service APIs
-==================================================
-
 .. toctree::
   :maxdepth: 1

--- a/doc/source/api/v1.rst
+++ b/doc/source/api/v1.rst
@@ -86,15 +86,3 @@ Actions

 .. autotype:: watcher.api.controllers.v1.action.Action
   :members:
-
-Scoring Engine
-==============
-
-.. rest-controller:: watcher.api.controllers.v1.scoring_engine:ScoringEngineController
-   :webprefix: /v1/scoring_engine
-
-.. autotype:: watcher.api.controllers.v1.scoring_engine.ScoringEngineCollection
-   :members:
-
-.. autotype:: watcher.api.controllers.v1.scoring_engine.ScoringEngine
-   :members:
--- 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.

--- a/doc/source/conf.py
+++ b/doc/source/conf.py
@@ -42,7 +42,6 @@ extensions = [
    'ext.versioned_notifications',
    'oslo_config.sphinxconfiggen',
    'openstackdocstheme',
-    'sphinx.ext.napoleon',
 ]

 wsme_protocols = ['restjson']
@@ -73,7 +72,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.']
--- 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.
--- a/doc/source/configuration/index.rst
+++ b/doc/source/configuration/index.rst
@@ -1,9 +1,5 @@
-===================
-Configuration Guide
-===================
-
 .. toctree::
-   :maxdepth: 2
+   :maxdepth: 1

   configuring
   watcher
--- 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
@@ -65,7 +65,7 @@ IRC Channel

 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, 13:00 UTC on odd weeks in the ``#openstack-meeting-alt``
    IRC channel (`meetings logs`_)

 .. _changelog: http://eavesdrop.openstack.org/irclogs/%23openstack-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::
--- 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
@@ -37,7 +37,7 @@ 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
+.. _setuptools: https://pypi.python.org/pypi/setuptools
 .. _virtualenvwrapper: https://virtualenvwrapper.readthedocs.io/en/latest/install.html

 Getting the latest code
@@ -69,8 +69,8 @@ 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
@@ -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/



--- 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/pbr/latest


 Add new notification endpoints
--- a/doc/source/contributor/plugin/goal-plugin.rst
+++ b/doc/source/contributor/plugin/goal-plugin.rst
@@ -127,7 +127,7 @@ 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.

-.. _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
@@ -190,7 +190,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/testing.rst
+++ b/doc/source/contributor/testing.rst
@@ -31,7 +31,7 @@ the following::
    (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
@@ -83,7 +83,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 +115,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 +134,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 +167,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 +206,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 +274,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/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/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:

--- a/doc/source/install/common_configure.rst
+++ b/doc/source/install/common_configure.rst
@@ -26,8 +26,8 @@

        [keystone_authtoken]
        ...
-        www_authenticate_uri = http://controller:5000
-        auth_url = http://controller:5000
+        auth_uri = http://controller:5000
+        auth_url = http://controller:35357
        memcached_servers = controller:11211
        auth_type = password
        project_domain_name = default
@@ -39,15 +39,15 @@
     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,
+     clients, Watcher requests new session from Identity service. In the `[watcher_client_auth]` section,
     configure the identity service access to interact with other OpenStack project clients.

     .. code-block:: ini

-        [watcher_clients_auth]
+        [watcher_client_auth]
        ...
        auth_type = password
-        auth_url = http://controller:5000
+        auth_url = http://controller:35357
        username = watcher
        password = WATCHER_PASS
        project_domain_name = default
@@ -56,16 +56,6 @@

     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
@@ -78,4 +68,4 @@

   .. code-block:: ini

-     su -s /bin/sh -c "watcher-db-manage --config-file /etc/watcher/watcher.conf upgrade"
+     su -s /bin/sh -c "watcher-db-manage --config-file /etc/watcher/watcher.conf create_schema"
--- a/doc/source/install/index.rst
+++ b/doc/source/install/index.rst
@@ -10,7 +10,7 @@ Infrastructure Optimization service
   verify.rst
   next-steps.rst

-The Infrastructure Optimization service (Watcher) provides
+The Infrastructure Optimization service (watcher) provides
 flexible and scalable resource optimization service for
 multi-tenant OpenStack-based clouds.

@@ -21,19 +21,19 @@ 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!
+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>`_.
+https://docs.openstack.org/watcher/latest/strategies/index.html

-Check watcher glossary at `Glossary
-<https://docs.openstack.org/watcher/latest/glossary.html>`_.
+Check watcher glossary at
+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/>`_.
+<https://docs.openstack.org/project-install-guide/ocata/>`_.
--- a/doc/source/install/install-obs.rst
+++ b/doc/source/install/install-obs.rst
@@ -0,0 +1,35 @@
+.. _install-obs:
+
+
+Install and configure for openSUSE and SUSE Linux Enterprise
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+This section describes how to install and configure the Infrastructure
+Optimization service for openSUSE Leap 42.1 and
+SUSE Linux Enterprise Server 12 SP1.
+
+.. include:: common_prerequisites.rst
+
+Install and configure components
+--------------------------------
+
+#. Install the packages:
+
+   .. code-block:: console
+
+      # zypper --quiet --non-interactive install
+
+.. 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
+
+   # systemctl start openstack-watcher-api.service
--- a/doc/source/install/install.rst
+++ b/doc/source/install/install.rst
@@ -15,5 +15,6 @@ Note that installation and configuration vary by distribution.
 .. toctree::
   :maxdepth: 2

+   install-obs.rst
   install-rdo.rst
   install-ubuntu.rst
--- a/doc/source/install/next-steps.rst
+++ b/doc/source/install/next-steps.rst
@@ -6,4 +6,4 @@ Next steps
 Your OpenStack environment now includes the watcher service.

 To add additional services, see
-https://docs.openstack.org/queens/install/.
+https://docs.openstack.org/project-install-guide/ocata/.
--- 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
 ******************
--- 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
 ******************
--- a/doc/source/strategies/saving_energy.rst
+++ b/doc/source/strategies/saving_energy.rst
@@ -1,100 +0,0 @@
-======================
-Saving Energy Strategy
-======================
-
-Synopsis
--------
-
-**display name**: ``Saving Energy Strategy``
-
-**goal**: ``saving_energy``
-
-    .. watcher-term:: watcher.decision_engine.strategy.strategies.saving_energy.SavingEnergy
-
-Requirements
------------
-
-This feature will use Ironic to do the power on/off actions, therefore
-this feature requires that the ironic component is configured.
-And the compute node should be managed by Ironic.
-
-Ironic installation: https://docs.openstack.org/ironic/latest/install/index.html
-
-Cluster data model
-******************
-
-Default Watcher's Compute cluster data model:
-
-    .. watcher-term:: watcher.decision_engine.model.collector.nova.NovaClusterDataModelCollector
-
-Actions
-*******
-
-    .. list-table::
-       :widths: 30 30
-       :header-rows: 1
-
-       * - action
-         - description
-       * - ``change_node_power_state``
-         - .. watcher-term:: watcher.applier.actions.change_node_power_state.ChangeNodePowerState
-
-Planner
-*******
-
-Default Watcher's planner:
-
-    .. watcher-term:: watcher.decision_engine.planner.weight.WeightPlanner
-
-
-Configuration
-------------
-
-Strategy parameter is:
-
-====================== ====== ======= ======================================
-parameter              type   default          description
-                              Value
-====================== ====== ======= ======================================
-``free_used_percent``  Number  10.0   a rational number, which describes the
-                                      the quotient of
-                                      min_free_hosts_num/nodes_with_VMs_num
-``min_free_hosts_num`` Int      1     an int number describes minimum free
-                                      compute nodes
-====================== ====== ======= ======================================
-
-
-Efficacy Indicator
------------------
-
-None
-
-Algorithm
---------
-
-For more information on the Energy Saving Strategy please refer to:
-http://specs.openstack.org/openstack/watcher-specs/specs/pike/implemented/energy-saving-strategy.html
-
-How to use it ?
---------------
-step1: Add compute nodes info into ironic node management
-
-.. code-block:: shell
-
-    $ ironic node-create  -d pxe_ipmitool -i ipmi_address=10.43.200.184 \
-      ipmi_username=root  -i ipmi_password=nomoresecret -e compute_node_id=3
-
-step 2: Create audit to do optimization
-
-.. code-block:: shell
-
-    $ openstack optimize audittemplate create \
-      at1 saving_energy --strategy saving_energy
-
-    $ openstack optimize audit create -a at1 \
-      -p free_used_percent=20.0
-
-External Links
--------------
-
-None
--- a/doc/source/strategies/storage_capacity_balance.rst
+++ b/doc/source/strategies/storage_capacity_balance.rst
@@ -1,87 +0,0 @@
-========================
-Storage capacity balance
-========================
-
-Synopsis
--------
-
-**display name**: ``Storage Capacity Balance Strategy``
-
-**goal**: ``workload_balancing``
-
-    .. watcher-term:: watcher.decision_engine.strategy.strategies.storage_capacity_balance.StorageCapacityBalance
-
-Requirements
------------
-
-Metrics
-*******
-
-None
-
-Cluster data model
-******************
-
-Storage cluster data model is required:
-
-    .. watcher-term:: watcher.decision_engine.model.collector.cinder.CinderClusterDataModelCollector
-
-Actions
-*******
-
-Default Watcher's actions:
-
-    .. list-table::
-       :widths: 25 35
-       :header-rows: 1
-
-       * - action
-         - description
-       * - ``volume_migrate``
-         - .. watcher-term:: watcher.applier.actions.volume_migration.VolumeMigrate
-
-Planner
-*******
-
-Default Watcher's planner:
-
-    .. watcher-term:: watcher.decision_engine.planner.weight.WeightPlanner
-
-Configuration
-------------
-
-Strategy parameter is:
-
-==================== ====== ============= =====================================
-parameter            type   default       Value description
-==================== ====== ============= =====================================
-``volume_threshold`` Number 80.0          Volume threshold for capacity balance
-==================== ====== ============= =====================================
-
-
-Efficacy Indicator
------------------
-
-None
-
-Algorithm
---------
-
-For more information on the zone migration strategy please refer to:
-http://specs.openstack.org/openstack/watcher-specs/specs/queens/implemented/storage-capacity-balance.html
-
-How to use it ?
---------------
-
-.. code-block:: shell
-
-    $ openstack optimize audittemplate create \
-      at1 workload_balancing --strategy storage_capacity_balance
-
-    $ openstack optimize audit create -a at1 \
-      -p volume_threshold=85.0
-
-External Links
--------------
-
-None
--- a/doc/source/strategies/strategy-template.rst
+++ b/doc/source/strategies/strategy-template.rst
@@ -33,7 +33,7 @@ power                   ceilometer_  kwapi_  one point every 60s
 ======================= ============ ======= =======


-.. _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
 .. _monasca: https://github.com/openstack/monasca-agent/blob/master/docs/Libvirt.md
 .. _kwapi: https://kwapi.readthedocs.io/en/latest/index.html

--- a/doc/source/strategies/uniform_airflow.rst
+++ b/doc/source/strategies/uniform_airflow.rst
@@ -5,11 +5,11 @@ Uniform Airflow Migration Strategy
 Synopsis
 --------

-**display name**: ``Uniform airflow migration strategy``
+**display name**: ``uniform_airflow``

 **goal**: ``airflow_optimization``

-    .. watcher-term:: watcher.decision_engine.strategy.strategies.uniform_airflow.UniformAirflow
+.. watcher-term:: watcher.decision_engine.strategy.strategies.uniform_airflow

 Requirements
 ------------
--- a/doc/source/strategies/vm_workload_consolidation.rst
+++ b/doc/source/strategies/vm_workload_consolidation.rst
@@ -5,11 +5,11 @@ VM Workload Consolidation Strategy
 Synopsis
 --------

-**display name**: ``VM Workload Consolidation Strategy``
+**display name**: ``vm_workload_consolidation``

 **goal**: ``vm_consolidation``

-    .. watcher-term:: watcher.decision_engine.strategy.strategies.vm_workload_consolidation.VMWorkloadConsolidation
+    .. watcher-term:: watcher.decision_engine.strategy.strategies.vm_workload_consolidation

 Requirements
 ------------
@@ -36,7 +36,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
 ******************
--- a/doc/source/strategies/workload-stabilization.rst
+++ b/doc/source/strategies/workload-stabilization.rst
@@ -5,11 +5,11 @@ Watcher Overload standard deviation algorithm
 Synopsis
 --------

-**display name**: ``Workload stabilization``
+**display name**: ``workload_stabilization``

 **goal**: ``workload_balancing``

-    .. watcher-term:: watcher.decision_engine.strategy.strategies.workload_stabilization.WorkloadStabilization
+    .. watcher-term:: watcher.decision_engine.strategy.strategies.workload_stabilization

 Requirements
 ------------
@@ -28,7 +28,7 @@ metric                       service name plugins comment
 ``memory.resident``          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
 .. _SNMP: http://docs.openstack.org/admin-guide/telemetry-measurements.html

 Cluster data model
@@ -100,7 +100,7 @@ parameter            type   default Value         description
                                                  into which the samples are
                                                  grouped for aggregation.
                                                  Watcher uses only the last
-                                                  period of all received ones.
+                                                  period of all recieved ones.
 ==================== ====== ===================== =============================

 .. |metrics| replace:: ["cpu_util", "memory.resident"]
--- a/doc/source/strategies/workload_balance.rst
+++ b/doc/source/strategies/workload_balance.rst
@@ -5,11 +5,11 @@ Workload Balance Migration Strategy
 Synopsis
 --------

-**display name**: ``Workload Balance Migration Strategy``
+**display name**: ``workload_balance``

 **goal**: ``workload_balancing``

-    .. watcher-term:: watcher.decision_engine.strategy.strategies.workload_balance.WorkloadBalance
+.. watcher-term:: watcher.decision_engine.strategy.strategies.workload_balance

 Requirements
 ------------
@@ -28,7 +28,7 @@ metric                  service name plugins comment
 ``memory.resident``     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
--- a/doc/source/strategies/zone_migration.rst
+++ b/doc/source/strategies/zone_migration.rst
@@ -1,154 +0,0 @@
-==============
-Zone migration
-==============
-
-Synopsis
--------
-
-**display name**: ``Zone migration``
-
-**goal**: ``hardware_maintenance``
-
-    .. watcher-term:: watcher.decision_engine.strategy.strategies.zone_migration.ZoneMigration
-
-Requirements
------------
-
-Metrics
-*******
-
-None
-
-Cluster data model
-******************
-
-Default Watcher's Compute cluster data model:
-
-    .. watcher-term:: watcher.decision_engine.model.collector.nova.NovaClusterDataModelCollector
-
-Storage cluster data model is also required:
-
-    .. watcher-term:: watcher.decision_engine.model.collector.cinder.CinderClusterDataModelCollector
-
-Actions
-*******
-
-
-Default Watcher's actions:
-
-    .. list-table::
-       :widths: 30 30
-       :header-rows: 1
-
-       * - action
-         - description
-       * - ``migrate``
-         - .. watcher-term:: watcher.applier.actions.migration.Migrate
-       * - ``volume_migrate``
-         - .. watcher-term:: watcher.applier.actions.volume_migration.VolumeMigrate
-
-Planner
-*******
-
-Default Watcher's planner:
-
-    .. watcher-term:: watcher.decision_engine.planner.weight.WeightPlanner
-
-Configuration
-------------
-
-Strategy parameters are:
-
-======================== ======== ============= ==============================
-parameter                type     default Value description
-======================== ======== ============= ==============================
-``compute_nodes``        array    None          Compute nodes to migrate.
-``storage_pools``        array    None          Storage pools to migrate.
-``parallel_total``       integer  6             The number of actions to be
-                                                run in parallel in total.
-``parallel_per_node``    integer  2             The number of actions to be
-                                                run in parallel per compute
-                                                node.
-``parallel_per_pool``    integer  2             The number of actions to be
-                                                run in parallel per storage
-                                                pool.
-``priority``             object   None          List prioritizes instances
-                                                and volumes.
-``with_attached_volume`` boolean  False         False: Instances will migrate
-                                                after all volumes migrate.
-                                                True: An instance will migrate
-                                                after the attached volumes
-                                                migrate.
-======================== ======== ============= ==============================
-
-The elements of compute_nodes array are:
-
-============= ======= =============== =============================
-parameter     type    default Value   description
-============= ======= =============== =============================
-``src_node``  string    None          Compute node from which
-                                      instances migrate(mandatory).
-``dst_node``  string    None          Compute node to which
-                                      instances migrate.
-============= ======= =============== =============================
-
-The elements of storage_pools array are:
-
-============= ======= =============== ==============================
-parameter     type    default Value   description
-============= ======= =============== ==============================
-``src_pool``  string    None          Storage pool from which
-                                      volumes migrate(mandatory).
-``dst_pool``  string    None          Storage pool to which
-                                      volumes migrate.
-``src_type``  string    None          Source volume type(mandatory).
-``dst_type``  string    None          Destination volume type
-                                      (mandatory).
-============= ======= =============== ==============================
-
-The elements of priority object are:
-
-================ ======= =============== ======================
-parameter        type    default Value   description
-================ ======= =============== ======================
-``project``      array   None            Project names.
-``compute_node`` array   None            Compute node names.
-``storage_pool`` array   None            Storage pool names.
-``compute``      enum    None            Instance attributes.
-                                         |compute|
-``storage``      enum    None            Volume attributes.
-                                         |storage|
-================ ======= =============== ======================
-
-.. |compute| replace:: ["vcpu_num", "mem_size", "disk_size", "created_at"]
-.. |storage| replace:: ["size", "created_at"]
-
-Efficacy Indicator
------------------
-
-.. watcher-func::
-  :format: literal_block
-
-  watcher.decision_engine.goal.efficacy.specs.HardwareMaintenance.get_global_efficacy_indicator
-
-Algorithm
---------
-
-For more information on the zone migration strategy please refer
-to: http://specs.openstack.org/openstack/watcher-specs/specs/queens/implemented/zone-migration-strategy.html
-
-How to use it ?
---------------
-
-.. code-block:: shell
-
-    $ openstack optimize audittemplate create \
-      at1 hardware_maintenance --strategy zone_migration
-
-    $ openstack optimize audit create -a at1 \
-      -p compute_nodes='[{"src_node": "s01", "dst_node": "d01"}]'
-
-External Links
--------------
-
-None
--- a/doc/source/user/user-guide.rst
+++ b/doc/source/user/user-guide.rst
@@ -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/etc/watcher/oslo-policy-generator/watcher-policy-generator.conf
+++ b/etc/watcher/oslo-policy-generator/watcher-policy-generator.conf
@@ -1,3 +0,0 @@
-[DEFAULT]
-output_file = /etc/watcher/policy.yaml.sample
-namespace = watcher
--- a/etc/watcher/policy.json
+++ b/etc/watcher/policy.json
@@ -0,0 +1,45 @@
+{
+    "admin_api": "role:admin or role:administrator",
+    "show_password": "!",
+    "default": "rule:admin_api",
+
+    "action:detail": "rule:default",
+    "action:get": "rule:default",
+    "action:get_all": "rule:default",
+
+    "action_plan:delete": "rule:default",
+    "action_plan:detail": "rule:default",
+    "action_plan:get": "rule:default",
+    "action_plan:get_all": "rule:default",
+    "action_plan:update": "rule:default",
+
+    "audit:create": "rule:default",
+    "audit:delete": "rule:default",
+    "audit:detail": "rule:default",
+    "audit:get": "rule:default",
+    "audit:get_all": "rule:default",
+    "audit:update": "rule:default",
+
+    "audit_template:create": "rule:default",
+    "audit_template:delete": "rule:default",
+    "audit_template:detail": "rule:default",
+    "audit_template:get": "rule:default",
+    "audit_template:get_all": "rule:default",
+    "audit_template:update": "rule:default",
+
+    "goal:detail": "rule:default",
+    "goal:get": "rule:default",
+    "goal:get_all": "rule:default",
+
+    "scoring_engine:detail": "rule:default",
+    "scoring_engine:get": "rule:default",
+    "scoring_engine:get_all": "rule:default",
+
+    "strategy:detail": "rule:default",
+    "strategy:get": "rule:default",
+    "strategy:get_all": "rule:default",
+
+    "service:detail": "rule:default",
+    "service:get": "rule:default",
+    "service:get_all": "rule:default"
+}
--- a/lower-constraints.txt
+++ b/lower-constraints.txt
@@ -1,165 +0,0 @@
-alabaster==0.7.10
-alembic==0.9.8
-amqp==2.2.2
-appdirs==1.4.3
-APScheduler==3.5.1
-asn1crypto==0.24.0
-automaton==1.14.0
-Babel==2.5.3
-bandit==1.4.0
-beautifulsoup4==4.6.0
-cachetools==2.0.1
-certifi==2018.1.18
-cffi==1.11.5
-chardet==3.0.4
-cliff==2.11.0
-cmd2==0.8.1
-contextlib2==0.5.5
-coverage==4.5.1
-croniter==0.3.20
-cryptography==2.1.4
-debtcollector==1.19.0
-decorator==4.2.1
-deprecation==2.0
-doc8==0.8.0
-docutils==0.14
-dogpile.cache==0.6.5
-dulwich==0.19.0
-enum34==1.1.6
-enum-compat==0.0.2
-eventlet==0.20.0
-extras==1.0.0
-fasteners==0.14.1
-fixtures==3.0.0
-flake8==2.5.5
-freezegun==0.3.10
-future==0.16.0
-futurist==1.6.0
-gitdb2==2.0.3
-GitPython==2.1.8
-gnocchiclient==7.0.1
-greenlet==0.4.13
-hacking==0.12.0
-idna==2.6
-imagesize==1.0.0
-iso8601==0.1.12
-Jinja2==2.10
-jmespath==0.9.3
-jsonpatch==1.21
-jsonpointer==2.0
-jsonschema==2.6.0
-keystoneauth1==3.4.0
-keystonemiddleware==4.21.0
-kombu==4.1.0
-linecache2==1.0.0
-logutils==0.3.5
-lxml==4.1.1
-Mako==1.0.7
-MarkupSafe==1.0
-mccabe==0.2.1
-mock==2.0.0
-monotonic==1.4
-mox3==0.25.0
-msgpack==0.5.6
-munch==2.2.0
-netaddr==0.7.19
-netifaces==0.10.6
-networkx==1.11
-openstackdocstheme==1.20.0
-openstacksdk==0.12.0
-os-api-ref===1.4.0
-os-client-config==1.29.0
-os-service-types==1.2.0
-os-testr==1.0.0
-osc-lib==1.10.0
-oslo.cache==1.29.0
-oslo.concurrency==3.26.0
-oslo.config==5.2.0
-oslo.context==2.20.0
-oslo.db==4.35.0
-oslo.i18n==3.20.0
-oslo.log==3.37.0
-oslo.messaging==5.36.0
-oslo.middleware==3.35.0
-oslo.policy==1.34.0
-oslo.reports==1.27.0
-oslo.serialization==2.25.0
-oslo.service==1.30.0
-oslo.utils==3.36.0
-oslo.versionedobjects==1.32.0
-oslotest==3.3.0
-packaging==17.1
-Paste==2.0.3
-PasteDeploy==1.5.2
-pbr==3.1.1
-pecan==1.2.1
-pep8==1.5.7
-pika==0.10.0
-pika-pool==0.1.3
-prettytable==0.7.2
-psutil==5.4.3
-pycadf==2.7.0
-pycparser==2.18
-pyflakes==0.8.1
-Pygments==2.2.0
-pyinotify==0.9.6
-pyOpenSSL==17.5.0
-pyparsing==2.2.0
-pyperclip==1.6.0
-python-ceilometerclient==2.9.0
-python-cinderclient==3.5.0
-python-dateutil==2.7.0
-python-editor==1.0.3
-python-glanceclient==2.9.1
-python-ironicclient==2.3.0
-python-keystoneclient==3.15.0
-python-mimeparse==1.6.0
-python-monascaclient==1.10.0
-python-neutronclient==6.7.0
-python-novaclient==10.1.0
-python-openstackclient==3.14.0
-python-subunit==1.2.0
-pytz==2018.3
-PyYAML==3.12
-reno==2.7.0
-repoze.lru==0.7
-requests==2.18.4
-requestsexceptions==1.4.0
-restructuredtext-lint==1.1.3
-rfc3986==1.1.0
-Routes==2.4.1
-simplegeneric==0.8.1
-simplejson==3.13.2
-six==1.11.0
-smmap2==2.0.3
-snowballstemmer==1.2.1
-Sphinx==1.6.5
-sphinxcontrib-httpdomain==1.6.1
-sphinxcontrib-pecanwsme==0.8.0
-sphinxcontrib-websupport==1.0.1
-SQLAlchemy==1.2.5
-sqlalchemy-migrate==0.11.0
-sqlparse==0.2.4
-statsd==3.2.2
-stestr==2.0.0
-stevedore==1.28.0
-taskflow==3.1.0
-Tempita==0.5.2
-tenacity==4.9.0
-testrepository==0.0.20
-testresources==2.0.1
-testscenarios==0.5.0
-testtools==2.3.0
-traceback2==1.4.0
-tzlocal==1.5.1
-ujson==1.35
-unittest2==1.1.0
-urllib3==1.22
-vine==1.1.4
-voluptuous==0.11.1
-waitress==1.1.0
-warlock==1.3.0
-WebOb==1.7.4
-WebTest==2.0.29
-wrapt==1.10.11
-WSME==0.9.2
--- a/playbooks/orchestrate-tempest.yaml
+++ b/playbooks/orchestrate-tempest.yaml
@@ -1,14 +0,0 @@
- hosts: all
-  # This is the default strategy, however since orchestrate-devstack requires
-  # "linear", it is safer to enforce it in case this is running in an
-  # environment configured with a different default strategy.
-  strategy: linear
-  roles:
-    - orchestrate-devstack
-
- hosts: tempest
-  roles:
-    - setup-tempest-run-dir
-    - setup-tempest-data-dir
-    - acl-devstack-files
-    - run-tempest
--- a/playbooks/pre.yaml
+++ b/playbooks/pre.yaml
@@ -1,3 +0,0 @@
- hosts: all
-  roles:
-    - add-hostnames-to-hosts
--- a/rally-jobs/README.rst
+++ b/rally-jobs/README.rst
@@ -27,16 +27,16 @@ Structure
 Useful links
 ------------

-* How to install: https://docs.openstack.org/rally/latest/install_and_upgrade/install.html
+* How to install: http://docs.openstack.org/developer/rally/install.html

-* How to set Rally up and launch your first scenario: https://rally.readthedocs.io/en/latest/quick_start/tutorial/step_1_setting_up_env_and_running_benchmark_from_samples.html
+* How to set Rally up and launch your first scenario:  https://rally.readthedocs.io/en/latest/tutorial/step_1_setting_up_env_and_running_benchmark_from_samples.html

-* More about Rally: https://docs.openstack.org/rally/latest/
+* More about Rally: https://rally.readthedocs.org/en/latest/

-* Rally project info and release notes: https://docs.openstack.org/rally/latest/project_info/index.html
+* Rally release notes: https://rally.readthedocs.org/en/latest/release_notes.html

-* How to add rally-gates: https://docs.openstack.org/rally/latest/quick_start/gates.html#gate-jobs
+* How to add rally-gates: https://rally.readthedocs.org/en/latest/gates.html

-* About plugins: https://docs.openstack.org/rally/latest/plugins/index.html
+* About plugins:  https://rally.readthedocs.org/en/latest/plugins.html

-* Plugin samples: https://github.com/openstack/rally/tree/master/samples/
+* Plugin samples: https://github.com/openstack/rally/tree/master/samples/plugins
--- a/releasenotes/notes/add-name-for-audit-0df1f39f00736f06.yaml
+++ b/releasenotes/notes/add-name-for-audit-0df1f39f00736f06.yaml
@@ -1,4 +0,0 @@
---
-features:
-  - Audits have 'name' field now, that is more friendly to end users.
-    Audit's name can't exceed 63 characters.
--- a/releasenotes/notes/audit-scoper-for-storage-data-model-cdccc803542d22db.yaml
+++ b/releasenotes/notes/audit-scoper-for-storage-data-model-cdccc803542d22db.yaml
@@ -1,5 +0,0 @@
---
-features:
-  - |
-    Adds audit scoper for storage data model, now watcher users can specify
-    audit scope for storage CDM in the same manner as compute scope.
--- a/releasenotes/notes/bp-audit-scope-exclude-project-511a7720aac00dff.yaml
+++ b/releasenotes/notes/bp-audit-scope-exclude-project-511a7720aac00dff.yaml
@@ -1,6 +0,0 @@
---
-features:
-  - |
-    Feature to exclude instances from audit scope based on project_id is added.
-    Now instances from particular project in OpenStack can be excluded from audit
-    defining scope in audit templates.
--- a/releasenotes/notes/build-baremetal-data-model-in-watcher-3023453a47b61dab.yaml
+++ b/releasenotes/notes/build-baremetal-data-model-in-watcher-3023453a47b61dab.yaml
@@ -1,4 +0,0 @@
---
-features:
-  - |
-    Adds baremetal data model in Watcher
--- a/releasenotes/notes/cdm-scoping-8d9c307bad46bfa1.yaml
+++ b/releasenotes/notes/cdm-scoping-8d9c307bad46bfa1.yaml
@@ -1,6 +0,0 @@
---
-features:
-  - |
-    Each CDM collector can have its own CDM scoper now. This changed Scope
-    JSON schema definition for the audit template POST data. Please see audit
-    template create help message in python-watcherclient.
--- a/releasenotes/notes/check-strategy-requirements-66f9e9262412f8ec.yaml
+++ b/releasenotes/notes/check-strategy-requirements-66f9e9262412f8ec.yaml
@@ -1,6 +0,0 @@
---
-features:
-  - Added a way to check state of strategy before audit's execution.
-    Administrator can use "watcher strategy state <strategy_name>" command
-    to get information about metrics' availability, datasource's availability
-    and CDM's availability.
--- a/releasenotes/notes/compute-cdm-include-all-instances-f7506ded2d57732f.yaml
+++ b/releasenotes/notes/compute-cdm-include-all-instances-f7506ded2d57732f.yaml
@@ -1,6 +0,0 @@
---
-features:
-  - Watcher has a whole scope of the cluster, when building
-    compute CDM which includes all instances.
-    It filters excluded instances when migration during the
-    audit.
--- a/releasenotes/notes/host-maintenance-strategy-41f640927948fb56.yaml
+++ b/releasenotes/notes/host-maintenance-strategy-41f640927948fb56.yaml
@@ -1,9 +0,0 @@
---
-features:
-  - |
-    Added a strategy for one compute node maintenance,
-    without having the user's application been interrupted.
-    If given one backup node, the strategy will firstly
-    migrate all instances from the maintenance node to
-    the backup node. If the backup node is not provided,
-    it will migrate all instances, relying on nova-scheduler.
--- a/releasenotes/notes/multiple-global-efficacy-indicator-fc11c4844a12a7d5.yaml
+++ b/releasenotes/notes/multiple-global-efficacy-indicator-fc11c4844a12a7d5.yaml
@@ -1,6 +0,0 @@
---
-features:
-  - Watcher got an ability to calculate multiple global efficacy indicators
-    during audit's execution. Now global efficacy can be calculated for many
-    resource types (like volumes, instances, network) if strategy supports
-    efficacy indicators.
--- a/releasenotes/notes/noisy-neighbor-strategy-a71342740b59dddc.yaml
+++ b/releasenotes/notes/noisy-neighbor-strategy-a71342740b59dddc.yaml
@@ -1,5 +1,5 @@
 ---
 features:
  - Added strategy to identify and migrate a Noisy Neighbor - a low priority VM
-    that negatively affects performance of a high priority VM by over utilizing
+    that negatively affects peformance of a high priority VM by over utilizing
    Last Level Cache.
--- a/releasenotes/notes/notifications-actionplan-cancel-edb2a4a12543e2d0.yaml
+++ b/releasenotes/notes/notifications-actionplan-cancel-edb2a4a12543e2d0.yaml
@@ -1,5 +0,0 @@
---
-features:
-  - Added notifications about cancelling of action plan.
-    Now event based plugins know when action plan cancel
-    started and completed.
--- a/releasenotes/notes/replace-cold-migrate-to-use-nova-migration-api-cecd9a39ddd3bc58.yaml
+++ b/releasenotes/notes/replace-cold-migrate-to-use-nova-migration-api-cecd9a39ddd3bc58.yaml
@@ -1,14 +0,0 @@
---
-features:
-  - |
-    Instance cold migration logic is now replaced with using Nova migrate
-    Server(migrate Action) API which has host option since v2.56.
-upgrade:
-  - |
-    Nova API version is now set to 2.56 by default. This needs the migrate
-    action of migration type cold with destination_node parameter to work.
-fixes:
-  - |
-    The migrate action of migration type cold with destination_node parameter
-    was fixed. Before fixing, it booted an instance in the service project
-    as a migrated instance.
--- a/releasenotes/notes/storage-workload-balance-0ecabbc1791e6894.yaml
+++ b/releasenotes/notes/storage-workload-balance-0ecabbc1791e6894.yaml
@@ -1,4 +0,0 @@
---
-features:
-  - |
-    Added storage capacity balance strategy.
--- a/releasenotes/notes/zone-migration-strategy-10f7656a2a01e607.yaml
+++ b/releasenotes/notes/zone-migration-strategy-10f7656a2a01e607.yaml
@@ -1,6 +0,0 @@
---
-features:
-  - |
-    Added strategy "Zone migration" and it's goal "Hardware maintenance".
-    The strategy migrates many instances and volumes efficiently with
-    minimum downtime automatically.
--- a/releasenotes/source/conf.py
+++ b/releasenotes/source/conf.py
@@ -22,8 +22,8 @@
 # All configuration values have a default; values that are commented out
 # serve to show the default.

-import os
-import sys
+import sys, os
+from watcher import version as watcher_version

 # If extensions (or modules to document with autodoc) are in another directory,
 # add these directories to sys.path here. If the directory is relative to the
@@ -56,11 +56,14 @@ master_doc = 'index'
 project = u'watcher'
 copyright = u'2016, Watcher developers'

-# Release notes are version independent
+# The version info for the project you're documenting, acts as replacement for
+# |version| and |release|, also used in various other places throughout the
+# built documents.
+#
 # The short X.Y version.
-version = ''
+version = watcher_version.version_info.release_string()
 # The full version, including alpha/beta/rc tags.
-release = ''
+release = watcher_version.version_info.version_string()

 # The language for content autogenerated by Sphinx. Refer to documentation
 # for a list of supported languages.
--- a/releasenotes/source/index.rst
+++ b/releasenotes/source/index.rst
@@ -21,8 +21,6 @@ Contents:
   :maxdepth: 1

   unreleased
-   queens
-   pike
   ocata
   newton

--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
OpenDev Sysadmins	16113e255b	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:46 +00:00
Ian Wienand	30d6f07ceb	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: I5ffcaf509ec6901f7e221a4312cc6b0577090440	2019-03-24 20:36:25 +00:00
licanwei	343a65952a	Check job before removing it Change-Id: Ibbd4da25fac6016a0d76c8f810ac567f6fd075f1 Closes-Bug: #1782731 (cherry picked from commit `4022714f5d`)	2018-10-23 11:57:16 +00:00
LiXiangyu	9af6886b0e	Fix TypeError in function chunkify This patch fixes TypeError of range() in function chunkify, as range() integer step argument expected, but got str. Change-Id: I2acde859e014baa4c4c59caa6f4ea938c7c4c3bf (cherry picked from commit `c717be12a6`)	2018-10-23 06:55:49 +00:00
Nguyen Hai	b0ef77f5d1	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: I9ccef45c11c17c3bdda143a53b325be327b9459d Story: #2002586 Task: #24344	2018-08-19 00:58:52 +09:00
Alexander Chadin	f5157f2894	workload_stabilization trivial fix This fix allows to compare metric name by value, not by object. Change-Id: I57c50ff97efa43efe4fd81875e481b25e9a18cc6	2018-02-20 14:42:04 +00:00
OpenStack Proposal Bot	13331935df	Updated from global requirements Change-Id: I941f6e5a005124a98d2860695fb9a30a77bc595c	2018-02-14 18:48:22 +00:00
Alexander Chadin	8d61c1a2b4	Fix workload_stabilization unavailable nodes and instances This patch set excludes nodes and instances from auditing if appropriate metrics aren't available. Change-Id: I87c6c249e3962f45d082f92d7e6e0be04e101799 Closes-Bug: #1736982 (cherry picked from commit `701b258dc7`)	2018-01-24 11:57:14 +00:00
Hidekazu Nakamura	6b4b5c2fe5	Fix gnocchiclient creation Gnocchiclient uses keystoneauth1.adapter so that adapter_options need to be given. This patch fixes gnocchiclient creation. Change-Id: I6b5d8ee775929f4b3fd30be3321b378d19085547 Closes-Bug: #1714871 (cherry picked from commit `a2fa13c8ff`)	2017-11-13 08:20:55 +00:00
OpenStack Proposal Bot	62623a7f77	Updated from global requirements Change-Id: Iede1409c379d90238b6f2ab6a9aa750b3081df94	2017-09-21 01:08:52 +00:00
licanwei	9d2f8d11ec	Fix KeyError exception During the strategy sync process, if goal_id can't be found in the goals table, will throw a KeyError exception. Change-Id: I62800ac5c69f4f5c7820908f2e777094a51a5541 Closes-Bug: #1711086	2017-08-24 12:34:13 +00:00
Jenkins	f1d064c759	Merge "workload balance base on cpu or ram util" into stable/pike	2017-08-24 10:09:30 +00:00
Jenkins	6cb02c18a7	Merge "Remove pbr warnerrors" into stable/pike	2017-08-24 10:09:19 +00:00
Jenkins	37fc37e138	Merge "Update the documention for doc migration" into stable/pike	2017-08-24 10:09:13 +00:00
Jenkins	b68685741e	Merge "Adjust the action state judgment logic" into stable/pike	2017-08-24 08:37:55 +00:00
zhengwei6082	6721977f74	Update the documention for doc migration Change-Id: I22dc18e6f2f7471f5c804d4d19c631f81a6e196b (cherry picked from commit `d5bcd37478`)	2017-08-23 10:04:55 +00:00
Alexander Chadin	c303ad4cdc	Remove pbr warnerrors This change removes the now unused "warnerrors" setting, which is replaced by "warning-is-error" in sphinx releases >= 1.5 [1]. [1] http://lists.openstack.org/pipermail/openstack-dev/2017-March/113085.html Change-Id: I32f078169668be08737e47cd15edbdfba42904dc (cherry picked from commit `f76a628d1f`)	2017-08-23 10:03:58 +00:00
licanwei	51c9db2936	Adjust the action state judgment logic Only when True is returned, the action state is set to SUCCEEDED some actions(such as migrate) will return None if exception raised Change-Id: I52e7a1ffb68f54594f2b00d9843e8e0a4c985667 (cherry picked from commit `965af1b6fd`)	2017-08-23 10:03:32 +00:00
suzhengwei	1e003d4153	workload balance base on cpu or ram util By the input parameter "metrics", it makes decision to migrate a VM base on cpu or memory utilization. Change-Id: I35cce3495c8dacad64ea6c6ee71082a85e9e0a83 (cherry picked from commit `5c86a54d20`)	2017-08-23 10:03:15 +00:00
Hidekazu Nakamura	bab89fd769	Fix gnocchi repository URL in local.conf.controller This patch set updates gnocchi repository URL in local.conf.controller bacause it moved from under openstack to their own repository. Change-Id: I53c6efcb40b26f83bc1867564b9067ae5f50938d (cherry picked from commit `5cc4716a95`)	2017-08-23 10:02:57 +00:00
OpenStack Release Bot	e1e17ab0b9	Update UPPER_CONSTRAINTS_FILE for stable/pike Change-Id: I453ae1575d2dad4b724d96cfc6ebf5c5b2a2a3be	2017-08-11 01:09:58 +00:00
OpenStack Release Bot	3d542472f6	Update .gitreview for stable/pike Change-Id: I685c0bc8773d2b5f9e747a53d870a92dd6baea36	2017-08-11 01:09:57 +00:00