nix: use packages python-novaclient and python-openstackclient

Signed-off-by: Paul Kroeher <paul.kroeher@cyberus-technology.de>

On-behalf-of: SAP paul.kroeher@sap.com

Author: pkr4711

packages/cinder.nix

@@ -28,6 +28,7 @@
   python-glanceclient,
   python-keystoneclient,
   python-novaclient,
+  python-openstackclient,
   python-swiftclient,
   python3Packages,
   qemu-utils,
@@ -110,6 +111,7 @@ python3Packages.buildPythonPackage rec {
     python-keystoneclient
     python-memcached
     python-novaclient
+    python-openstackclient
     python-swiftclient
     qemu-utils
     rtslib-fb

packages/default.nix

@@ -58,6 +58,7 @@ let
         python-glanceclient
         python-keystoneclient
         python-novaclient
+        python-openstackclient
         python-swiftclient
         taskflow
         tooz
@@ -287,6 +288,7 @@ let
         python-designateclient
         python-neutronclient
         python-novaclient
+        python-openstackclient
         python3Packages
         sqlalchemy
         tooz
@@ -331,6 +333,7 @@ let
         python-cinderclient
         python-glanceclient
         python-neutronclient
+        python-openstackclient
         python3Packages
         sqlalchemy
         tooz
@@ -727,12 +730,23 @@ let
         python3Packages
         ;
     };
-    python-novaclient = python3Packages.python-novaclient.override {
+    python-novaclient = callPackage ./python-novaclient.nix {
       inherit
         keystoneauth1
         oslo-i18n
         oslo-serialization
         oslo-utils
+        python3Packages
+        ;
+    };
+    python-openstackclient = callPackage ./python-openstackclient.nix {
+      inherit
+        openstacksdk
+        osc-lib
+        oslo-i18n
+        python-cinderclient
+        python-keystoneclient
+        python3Packages
         ;
     };
     python-swiftclient = callPackage ./python-swiftclient.nix {

packages/neutron.nix

@@ -36,6 +36,7 @@
   python-designateclient,
   python-neutronclient,
   python-novaclient,
+  python-openstackclient,
   python3Packages,
   sqlalchemy,
   tooz,
@@ -193,6 +194,7 @@ python3Packages.buildPythonPackage rec {
     python-memcached
     python-neutronclient
     python-novaclient
+    python-openstackclient
     requests
     routes
     sqlalchemy

packages/nova.nix

@@ -40,6 +40,7 @@
   python-cinderclient,
   python-glanceclient,
   python-neutronclient,
+  python-openstackclient,
   python3Packages,
   sqlalchemy,
   tooz,
@@ -186,6 +187,7 @@ python3Packages.buildPythonPackage (rec {
     python-glanceclient
     python-memcached
     python-neutronclient
+    python-openstackclient
     pyyaml
     requests
     requests-unixsocket