Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: NixOS/nixpkgs
base: 542fb7715bc4
Choose a base ref
...
head repository: NixOS/nixpkgs
compare: 60390c81dc88
Choose a head ref
  • 5 commits
  • 3 files changed
  • 2 contributors

Commits on Nov 9, 2019

  1. nixos/ceph: create /etc/ceph and /var/lib/ceph via tmpfiles

    We seem to be relying on those being present during runtime anyways.
    flokli committed Nov 9, 2019
    Copy the full SHA
    64c9c08 View commit details
    Browse the repository at this point in the history
  2. nixos/ceph: run unprivileged, use StateDirectory and tmpfiles, don't …

    …pass extraServiceConfig
    
    Don't pass user and group to ceph, and rely on it to drop ceps, but let
    systemd handle running it as the appropriate user.
    
    This also inlines the extraServiceConfig into the makeService function,
    as we have conditionals depending on daemonType there anyways.
    
    Use StateDirectory to create directories in
    /var/lib/ceph/${daemonType}/${clusterName}-${daemonId}.
    
    There previously was a condition on daemonType being one of mds,mon,rgw
    or mgr. We only instantiate makeServices with these types, and "osd" was
    special.
    In the osd case, test examples suggest it'd be in something like
    /var/lib/ceph/osd/ceph-${cfg.osd0.name} - so it's not special at all,
    but exactly like the pattern for the others.
    
    During initialization, we also need these folders, before the unit is
    started up. Move the mkdir -p commands in the vm tests to the line
    immediately before they're required.
    flokli committed Nov 9, 2019
    Copy the full SHA
    67e0777 View commit details
    Browse the repository at this point in the history
  3. nixos/ceph: use ConditionPathExists to delay ceph daemon start

    This prevents services to be started before they're initialized, and
    renders the `systemd.targets.ceph.wantedBy = lib.mkForce [];` hack in
    the vm tests obsolete - The config now starts up ceph after a reboot,
    too.
    
    Let's take advantage of that, crash all VMs, and boot them up again.
    flokli committed Nov 9, 2019
    Copy the full SHA
    ffd0060 View commit details
    Browse the repository at this point in the history
  4. nixos/ceph: Clarify comments in tests and add source reference for th…

    …e bootstraping method
    lejonet authored and flokli committed Nov 9, 2019
    Copy the full SHA
    1972904 View commit details
    Browse the repository at this point in the history

Commits on Nov 11, 2019

  1. Merge pull request #72603 from flokli/ceph-tmpfiles

    nixos/ceph: run unprivileged, use state directories, handle non-initialized clusters without config switch
    flokli committed Nov 11, 2019
    Copy the full SHA
    60390c8 View commit details
    Browse the repository at this point in the history