python-watcher 13.0.0__tar.gz → 14.0.0__tar.gz

python_watcher-14.0.0/.pre-commit-config.yaml

@@ -0,0 +1,62 @@
+---
+repos:
+  - repo: https://github.com/pre-commit/pre-commit-hooks
+    rev: v5.0.0
+    hooks:
+      # whitespace
+      - id: trailing-whitespace
+      - id: mixed-line-ending
+        args: ['--fix', 'lf']
+        exclude: '.*\.(svg)$'
+      - id: check-byte-order-marker
+      # file format and permissions
+      - id: check-ast
+      - id: debug-statements
+      - id: check-json
+        files: .*\.json$
+      - id: check-yaml
+        files: .*\.(yaml|yml)$
+      - id: check-executables-have-shebangs
+      - id: check-shebang-scripts-are-executable
+      # git
+      - id: check-added-large-files
+      - id: check-case-conflict
+      - id: detect-private-key
+      - id: check-merge-conflict
+  - repo: https://github.com/Lucas-C/pre-commit-hooks
+    rev: v1.5.5
+    hooks:
+      - id: remove-tabs
+        exclude: '.*\.(svg)$'
+  - repo: https://opendev.org/openstack/hacking
+    rev: 7.0.0
+    hooks:
+      - id: hacking
+        additional_dependencies: []
+        exclude: '^(doc|releasenotes|tools)/.*$'
+  - repo: https://github.com/PyCQA/bandit
+    rev: 1.7.6
+    hooks:
+      - id: bandit
+        args: ['-x', 'tests', '-s', 'B101,B311,B320']
+  - repo: https://github.com/hhatto/autopep8
+    rev: v2.3.1
+    hooks:
+      - id: autopep8
+        files: '^.*\.py$'
+  - repo: https://github.com/codespell-project/codespell
+    rev: v2.3.0
+    hooks:
+      - id: codespell
+        args: ['--ignore-words=doc/dictionary.txt']
+  - repo: https://github.com/sphinx-contrib/sphinx-lint
+    rev: v1.0.0
+    hooks:
+      - id: sphinx-lint
+        args: [--enable=default-role]
+        files: ^doc/|releasenotes|api-guide
+        types: [rst]
+  - repo: https://github.com/PyCQA/doc8
+    rev: v1.1.2
+    hooks:
+      - id: doc8

python_watcher-14.0.0/.zuul.yaml

@@ -0,0 +1,289 @@
+- project:
+    queue: watcher
+    templates:
+      - check-requirements
+      - openstack-cover-jobs
+      - openstack-python3-jobs
+      - publish-openstack-docs-pti
+      - release-notes-jobs-python3
+    check:
+      jobs:
+        - watcher-tempest-functional
+        - watcher-tempest-functional-jammy
+        - watcher-grenade
+        - watcher-tempest-strategies
+        - watcher-tempest-actuator
+        - watcherclient-tempest-functional
+        - watcher-tempest-functional-ipv6-only
+        - watcher-prometheus-integration
+    gate:
+      jobs:
+        - watcher-tempest-functional
+        - watcher-tempest-functional-jammy
+        - watcher-tempest-functional-ipv6-only
+
+- 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-strategies
+    parent: watcher-tempest-multinode
+    vars:
+      tempest_concurrency: 1
+      tempest_test_regex: watcher_tempest_plugin.tests.scenario.test_execute_strategies
+
+- job:
+    name: watcher-tempest-multinode
+    parent: watcher-tempest-functional
+    nodeset: openstack-two-node-noble
+    roles:
+      - zuul: openstack/tempest
+    group-vars:
+      subnode:
+        devstack_local_conf:
+          post-config:
+            $WATCHER_CONF:
+              watcher_cluster_data_model_collectors.compute:
+                period: 120
+              watcher_cluster_data_model_collectors.baremetal:
+                period: 120
+              watcher_cluster_data_model_collectors.storage:
+                period: 120
+        devstack_services:
+          watcher-api: false
+          watcher-decision-engine: true
+          watcher-applier: false
+          c-bak: 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:
+          $WATCHER_CONF:
+            watcher_cluster_data_model_collectors.compute:
+              period: 120
+            watcher_cluster_data_model_collectors.baremetal:
+              period: 120
+            watcher_cluster_data_model_collectors.storage:
+              period: 120
+        test-config:
+          $TEMPEST_CONFIG:
+            compute:
+              min_compute_nodes: 2
+              min_microversion: 2.56
+            compute-feature-enabled:
+              live_migration: true
+              block_migration_for_live_migration: true
+            placement:
+              min_microversion: 1.29
+      devstack_plugins:
+        ceilometer: https://opendev.org/openstack/ceilometer
+
+- job:
+    name: watcher-tempest-functional
+    parent: devstack-tempest
+    timeout: 7200
+    required-projects: &base_required_projects
+      - openstack/ceilometer
+      - openstack/python-openstackclient
+      - openstack/python-watcherclient
+      - openstack/watcher
+      - openstack/watcher-tempest-plugin
+      - openstack/tempest
+    vars: &base_vars
+      devstack_plugins:
+        watcher: https://opendev.org/openstack/watcher
+      devstack_services:
+        watcher-api: true
+        watcher-decision-engine: true
+        watcher-applier: true
+        tempest: true
+        s-account: false
+        s-container: false
+        s-object: false
+        s-proxy: false
+      tempest_plugins:
+        - watcher-tempest-plugin
+      tempest_test_regex: watcher_tempest_plugin.tests.api
+      tox_envlist: all
+      zuul_copy_output:
+        /etc/hosts: logs
+
+# TODO(gmann): As per the 2025.1 testing runtime, we need to run at least
+# one job on jammy. This job can be removed in the next cycle(2025.2)
+- job:
+    name: watcher-tempest-functional-jammy
+    description: This is integrated job testing on Ubuntu jammy(22.04)
+    parent: watcher-tempest-functional
+    nodeset: openstack-single-node-jammy
+    vars:
+      <<: *base_vars
+      python_version: '3.9'
+
+- job:
+    name: watcher-tempest-functional-ipv6-only
+    parent: devstack-tempest-ipv6
+    description: |
+      Watcher devstack tempest tests job for IPv6-only deployment
+    required-projects: *base_required_projects
+    vars: *base_vars
+
+- job:
+    name: watcher-grenade
+    parent: grenade
+    required-projects:
+      - openstack/watcher
+      - openstack/python-watcherclient
+      - openstack/watcher-tempest-plugin
+    vars: *base_vars
+    irrelevant-files: &irrelevent_files
+      - ^(test-|)requirements.txt$
+      - ^.*\.rst$
+      - ^api-ref/.*$
+      - ^doc/.*$
+      - ^watcher/hacking/.*$
+      - ^watcher/tests/.*$
+      - ^releasenotes/.*$
+      - ^setup.cfg$
+      - ^tools/.*$
+      - ^tox.ini$
+
+- job:
+    # This job is used in python-watcherclient repo
+    name: watcherclient-tempest-functional
+    parent: watcher-tempest-functional
+    timeout: 4200
+    vars:
+      tempest_concurrency: 1
+      tempest_test_regex: watcher_tempest_plugin.tests.client_functional
+
+- job:
+    name: watcher-sg-core-tempest-base
+    parent: devstack-tempest
+    nodeset: openstack-two-node-noble
+    description: |
+      This job is for testing watcher and sg-core/prometheus installation
+    abstract: true
+    pre-run:
+      - playbooks/generate_prometheus_config.yml
+    irrelevant-files: *irrelevent_files
+    timeout: 7800
+    required-projects: &base_sg_required_projects
+      - openstack/aodh
+      - openstack/ceilometer
+      - openstack/tempest
+      - openstack-k8s-operators/sg-core
+      - openstack/watcher
+      - openstack/python-watcherclient
+      - openstack/watcher-tempest-plugin
+      - openstack/devstack-plugin-prometheus
+    vars:
+      configure_swap_size: 8192
+      devstack_plugins:
+        ceilometer: https://opendev.org/openstack/ceilometer
+        aodh: https://opendev.org/openstack/aodh
+        sg-core: https://github.com/openstack-k8s-operators/sg-core
+        watcher: https://opendev.org/openstack/watcher
+        devstack-plugin-prometheus: https://opendev.org/openstack/devstack-plugin-prometheus
+      devstack_services:
+        watcher-api: true
+        watcher-decision-engine: true
+        watcher-applier: true
+        tempest: true
+        # We do not need Swift in this job so disable it for speed
+        # Swift services
+        s-account: false
+        s-container: false
+        s-object: false
+        s-proxy: false
+        # Prometheus related service
+        prometheus: true
+        node_exporter: true
+      devstack_localrc:
+        CEILOMETER_BACKENDS: "sg-core"
+        CEILOMETER_PIPELINE_INTERVAL: 15
+        CEILOMETER_ALARM_THRESHOLD: 6000000000
+        NODE_EXPORTER_ENABLE: false
+        PROMETHEUS_ENABLE: false
+        PROMETHEUS_SERVICE_SCRAPE_TARGETS: "sg-core,node-exporter"
+        PROMETHEUS_CONFIG_FILE: "/home/zuul/prometheus.yml"
+      devstack_local_conf:
+        post-config:
+          $WATCHER_CONF:
+            watcher_datasources:
+              datasources: prometheus
+            prometheus_client:
+              host: 127.0.0.1
+              port: 9090
+            watcher_cluster_data_model_collectors.compute:
+              period: 120
+            watcher_cluster_data_model_collectors.baremetal:
+              period: 120
+            watcher_cluster_data_model_collectors.storage:
+              period: 120
+        test-config:
+          $TEMPEST_CONFIG:
+            compute:
+              min_compute_nodes: 2
+              min_microversion: 2.56
+            compute-feature-enabled:
+              live_migration: true
+              block_migration_for_live_migration: true
+            placement:
+              min_microversion: 1.29
+            service_available:
+              sg_core: True
+            telemetry_services:
+              metric_backends: prometheus
+            telemetry:
+              disable_ssl_certificate_validation: True
+              ceilometer_polling_interval: 15
+            optimize:
+              datasource: prometheus
+      tempest_plugins:
+        - watcher-tempest-plugin
+      tempest_test_regex: watcher_tempest_plugin.tests.scenario.test_execute_strategies
+      tempest_concurrency: 1
+      tox_envlist: all
+      zuul_copy_output:
+        /etc/prometheus/prometheus.yml: logs
+    group-vars:
+      subnode:
+        devstack_plugins:
+          ceilometer: https://opendev.org/openstack/ceilometer
+          sg-core: https://github.com/openstack-k8s-operators/sg-core
+          devstack-plugin-prometheus: https://opendev.org/openstack/devstack-plugin-prometheus
+        devstack_services:
+          ceilometer-acompute: true
+          sg-core: false
+          prometheus: false
+          node_exporter: true
+        devstack_localrc:
+          CEILOMETER_BACKEND: "none"
+          CEILOMETER_BACKENDS: "none"
+          # sg_core related var
+          NODE_EXPORTER_ENABLE: false
+          PROMETHEUS_ENABLE: false
+        devstack_local_conf:
+          post-config:
+            $WATCHER_CONF:
+              watcher_cluster_data_model_collectors.compute:
+                period: 120
+              watcher_cluster_data_model_collectors.baremetal:
+                period: 120
+              watcher_cluster_data_model_collectors.storage:
+                period: 120
+
+- job:
+    name: watcher-prometheus-integration
+    parent: watcher-sg-core-tempest-base

{python-watcher-13.0.0 → python_watcher-14.0.0}/AUTHORS

@@ -17,6 +17,7 @@ Bruno Grazioli <bwg_bruno@hotmail.com>
 BubaVV <vmarkov@mirantis.com>
 Béla Vancsics <vancsics@inf.u-szeged.hu>
 Cao Xuan Hoang <hoangcx@vn.fujitsu.com>
+Chandan Kumar (raukadah) <chkumar@redhat.com>
 ChangBo Guo(gcb) <eric.guo@easystack.cn>
 Chaozhe.Chen <chaozhe.chen@easystack.cn>
 Chris MacNaughton <chris.macnaughton@canonical.com>
@@ -28,6 +29,8 @@ Dao Cong Tien <tiendc@vn.fujitsu.com>
 Darren Shaw <ds354m@att.com>
 David TARDIVEL <David.TARDIVEL@b-com.com>
 Doug Hellmann <doug@doughellmann.com>
+Douglas Viroel <dviroel@redhat.com>
+Douglas Viroel <viroel@gmail.com>
 Drew Thorstensen <thorst@us.ibm.com>
 Edwin Zhai <edwin.zhai@intel.com>
 Egor Panfilov <erakli00@gmail.com>
@@ -50,6 +53,7 @@ James E. Blair <jeblair@redhat.com>
 James Page <james.page@canonical.com>
 Jean-Emile DARTOIS <jean-emile.dartois@b-com.com>
 Jeremy Liu <liujiong@gohighsec.com>
+Jiri Podivin <jpodivin@redhat.com>
 Joe Cropper <jwcroppe@us.ibm.com>
 Ken'ichi Ohmichi <ken-oomichi@wx.jp.nec.com>
 Kevin_Zheng <zhengzhenyu@huawei.com>
@@ -63,6 +67,7 @@ Luigi Toscano <ltoscano@redhat.com>
 Luong Anh Tuan <tuanla@vn.fujitsu.com>
 M V P Nitesh <m.nitesh@nectechnologies.in>
 Margarita Shakhova <mbshakhova.sbt@sberbank.ru>
+Martin Kopec <mkopec@redhat.com>
 Matt Riedemann <mriedem.os@gmail.com>
 Michael Gugino <michael.gugino@walmart.com>
 Michelle Mandel <mmandel@us.ibm.com>
@@ -79,9 +84,11 @@ Prashanth Hari <prashanth.hari@walmart.com>
 Prudhvi Rao Shedimbi <prudhvi.rao.shedimbi@intel.com>
 Q.hongtao <qihongtao@inspur.com>
 Ralf Rantzau <rrantzau@cisco.com>
+Ronelle Landy <rlandy@redhat.com>
 Sampath Priyankara <sam47priya@gmail.com>
 Santhosh Fernandes <santhosh.fernandes@gmail.com>
 Sean McGinnis <sean.mcginnis@gmail.com>
+Sean Mooney <work@seanmooney.info>
 ShangXiao <shangxiaobj@inspur.com>
 Steve Kowalik <steven@wedontsleep.org>
 Steve Wilkerson <sw5822@att.com>
@@ -90,10 +97,12 @@ Susanne Balle <sleipnir012@gmail.com>
 Swapnil Kulkarni (coolsvap) <me@coolsvap.net>
 Takashi Kajinami <kajinamit@oss.nttdata.com>
 Takashi Kajinami <tkajinam@redhat.com>
+Takashi Natsume <takanattie@gmail.com>
 Tatiana Kholkina <holkina@selectel.ru>
 Taylor Peoples <tpeoples@us.ibm.com>
 Thierry Carrez <thierry@openstack.org>
 Tin Lam <tl3438@att.com>
+Tobias Urdin <tobias.urdin@binero.com>
 Tobias Urdin <tobias.urdin@binero.se>
 Tomasz Kaczynski <tomasz.kaczynski@intel.com>
 Tomasz Trębski <tomasz.trebski@ts.fujitsu.com>
@@ -151,6 +160,7 @@ lingyongxu <lyxu@fiberhome.com>
 liushuobj <liushuobj@inspur.com>
 liyanhang <liyh@gohighsec.com>
 lvxianguo <lvxianguo@inspur.com>
+m <mandreou@redhat.com>
 maaoyu <maaoyu@inspur.com>
 melissaml <ma.lei@99cloud.net>
 mergalievibragim <mer_eng@mail.ru>

{python-watcher-13.0.0 → python_watcher-14.0.0}/ChangeLog

@@ -1,12 +1,62 @@
 CHANGES
 =======
 
+14.0.0
+------
+
+* Add epoxy prelude
+* Replace deprecated abc.abstractproperty
+* Drop implicit test dependency on iso8601
+* Enable prometheus datasource in watcher-prometheus-integration job
+* Enable prometheus and node\_exporter from devstack-plugin-prometheus
+* Deprecate Monasca data source
+* Further database refactoring
+* pre-commit: Integrate bandit
+* Remove unused os-api-ref from test requirements
+* Drop import fallback for Python 2
+* Add support for instance metrics to prometheus datasource
+* Drop bandit B320 profile to fix tox -e bandit interface
+* Add Tempest test for Prometheus integration
+* Add prometheus data source for watcher decision engine
+* Imported Translations from Zanata
+* Remove ceilometer datasource
+* X-Project-Name key in test code was duplicated
+* Fix create\_continuous\_audit\_with\_wrong\_interval test assert
+* Update gate jobs as per the 2025.1 cycle testing runtime
+* Fix incompatiablity between apscheduler and eventlet
+* [pre-commit] enforce pre-commit checks in ci
+* [docs] apply sphinx-lint to docs
+* Replace deprecated configure\_auth\_token\_middleware
+* reno: Update master for unmaintained/2023.1
+* Remove default override for config options policy\_file
+* [pre-commit] Fix execute and shebang lines
+* [eventlet] Ensure unit tests are monkey patched
+* [tox] update tox.ini to enable debugging
+* [pre-commit] fix typos and configure codespell
+* Update python versions, drop py3.8
+* Update master for stable/2024.2
+* Drop unnecessary 'x' bit from doc config file
+* Run watcher-db-manage in grenade testing from venv
+* [pre-commit] Add initial pre-commit config
+* tox: Drop envdir
+* Replace deprecated datetime.utcnow()
+* Remove workaround for eventlet < 0.27.0
+* Convert CRLF to LF
+* Bump hacking
+* Replace deprecated LegacyEngineFacade
+
 13.0.0
 ------
 
 * Imported Translations from Zanata
 * SQLAlchemy 2.0: Omnibus fixes patch
+* reno: Update master for unmaintained/zed
 * Fix oslo.db >= 15.0.0 compatibility
+* Update master for stable/2024.1
+* reno: Update master for unmaintained/xena
+* reno: Update master for unmaintained/wallaby
+* reno: Update master for unmaintained/victoria
+* reno: Update master for unmaintained/yoga
 
 12.0.0.0rc1
 -----------

python_watcher-14.0.0/PKG-INFO

@@ -0,0 +1,99 @@
+Metadata-Version: 2.1
+Name: python-watcher
+Version: 14.0.0
+Summary: OpenStack Watcher provides a flexible and scalable resource optimization service for multi-tenant OpenStack-based clouds.
+Home-page: https://docs.openstack.org/watcher/latest/
+Author: OpenStack
+Author-email: openstack-discuss@lists.openstack.org
+Classifier: Environment :: OpenStack
+Classifier: Intended Audience :: Information Technology
+Classifier: Intended Audience :: System Administrators
+Classifier: License :: OSI Approved :: Apache Software License
+Classifier: Operating System :: POSIX :: Linux
+Classifier: Programming Language :: Python
+Classifier: Programming Language :: Python :: Implementation :: CPython
+Classifier: Programming Language :: Python :: 3 :: Only
+Classifier: Programming Language :: Python :: 3
+Classifier: Programming Language :: Python :: 3.9
+Classifier: Programming Language :: Python :: 3.10
+Classifier: Programming Language :: Python :: 3.11
+Classifier: Programming Language :: Python :: 3.12
+Requires-Python: >=3.9
+License-File: LICENSE
+Requires-Dist: apscheduler>=3.5.1
+Requires-Dist: eventlet>=0.27.0
+Requires-Dist: jsonpatch>=1.21
+Requires-Dist: keystoneauth1>=3.4.0
+Requires-Dist: jsonschema>=3.2.0
+Requires-Dist: keystonemiddleware>=4.21.0
+Requires-Dist: lxml>=4.5.1
+Requires-Dist: croniter>=0.3.20
+Requires-Dist: os-resource-classes>=0.4.0
+Requires-Dist: oslo.concurrency>=3.26.0
+Requires-Dist: oslo.cache>=1.29.0
+Requires-Dist: oslo.config>=6.8.0
+Requires-Dist: oslo.context>=2.21.0
+Requires-Dist: oslo.db>=4.44.0
+Requires-Dist: oslo.i18n>=3.20.0
+Requires-Dist: oslo.log>=3.37.0
+Requires-Dist: oslo.messaging>=14.1.0
+Requires-Dist: oslo.policy>=4.5.0
+Requires-Dist: oslo.reports>=1.27.0
+Requires-Dist: oslo.serialization>=2.25.0
+Requires-Dist: oslo.service>=1.30.0
+Requires-Dist: oslo.upgradecheck>=1.3.0
+Requires-Dist: oslo.utils>=7.0.0
+Requires-Dist: oslo.versionedobjects>=1.32.0
+Requires-Dist: PasteDeploy>=1.5.2
+Requires-Dist: pbr>=3.1.1
+Requires-Dist: pecan>=1.3.2
+Requires-Dist: PrettyTable>=0.7.2
+Requires-Dist: gnocchiclient>=7.0.1
+Requires-Dist: python-cinderclient>=3.5.0
+Requires-Dist: python-glanceclient>=2.9.1
+Requires-Dist: python-keystoneclient>=3.15.0
+Requires-Dist: python-monascaclient>=1.12.0
+Requires-Dist: python-neutronclient>=6.7.0
+Requires-Dist: python-novaclient>=14.1.0
+Requires-Dist: python-observabilityclient>=0.3.0
+Requires-Dist: python-openstackclient>=3.14.0
+Requires-Dist: python-ironicclient>=2.5.0
+Requires-Dist: SQLAlchemy>=1.2.5
+Requires-Dist: stevedore>=1.28.0
+Requires-Dist: taskflow>=3.8.0
+Requires-Dist: WebOb>=1.8.5
+Requires-Dist: WSME>=0.9.2
+Requires-Dist: networkx>=2.4
+Requires-Dist: microversion_parse>=0.2.1
+Requires-Dist: futurist>=1.8.0
+
+=======
+Watcher
+=======
+
+.. image:: https://governance.openstack.org/tc/badges/watcher.svg
+    :target: https://governance.openstack.org/tc/reference/tags/index.html
+
+.. Change things from this point on
+
+..
+      Except where otherwise noted, this document is licensed under Creative
+      Commons Attribution 3.0 License.  You can view the license at:
+
+          https://creativecommons.org/licenses/by/3.0/
+
+OpenStack Watcher provides a flexible and scalable resource optimization
+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!
+
+* Free software: Apache license
+* Wiki: https://wiki.openstack.org/wiki/Watcher
+* Source: https://opendev.org/openstack/watcher
+* Bugs: https://bugs.launchpad.net/watcher
+* Documentation: https://docs.openstack.org/watcher/latest/
+* Release notes: https://docs.openstack.org/releasenotes/watcher/
+* Design specifications: https://specs.openstack.org/openstack/watcher-specs/
+

{python-watcher-13.0.0 → python_watcher-14.0.0}/api-ref/source/samples/audit-list-detailed-response.json

@@ -30,7 +30,7 @@
                 }
             },
             "auto_trigger": false,
-	    "force": false,
+            "force": false,
             "uuid": "65a5da84-5819-4aea-8278-a28d2b489028",
             "goal_name": "workload_balancing",
             "scope": [],

{python-watcher-13.0.0 → python_watcher-14.0.0}/api-ref/source/samples/datamodel-list-response.json

@@ -13,9 +13,9 @@
             "node_vcpu_ratio": "16.0",
             "node_memory": "16383",
             "node_memory_ratio": "1.5",
-            "node_disk": "37"
+            "node_disk": "37",
             "node_disk_ratio": "1.0",
-            "node_state": "up",
+            "node_state": "up"
         },
         {
             "server_uuid": "e2cb5f6f-fa1d-4ba2-be1e-0bf02fa86ba4",
@@ -30,9 +30,9 @@
             "node_vcpu_ratio": "16.0",
             "node_memory": "16383",
             "node_memory_ratio": "1.5",
-            "node_disk": "37"
+            "node_disk": "37",
             "node_disk_ratio": "1.0",
-            "node_state": "up",
+            "node_state": "up"
         }
     ]
 }

{python-watcher-13.0.0 → python_watcher-14.0.0}/api-ref/source/watcher-api-v1-goals.inc

@@ -12,7 +12,7 @@ Here are some examples of ``Goals``:
 -  minimize the energy consumption
 -  minimize the number of compute nodes (consolidation)
 -  balance the workload among compute nodes
--  minimize the license cost (some softwares have a licensing model which is
+-  minimize the license cost (some software have a licensing model which is
    based on the number of sockets or cores where the software is deployed)
 -  find the most appropriate moment for a planned maintenance on a
    given group of host (which may be an entire availability zone):
@@ -123,4 +123,4 @@ Response
 **Example JSON representation of a Goal:**
 
 .. literalinclude:: samples/goal-show-response.json
-   :language: javascript
+   :language: javascript

{python-watcher-13.0.0 → python_watcher-14.0.0}/devstack/lib/watcher

@@ -1,5 +1,3 @@
-#!/bin/bash
-#
 # lib/watcher
 # Functions to control the configuration and operation of the watcher services
 
@@ -38,7 +36,6 @@ GITBRANCH["python-watcherclient"]=${WATCHERCLIENT_BRANCH:-master}
 GITDIR["python-watcherclient"]=$DEST/python-watcherclient
 
 WATCHER_STATE_PATH=${WATCHER_STATE_PATH:=$DATA_DIR/watcher}
-WATCHER_AUTH_CACHE_DIR=${WATCHER_AUTH_CACHE_DIR:-/var/cache/watcher}
 
 WATCHER_CONF_DIR=/etc/watcher
 WATCHER_CONF=$WATCHER_CONF_DIR/watcher.conf
@@ -103,7 +100,7 @@ function _cleanup_watcher_apache_wsgi {
 # cleanup_watcher() - Remove residual data files, anything left over from previous
 # runs that a clean run would need to clean up
 function cleanup_watcher {
-    sudo rm -rf $WATCHER_STATE_PATH $WATCHER_AUTH_CACHE_DIR
+    sudo rm -rf $WATCHER_STATE_PATH
     if [[ "$WATCHER_USE_WSGI_MODE" == "uwsgi" ]]; then
         remove_uwsgi_config "$WATCHER_UWSGI_CONF" "$WATCHER_UWSGI"
     else
@@ -210,8 +207,8 @@ function create_watcher_conf {
 
     iniset $WATCHER_CONF oslo_messaging_notifications driver "messagingv2"
 
-    configure_auth_token_middleware $WATCHER_CONF watcher $WATCHER_AUTH_CACHE_DIR
-    configure_auth_token_middleware $WATCHER_CONF watcher $WATCHER_AUTH_CACHE_DIR "watcher_clients_auth"
+    configure_keystone_authtoken_middleware $WATCHER_CONF watcher
+    configure_keystone_authtoken_middleware $WATCHER_CONF watcher "watcher_clients_auth"
 
     if is_fedora || is_suse; then
         # watcher defaults to /usr/local/bin, but fedora and suse pip like to
@@ -248,13 +245,6 @@ function create_watcher_conf {
     fi
 }
 
-# create_watcher_cache_dir() - Part of the init_watcher() process
-function create_watcher_cache_dir {
-    # Create cache dir
-    sudo install -d -o $STACK_USER $WATCHER_AUTH_CACHE_DIR
-    rm -rf $WATCHER_AUTH_CACHE_DIR/*
-}
-
 # init_watcher() - Initialize databases, etc.
 function init_watcher {
     # clean up from previous (possibly aborted) runs
@@ -266,7 +256,6 @@ function init_watcher {
         # Create watcher schema
         $WATCHER_BIN_DIR/watcher-db-manage --config-file $WATCHER_CONF upgrade
     fi
-    create_watcher_cache_dir
 }
 
 # install_watcherclient() - Collect source and prepare
@@ -275,6 +264,9 @@ function install_watcherclient {
         git_clone_by_name "python-watcherclient"
         setup_dev_lib "python-watcherclient"
     fi
+    if [[ "$GLOBAL_VENV" == "True" ]]; then
+        sudo ln -sf /opt/stack/data/venv/bin/watcher /usr/local/bin
+    fi
 }
 
 # install_watcher() - Collect source and prepare