Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Service token support [yoga] #797

Merged
merged 7 commits into from
Jun 13, 2023
Merged

Conversation

freyes
Copy link
Collaborator

@freyes freyes commented Jun 2, 2023

Backports of pull requests listed below to get support for Service Tokens in charm-helpers' stable/zed branch.

drencrom and others added 7 commits June 2, 2023 15:35
Add a new template to configure the service_user ini file section and
also add two needed parameters in keystone_authtoken configuration

(cherry picked from commit f8c8861)
* Make admin role configurable
* Move keystone_authtoken configuration from mitaka version to base
  version
* Sync service_user config with keystone_authtoken for the base version

(cherry picked from commit 7bcb194)

Conflicts Resolved:
	charmhelpers/contrib/openstack/context.py
(cherry picked from commit 4090532)
(cherry picked from commit e43008d)
(cherry picked from commit c7cc5db)
Copy parameters added in pull request juju#740 to the newest
keystone-authtoken template.

(cherry picked from commit 23d838b)
@freyes freyes requested review from dosaboy and wolsen June 8, 2023 19:17
Copy link
Collaborator

@ajkavanagh ajkavanagh left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM; one more review required for a stable review please.

@ajkavanagh ajkavanagh merged commit 32772ff into juju:stable/yoga Jun 13, 2023
3 checks passed
coreycb pushed a commit to coreycb/charm-helpers that referenced this pull request Jun 29, 2023
* Add configuration for use of service tokens

Add a new template to configure the service_user ini file section and
also add two needed parameters in keystone_authtoken configuration

(cherry picked from commit f8c8861)

* Fixes for service tokens

* Make admin role configurable
* Move keystone_authtoken configuration from mitaka version to base
  version
* Sync service_user config with keystone_authtoken for the base version

(cherry picked from commit 7bcb194)

Conflicts Resolved:
	charmhelpers/contrib/openstack/context.py

* Fix tests

(cherry picked from commit 4090532)

* Add test for this feature

(cherry picked from commit e43008d)

* Fix test

(cherry picked from commit c7cc5db)

* Add service token parameters to last authtoken template

Copy parameters added in pull request juju#740 to the newest
keystone-authtoken template.

(cherry picked from commit 23d838b)

* Pin tox<4.0

---------

Co-authored-by: Jorge Merlino <jorge.merlino@canonical.com>
(cherry picked from commit 32772ff)
coreycb pushed a commit to coreycb/charm-helpers that referenced this pull request Jun 29, 2023
* Add configuration for use of service tokens

Add a new template to configure the service_user ini file section and
also add two needed parameters in keystone_authtoken configuration

(cherry picked from commit f8c8861)

* Fixes for service tokens

* Make admin role configurable
* Move keystone_authtoken configuration from mitaka version to base
  version
* Sync service_user config with keystone_authtoken for the base version

(cherry picked from commit 7bcb194)

Conflicts Resolved:
	charmhelpers/contrib/openstack/context.py

* Fix tests

(cherry picked from commit 4090532)

* Add test for this feature

(cherry picked from commit e43008d)

* Fix test

(cherry picked from commit c7cc5db)

* Add service token parameters to last authtoken template

Copy parameters added in pull request juju#740 to the newest
keystone-authtoken template.

(cherry picked from commit 23d838b)

* Pin tox<4.0

---------

Co-authored-by: Jorge Merlino <jorge.merlino@canonical.com>
(cherry picked from commit 32772ff)
coreycb pushed a commit to coreycb/charm-helpers that referenced this pull request Jun 29, 2023
* Add configuration for use of service tokens

Add a new template to configure the service_user ini file section and
also add two needed parameters in keystone_authtoken configuration

(cherry picked from commit f8c8861)

* Fixes for service tokens

* Make admin role configurable
* Move keystone_authtoken configuration from mitaka version to base
  version
* Sync service_user config with keystone_authtoken for the base version

(cherry picked from commit 7bcb194)

Conflicts Resolved:
	charmhelpers/contrib/openstack/context.py

* Fix tests

(cherry picked from commit 4090532)

* Add test for this feature

(cherry picked from commit e43008d)

* Fix test

(cherry picked from commit c7cc5db)

* Add service token parameters to last authtoken template

Copy parameters added in pull request juju#740 to the newest
keystone-authtoken template.

(cherry picked from commit 23d838b)

* Pin tox<4.0

---------

Co-authored-by: Jorge Merlino <jorge.merlino@canonical.com>
(cherry picked from commit 32772ff)
coreycb pushed a commit to coreycb/charm-helpers that referenced this pull request Jun 29, 2023
* Add configuration for use of service tokens

Add a new template to configure the service_user ini file section and
also add two needed parameters in keystone_authtoken configuration

(cherry picked from commit f8c8861)

* Fixes for service tokens

* Make admin role configurable
* Move keystone_authtoken configuration from mitaka version to base
  version
* Sync service_user config with keystone_authtoken for the base version

(cherry picked from commit 7bcb194)

Conflicts Resolved:
	charmhelpers/contrib/openstack/context.py

* Fix tests

(cherry picked from commit 4090532)

* Add test for this feature

(cherry picked from commit e43008d)

* Fix test

(cherry picked from commit c7cc5db)

* Add service token parameters to last authtoken template

Copy parameters added in pull request juju#740 to the newest
keystone-authtoken template.

(cherry picked from commit 23d838b)

* Pin tox<4.0

---------

Co-authored-by: Jorge Merlino <jorge.merlino@canonical.com>
(cherry picked from commit 32772ff)
coreycb pushed a commit to coreycb/charm-helpers that referenced this pull request Jun 29, 2023
* Add configuration for use of service tokens

Add a new template to configure the service_user ini file section and
also add two needed parameters in keystone_authtoken configuration

(cherry picked from commit f8c8861)

* Fixes for service tokens

* Make admin role configurable
* Move keystone_authtoken configuration from mitaka version to base
  version
* Sync service_user config with keystone_authtoken for the base version

(cherry picked from commit 7bcb194)

Conflicts Resolved:
	charmhelpers/contrib/openstack/context.py

* Fix tests

(cherry picked from commit 4090532)

* Add test for this feature

(cherry picked from commit e43008d)

* Fix test

(cherry picked from commit c7cc5db)

* Add service token parameters to last authtoken template

Copy parameters added in pull request juju#740 to the newest
keystone-authtoken template.

(cherry picked from commit 23d838b)

* Pin tox<4.0

---------

Co-authored-by: Jorge Merlino <jorge.merlino@canonical.com>
(cherry picked from commit 32772ff)
coreycb pushed a commit to coreycb/charm-helpers that referenced this pull request Jun 29, 2023
* Add configuration for use of service tokens

Add a new template to configure the service_user ini file section and
also add two needed parameters in keystone_authtoken configuration

(cherry picked from commit f8c8861)

* Fixes for service tokens

* Make admin role configurable
* Move keystone_authtoken configuration from mitaka version to base
  version
* Sync service_user config with keystone_authtoken for the base version

(cherry picked from commit 7bcb194)

Conflicts Resolved:
	charmhelpers/contrib/openstack/context.py

* Fix tests

(cherry picked from commit 4090532)

* Add test for this feature

(cherry picked from commit e43008d)

* Fix test

(cherry picked from commit c7cc5db)

* Add service token parameters to last authtoken template

Copy parameters added in pull request juju#740 to the newest
keystone-authtoken template.

(cherry picked from commit 23d838b)

* Pin tox<4.0

---------

Co-authored-by: Jorge Merlino <jorge.merlino@canonical.com>
(cherry picked from commit 32772ff)
coreycb pushed a commit to coreycb/charm-helpers that referenced this pull request Jun 29, 2023
* Add configuration for use of service tokens

Add a new template to configure the service_user ini file section and
also add two needed parameters in keystone_authtoken configuration

(cherry picked from commit f8c8861)

* Fixes for service tokens

* Make admin role configurable
* Move keystone_authtoken configuration from mitaka version to base
  version
* Sync service_user config with keystone_authtoken for the base version

(cherry picked from commit 7bcb194)

Conflicts Resolved:
	charmhelpers/contrib/openstack/context.py

* Fix tests

(cherry picked from commit 4090532)

* Add test for this feature

(cherry picked from commit e43008d)

* Fix test

(cherry picked from commit c7cc5db)

* Add service token parameters to last authtoken template

Copy parameters added in pull request juju#740 to the newest
keystone-authtoken template.

(cherry picked from commit 23d838b)

* Pin tox<4.0

---------

Co-authored-by: Jorge Merlino <jorge.merlino@canonical.com>
(cherry picked from commit 32772ff)
ajkavanagh pushed a commit that referenced this pull request Jun 30, 2023
* Add configuration for use of service tokens

Add a new template to configure the service_user ini file section and
also add two needed parameters in keystone_authtoken configuration

(cherry picked from commit f8c8861)

* Fixes for service tokens

* Make admin role configurable
* Move keystone_authtoken configuration from mitaka version to base
  version
* Sync service_user config with keystone_authtoken for the base version

(cherry picked from commit 7bcb194)

Conflicts Resolved:
	charmhelpers/contrib/openstack/context.py

* Fix tests

(cherry picked from commit 4090532)

* Add test for this feature

(cherry picked from commit e43008d)

* Fix test

(cherry picked from commit c7cc5db)

* Add service token parameters to last authtoken template

Copy parameters added in pull request #740 to the newest
keystone-authtoken template.

(cherry picked from commit 23d838b)

* Pin tox<4.0

---------

Co-authored-by: Jorge Merlino <jorge.merlino@canonical.com>
(cherry picked from commit 32772ff)

Co-authored-by: Felipe Reyes <felipe.reyes@canonical.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

4 participants