openstack
/
openstack
Code Issues Proposed changes

Update git submodules 

* Update watcher from branch 'master'
  - Merge "allow building docs without ceilometer client"
  - allow building docs without ceilometer client
    
    CeilometerClient has been deprecated and is no longer available for
    master. Without ceilometer client installed docs fail to build with
    an exception [1].
    
    This patch marks the import optional.
    
    1 -
    Traceback (most recent call last):
      File "/usr/lib/python2.7/site-packages/sphinx/config.py", line 368, in
    eval_config_file
        execfile_(filename, namespace)
      File "/usr/lib/python2.7/site-packages/sphinx/util/pycompat.py", line
    150, in execfile_
        exec_(code, _globals)
      File "/usr/lib/python2.7/site-packages/six.py", line 709, in exec_
        exec(""exec _code_ in _globs_, _locs_"")
      File "<string>", line 1, in <module>
      File
    "/home/abuild/rpmbuild/BUILD/python-watcher-2.1.0.dev45/doc/source/conf.py",
    line 20, in <module>
        objects.register_all()
      File
    "/home/abuild/rpmbuild/BUILD/python-watcher-2.1.0.dev45/watcher/objects/__init__.py",
    line 31, in register_all
        __import__('watcher.objects.action_plan')
      File
    "/home/abuild/rpmbuild/BUILD/python-watcher-2.1.0.dev45/watcher/objects/action_plan.py",
    line 78, in <module>
        from watcher import conf
      File
    "/home/abuild/rpmbuild/BUILD/python-watcher-2.1.0.dev45/watcher/conf/__init__.py",
    line 28, in <module>
        from watcher.conf import datasources
      File
    "/home/abuild/rpmbuild/BUILD/python-watcher-2.1.0.dev45/watcher/conf/datasources.py",
    line 21, in <module>
        from watcher.datasources import manager
      File
    "/home/abuild/rpmbuild/BUILD/python-watcher-2.1.0.dev45/watcher/datasources/manager.py",
    line 19, in <module>
        from watcher.datasources import ceilometer as ceil
      File
    "/home/abuild/rpmbuild/BUILD/python-watcher-2.1.0.dev45/watcher/datasources/ceilometer.py",
    line 21, in <module>
        from ceilometerclient import exc
    ImportError: No module named ceilometerclient
    )
    
    Change-Id: Idcf582c2495aab39aacf691b687759405bb94dca
This commit is contained in:
Zuul 2019-05-14 02:38:42 +00:00 committed by Gerrit Code Review
parent c9e1b52bad
commit 931b593f79
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
watcher

@ -1 +1 @@
Subproject commit 85de4472f1ba92df4042cbabdb8d8e1abc550eca
Subproject commit 9922dec025b94aeb2ad5749bc5b438c4a43814ce