From 49efa083c780cf24a65a90adf0caac4cb70df415 Mon Sep 17 00:00:00 2001
From: Antoine Eiche <lewo@abesis.fr>
Date: Sat, 31 Dec 2016 09:10:22 +0100
Subject: [PATCH] nixos/glance: set default glance package

Before, it was overridden in the config section to avoid problem related
to manual generation.
---
 nixos/modules/virtualisation/openstack/glance.nix | 6 +-----
 1 file changed, 1 insertion(+), 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";