[octane] cache_service_tenant_id should respect old verions without "openstack" client

Bug #1572019 reported by Roman Sokolkov
14
This bug affects 2 people
Affects Status Importance Assigned to Milestone
Fuel for OpenStack
Fix Committed
High
Ilya Kharin
8.0.x
Fix Committed
High
Unassigned
Newton
Fix Committed
High
Ilya Kharin

Bug Description

Cache_service_tenant uses "openstack" client to get info, but MOS6.X (Juno) does not have it.

. /root/openrc; openstack --os-password {0} project list -f json

We should check MOS version and use "keystone" client for 6.X versions.

Please see my patch in attachment.

Revision history for this message
Roman Sokolkov (rsokolkov) wrote :
Dmitry Klenov (dklenov)
tags: added: area-python
Revision history for this message
Oleg S. Gelbukh (gelbuhos) wrote :

Roman, could you please submit this patch for review to openstack/fuel-octane repository?

Revision history for this message
OpenStack Infra (hudson-openstack) wrote : Fix proposed to fuel-octane (master)

Fix proposed to branch: master
Review: https://review.openstack.org/307881

Changed in fuel:
assignee: Fuel Octane (fuel-octane-team) → Roman Sokolkov (rsokolkov)
status: Confirmed → In Progress
Revision history for this message
OpenStack Infra (hudson-openstack) wrote : Fix merged to fuel-octane (master)

Reviewed: https://review.openstack.org/307881
Committed: https://git.openstack.org/cgit/openstack/fuel-octane/commit/?id=d4b073bbf43e3fba99503f76b84086ab751d106c
Submitter: Jenkins
Branch: master

commit d4b073bbf43e3fba99503f76b84086ab751d106c
Author: Roman Sokolkov <email address hidden>
Date: Tue Apr 19 18:22:10 2016 +0300

    Makes cache_service_tenant_id compatible with Juno

    This change returns compatibility with the keystone client to obtain ID
    of the services tenant for old releases, clients are used according to
    the next releases of Fuel:

        keystone: < 7.0
        openstack: >= 7.0

    Closes-Bug: 1572019
    Co-Authored-By: Ilya Kharin <email address hidden>
    Change-Id: I64877ea484cf148b0eb7501bf2676db5388f892f

Changed in fuel:
status: In Progress → Fix Committed
Revision history for this message
OpenStack Infra (hudson-openstack) wrote : Fix proposed to fuel-octane (stable/8.0)

Fix proposed to branch: stable/8.0
Review: https://review.openstack.org/310773

Revision history for this message
OpenStack Infra (hudson-openstack) wrote : Fix merged to fuel-octane (stable/8.0)

Reviewed: https://review.openstack.org/310773
Committed: https://git.openstack.org/cgit/openstack/fuel-octane/commit/?id=9571fbd364e4b0b66e9cc0efdd7b12ee978d3d6d
Submitter: Jenkins
Branch: stable/8.0

commit 9571fbd364e4b0b66e9cc0efdd7b12ee978d3d6d
Author: Roman Sokolkov <email address hidden>
Date: Tue Apr 19 18:22:10 2016 +0300

    Makes cache_service_tenant_id compatible with Juno

    This change returns compatibility with the keystone client to obtain ID
    of the services tenant for old releases, clients are used according to
    the next releases of Fuel:

        keystone: < 7.0
        openstack: >= 7.0

    Closes-Bug: 1572019
    Co-Authored-By: Ilya Kharin <email address hidden>
    Change-Id: I64877ea484cf148b0eb7501bf2676db5388f892f
    (cherry picked from commit d4b073bbf43e3fba99503f76b84086ab751d106c)

no longer affects: fuel/mitaka
Revision history for this message
OpenStack Infra (hudson-openstack) wrote : Fix proposed to fuel-octane (stable/mitaka)

Fix proposed to branch: stable/mitaka
Review: https://review.openstack.org/332931

Revision history for this message
OpenStack Infra (hudson-openstack) wrote : Fix merged to fuel-octane (stable/mitaka)
Download full text (40.5 KiB)

Reviewed: https://review.openstack.org/332931
Committed: https://git.openstack.org/cgit/openstack/fuel-octane/commit/?id=24f3c396612eb0c69fbf06bab3cebbb9ca829426
Submitter: Jenkins
Branch: stable/mitaka

commit b34d749f1c281dafbdbf155bd86830dc8f2a9aa2
Author: Ilya Kharin <email address hidden>
Date: Wed Jun 22 21:10:56 2016 +0300

    Support mock==1.8.0 in unit tests

    Use assert_called_once_with instead of assert_called_once that was
    introduced in 2.0.0.

    Change-Id: Ifb7699d4b552d148984961727355f0e23b487c7c

commit d60f1905143bb7576ffd670595de1c4aeafd7b34
Author: Ilya Kharin <email address hidden>
Date: Wed Jun 22 02:01:52 2016 +0300

    Allow to authorize by the predefined admin_token

    The admin_token_auth middleware is added to keystone pipelines to
    allow authorization by admin_token.

    Change-Id: Ic03150305a669fad1446436a68051fb9aa25b892

commit cc7fab59f44ffef60285f8732d798f52469b2530
Author: Ilya Kharin <email address hidden>
Date: Wed Jun 22 01:47:01 2016 +0300

    Reset default_domain_id before the keystone task

    The default_domain_id should be removed from keystone.conf after restore
    of DB and before to apply the keystone puppet task to avoid of using the
    configured domain as a default.

    Change-Id: I05a6c48532e8042496b3d8ccef53d65bf8c44653

commit e3f82399d567dbcfc1ae9a1ecbddba7bf5028fc8
Author: Ilya Kharin <email address hidden>
Date: Wed Jun 22 01:32:47 2016 +0300

    Add helper function to iterate over parameters

    The helpers.iterate_parameters function allows to iterate over lines of
    INI-like files along with a context of information, such section,
    parameter and value.

    Change-Id: I55b179118116fd5dacf100754057ea6589782dc2

commit 5ed370a4fbb3369d0f75873d205ac7f0c655f93a
Author: Ilya Kharin <email address hidden>
Date: Wed Jun 22 01:18:05 2016 +0300

    Add update_file context manager for local files

    The subprocess.update_file function provides an ability to update
    content of a local file by iterating over lines of an original file and
    forming a result content in a temporary file to replace the original
    file in the end. This function is very useful to change configuration
    files.

    Change-Id: I433a5da67887b231400dd63131799019f45c277c

commit 58f31e6c5f408630c42565ee53de6b59457bc84c
Author: Oleg Gelbukh <email address hidden>
Date: Wed Jun 22 14:34:03 2016 +0000

    Escape passwords passed to openstack client

    If special symbols are used in password for 'admin' user in
    OpenStack, octane passes them to command line client as is
    and it breaks shell.

    Properly escape the password before passing it to subprocess.

    Change-Id: Iad635aec6d5b5cc32975937e00205b7e89dc99d9
    Closes-bug: 1585960

commit 896aba1191eeb59cf85cc8be6a2ae67e08b76070
Author: Yuriy Taraday <email address hidden>
Date: Wed Jun 22 15:28:45 2016 +0300

    Add absolute_import to util/docker.py to avoid local tempfile module

    Closes-Bug: 1595156
    Change-Id: I9484efce6fa7aec1b41cf592f9e9768d85931fa7

commit 46586a62df962b2ce00b5d8a63f6fd34c920a1f4
Author: Oleg Gelbukh <email address hidden>
Date: Thu M...

tags: added: in-stable-mitaka
To post a comment you must log in.
This report contains Public information  
Everyone can see this information.

Duplicates of this bug

Other bug subscribers

Remote bug watches

Bug watches keep track of this bug in other bug trackers.