-
Notifications
You must be signed in to change notification settings - Fork 15
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
base: master
Are you sure you want to change the base?
Conversation
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.
There was a problem hiding this 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 %} |
There was a problem hiding this comment.
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
There was a problem hiding this comment.
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.
There was a problem hiding this comment.
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.
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 forswift auth parameters definition,
glance-glare.conf
is not whichmakes salt-formula-glance fail in execution.