summary refs log tree commit diff
path: root/nixos/modules/virtualisation/openstack
diff options
context:
space:
mode:
authorAntoine Eiche <lewo@abesis.fr>2016-12-31 09:10:22 +0100
committerAntoine Eiche <lewo@abesis.fr>2016-12-31 09:36:57 +0100
commit49efa083c780cf24a65a90adf0caac4cb70df415 (patch)
tree4b116562d826857b55026fe8029edad129442b2d /nixos/modules/virtualisation/openstack
parent165089f9d7419df1bda1d33ebc8b08a4a9be1c20 (diff)
downloadnixlib-49efa083c780cf24a65a90adf0caac4cb70df415.tar
nixlib-49efa083c780cf24a65a90adf0caac4cb70df415.tar.gz
nixlib-49efa083c780cf24a65a90adf0caac4cb70df415.tar.bz2
nixlib-49efa083c780cf24a65a90adf0caac4cb70df415.tar.lz
nixlib-49efa083c780cf24a65a90adf0caac4cb70df415.tar.xz
nixlib-49efa083c780cf24a65a90adf0caac4cb70df415.tar.zst
nixlib-49efa083c780cf24a65a90adf0caac4cb70df415.zip
nixos/glance: set default glance package
Before, it was overridden in the config section to avoid problem related
to manual generation.
Diffstat (limited to 'nixos/modules/virtualisation/openstack')
-rw-r--r--nixos/modules/virtualisation/openstack/glance.nix6
1 files changed, 1 insertions, 5 deletions
diff --git a/nixos/modules/virtualisation/openstack/glance.nix b/nixos/modules/virtualisation/openstack/glance.nix
index a7baee985b78..4d85718e369c 100644
--- a/nixos/modules/virtualisation/openstack/glance.nix
+++ b/nixos/modules/virtualisation/openstack/glance.nix
@@ -42,6 +42,7 @@ in {
   options.virtualisation.openstack.glance = {
     package = mkOption {
       type = types.package;
+      default = pkgs.glance;
       example = literalExample "pkgs.glance";
       description = ''
         Glance package to use.
@@ -149,11 +150,6 @@ in {
   };
 
   config = mkIf cfg.enable {
-    # Note: when changing the default, make it conditional on
-    # ‘system.stateVersion’ to maintain compatibility with existing
-    # systems!
-    virtualisation.openstack.glance.package = mkDefault pkgs.glance;
-
     users.extraUsers = [{
       name = "glance";
       group = "glance";