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

Adding conditional processing of swift auth parameters #24

Open
wants to merge 2 commits into
base: master
Choose a base branch
from

Conversation

kukacz
Copy link

@kukacz kukacz commented Mar 15, 2018

These changes should patch an issue observed in Ocata when Swift
is set as Glance backend with references method of auth sections
addressing. While glance-api.conf template is set to check for
swift auth parameters definition, glance-glare.conf is not which
makes salt-formula-glance fail in execution.

kukacz and others added 2 commits March 15, 2018 16:30
These changes should patch an issue observed in Ocata when Swift
is set as Glance backend with *references* method of auth sections
addressing. While `glance-api.conf` template is set to check for
swift auth parameters definition, `glance-glare.conf` is not which
makes salt-formula-glance fail during execution.
@kukacz
Copy link
Author

kukacz commented Mar 16, 2018

@fpytloun @epcim Review, please.

@kukacz
Copy link
Author

kukacz commented Mar 21, 2018

@fpytloun @epcim Could you review please? In current state glance formula does not work with Swift backend using reference configs.

Copy link
Member

@epcim epcim left a comment

Choose a reason for hiding this comment

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

lg, except backward compatibility (otherwise correct me)

@@ -1862,8 +1872,8 @@ swift_store_key = {{ server.storage.swift.store.key }}
#
# (string value)
#swift_store_config_file = <None>
{% if server.storage.swift.store.config_file is defined %}
swift_store_config_file = {{ server.storage.swift.store.config_file }}
{% if server.storage.swift.store.references is defined %}
Copy link
Member

Choose a reason for hiding this comment

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

can you touch to keep backward compatible, so sth like

if server.storage.swift.store.references is defined
< new code >
else

end

Copy link

Choose a reason for hiding this comment

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

Hi @epcim, change is just reflecting same code block as in glance-api.conf https://github.com/salt-formulas/salt-formula-glance/blame/master/glance/files/ocata/glance-api.conf.Debian#L3221 commit 3a86781 this change was not done in glance-glare.conf which is now causing problems.
I think glance-api.conf and glance-glare.conf should have same code logic.
What do you think?
Thanks.

Copy link

Choose a reason for hiding this comment

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

@LotharKAtt @Martin819 Hi guys, could anyone of you comment or even merge this PR? Thanks a lot.

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.

3 participants