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.

Sign up for GitHub

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

Jump to bottom

NFS-Ganesha and iSCSI upgrade #1640

Merged
merged 16 commits into from May 13, 2019
Merged

NFS-Ganesha and iSCSI upgrade #1640

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
16 commits
Select commit Hold shift + click to select a range
4cb592e
cli: fix step long descriptions format
rjfd May 2, 2019
df47f58
cephprocesses: don't wait for rbd-target-api because it might not exist
rjfd May 2, 2019
7da1259
ganesha: keep generating cephx keys with same name as in ses5
rjfd May 2, 2019
2b4bdfd
ganesha: upgrade orchestration
rjfd May 2, 2019
ffecc3b
tests: fix igw test case in cephprocesses module test
rjfd May 2, 2019
048528b
Configure grafana in ceph-dashboard
rjfd May 7, 2019
35a1500
rgw: allow the configuration of radosgw frontend port using the salt …
rjfd May 7, 2019
f8948ba
Improve RGW configuration in ceph-dasboard
rjfd May 7, 2019
84d727f
deepsea state module - state_apply_if implementation
rjfd May 7, 2019
2bdf131
select: sort minion list to maintain the order across calls
rjfd May 7, 2019
d5b7e73
ganesha_upgrade: fix call to pkg.info_installed
rjfd May 7, 2019
1b85f6b
ganesha: use deepsea.state_apply_if to decide ganesha restarts
rjfd May 7, 2019
06e38ac
iSCSI upgrade implementation
rjfd May 7, 2019
38031d2
ipv6: fix iscsi configuration in ceph-dashboard
rjfd May 10, 2019
030e29b
iscsi: set ceph-iscsi logger level to WARNING
rjfd May 10, 2019
f67a9a0
iscsi: only wait for iscsi gateway if it's ceph-iscsi
rjfd May 10, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
2 changes: 2 additions & 0 deletions Makefile
View file
Open in desktop
Expand Up @@ -216,6 +216,8 @@ copy-files:
install -d -m 755 $(DESTDIR)/srv/salt/_modules
install -m 644 srv/salt/_modules/*.py* $(DESTDIR)/srv/salt/_modules/
# state modules
install -d -m 755 $(DESTDIR)/srv/salt/_states
install -m 644 srv/salt/_states/*.py* $(DESTDIR)/srv/salt/_states/
# state files
install -d -m 755 $(DESTDIR)/srv/salt/ceph/admin
install -m 644 srv/salt/ceph/admin/*.sls $(DESTDIR)/srv/salt/ceph/admin/
Expand Down
1 change: 1 addition & 0 deletions cli/monitors/terminal_outputter.py
View file
Open in desktop
Expand Up @@ -361,6 +361,7 @@ def format_desc(desc, width):
"""
Breaks the string into an array of strings of max length width
"""
desc = desc.replace("\n", "")
# list of characters that we will use to split a string in order of
# preference
split_chars = (' ', ',', ')', '(', '/')
Expand Down
2 changes: 2 additions & 0 deletions deepsea.spec.in
View file
Open in desktop
Expand Up @@ -104,6 +104,7 @@ systemctl try-restart salt-api > /dev/null 2>&1 || :
%dir %attr(0755, salt, salt) /srv/pillar/ceph/benchmarks/fio
%dir %attr(0755, salt, salt) /srv/pillar/ceph/benchmarks/templates
%dir /srv/salt/_modules
%dir /srv/salt/_states
%dir /srv/modules
%dir /srv/modules/modules
%dir /srv/modules/runners
Expand Down Expand Up @@ -466,6 +467,7 @@ systemctl try-restart salt-api > /dev/null 2>&1 || :
%config(noreplace) %attr(-, salt, salt) /srv/pillar/ceph/disk_led.sls
%config %attr(-, salt, salt) /srv/pillar/ceph/stack/stack.cfg
/srv/salt/_modules/*.py*
/srv/salt/_states/*.py*
%config /srv/salt/ceph/admin/*.sls
%config /srv/salt/ceph/admin/files/*.j2
%config /srv/salt/ceph/admin/key/*.sls
Expand Down