-
Notifications
You must be signed in to change notification settings - Fork 27
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
WIP SOC8 support #112
base: master
Are you sure you want to change the base?
WIP SOC8 support #112
Conversation
chef/cookbooks/ceph/recipes/mon.rb
Outdated
subscribes :restart, resources(template: "/etc/ceph/ceph.conf") | ||
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.
Layout/EmptyLines: Extra blank line detected. (https://github.com/bbatsov/ruby-style-guide#two-or-more-empty-lines)
chef/cookbooks/ceph/recipes/mon.rb
Outdated
unless File.exist?("/var/lib/ceph/mgr/ceph-#{mon_name}/done") | ||
keyring = "#{Chef::Config[:file_cache_path]}/#{cluster}-#{mon_name}.mgr.keyring" | ||
execute "create mgr keyring" do | ||
command "ceph-authtool '#{keyring}' --create-keyring --name=mgr. --add-key='#{node["ceph"]["monitor-secret"]}' --cap mgr 'allow *'" |
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.
Metrics/LineLength: Line is too long. [135/100] (https://github.com/SUSE/style-guides/blob/master/Ruby.md#metricslinelength)
chef/cookbooks/ceph/recipes/mon.rb
Outdated
# TODO cluster name | ||
cluster = "ceph" | ||
|
||
|
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.
Layout/EmptyLines: Extra blank line detected. (https://github.com/bbatsov/ruby-style-guide#two-or-more-empty-lines)
chef/cookbooks/ceph/recipes/mon.rb
Outdated
action :create | ||
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.
Layout/EmptyLines: Extra blank line detected. (https://github.com/bbatsov/ruby-style-guide#two-or-more-empty-lines)
Please note master is in this case Cloud 8 and we actually disabled support for it. |
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.
Aside from the keyring change, this looks like it will work to deploy ceph-mgr.
Note though that SES5 doesn't include Calamari, so if SOC8 ends up supporting deploying SES5, the Calamari role will need to be removed. This leaves the Ceph cluster without a GUI, unless we were to add an openATTIC role, to deploy openATTIC instead, but that gets more complicated, as parts of openATTIC rely on DeepSea, which won't be present if SES is deployed via Crowbar.
chef/cookbooks/ceph/recipes/mon.rb
Outdated
unless File.exist?("/var/lib/ceph/mgr/ceph-#{mon_name}/done") | ||
keyring = "#{Chef::Config[:file_cache_path]}/#{cluster}-#{mon_name}.mgr.keyring" | ||
execute "create mgr keyring" do | ||
command "ceph-authtool '#{keyring}' --create-keyring --name=mgr. --add-key='#{node["ceph"]["monitor-secret"]}' --cap mgr 'allow *'" |
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.
The mgr keyring needs to be written to /var/lib/ceph/mgr/ceph-#{mon_name}/keyring
and needs caps mon 'allow profile mgr' osd 'allow *' mds 'allow *'
, something like the "create mds keyring" block in chef/cookbooks/ceph/recipes/mds.rb.
Added that, but somehow there is no admin keyring.
|
Try moving all the mgr creation stuff down to the end of the file; ceph.client.admin.keyring isn't created yet until about line 200. |
@@ -36,7 +37,7 @@ | |||
port keystone_settings["admin_port"] | |||
auth register_auth_hash | |||
user_name keystone_settings["service_user"] | |||
tenant_name keystone_settings["service_tenant"] | |||
project_name keystone_settings['service_tenant'] |
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.
Style/StringLiterals: Prefer double-quoted strings unless you need single quotes to avoid extra backslashes for escaping. (https://github.com/SUSE/style-guides/blob/master/Ruby.md#stylestringliterals)
@@ -25,7 +26,7 @@ | |||
auth register_auth_hash | |||
user_name keystone_settings["service_user"] | |||
user_password keystone_settings["service_password"] | |||
tenant_name keystone_settings["service_tenant"] | |||
project_name keystone_settings['service_tenant'] |
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.
Style/StringLiterals: Prefer double-quoted strings unless you need single quotes to avoid extra backslashes for escaping. (https://github.com/SUSE/style-guides/blob/master/Ruby.md#stylestringliterals)
Needed after crowbar-openstack commit 8774f1a509 Use keystone v3 in config auth urls (SCRD-781)
SES5 only supports this
@@ -187,3 +200,37 @@ | |||
end | |||
end | |||
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.
Layout/EmptyLines: Extra blank line detected. (https://github.com/bbatsov/ruby-style-guide#two-or-more-empty-lines)
got a bit further now. I was able to adapt radosgw recipes to keystonev3
|
OK, that's weird. You didn't change anything related to mon keyring creation AFAICT, so why are those keyring files inaccessible? |
maybe the added package lines did something unexpected or something between SES4 and 5 packaging changed. |
I don't think this failure can be due to packaging changes -- that keyring file is created by the ceph barclamp during initial mon creation: crowbar-ceph/chef/cookbooks/ceph/recipes/mon.rb Lines 46 to 122 in 0a96245
It should have been created by one of the three |
Deploy it after the admin keyring creation.
Hi @bmwiedemann, any update on this one? |
No, I was busy working on other parts and dont know how to continue here. Feel free to play around and improve this PR. |
ceph playground is open again: http://crowbar.vi16.cloud.suse.de/crowbar/ceph/1.0/proposals/default |
No description provided.