Merge "Move to using neutron-client instead of quantum-client"

anvil/packaging/base.py

@@ -41,7 +41,7 @@ OPENSTACK_PACKAGES = set([
     "python-glanceclient",
     "python-keystoneclient",
     "python-novaclient",
-    "python-quantumclient",
+    "python-neutronclient",
     "python-swiftclient",
 ])
 

conf/components/neutron-client.yaml

@@ -0,0 +1,6 @@
+# Settings for component neutron-client
+---
+
+get_from: "git://github.com/openstack/python-neutronclient.git?branch=master"
+
+...

conf/components/quantum-client.yaml

@@ -1,6 +0,0 @@
-# Settings for component quantum-client
----
-
-get_from: "git://github.com/openstack/python-quantumclient.git?tag=2.2.3"
-
-...

conf/distros/rhel.yaml

@@ -196,6 +196,13 @@ components:
             test: anvil.components.base_testing:PythonTestingComponent
             coverage: anvil.components.base_testing:PythonTestingComponent
             uninstall: anvil.components.base_install:PkgUninstallComponent
+    neutron-client:
+        action_classes:
+            install: anvil.components.base_install:PythonInstallComponent
+            running: anvil.components.base_runtime:EmptyRuntime
+            test: anvil.components.base_testing:PythonTestingComponent
+            coverage: anvil.components.base_testing:PythonTestingComponent
+            uninstall: anvil.components.base_install:PkgUninstallComponent
     nova:
         action_classes:
             install: anvil.components.nova:NovaInstaller
@@ -270,13 +277,6 @@ components:
             l3-agent: openstack-quantum
             rpc-zmq-receiver: openstack-quantum
             server: openstack-quantum
-    quantum-client:
-        action_classes:
-            install: anvil.components.base_install:PythonInstallComponent
-            running: anvil.components.base_runtime:EmptyRuntime
-            test: anvil.components.base_testing:PythonTestingComponent
-            coverage: anvil.components.base_testing:PythonTestingComponent
-            uninstall: anvil.components.base_install:PkgUninstallComponent
     rabbit-mq:
         action_classes:
             install: anvil.components.rabbit:RabbitInstaller

conf/personas/in-a-box/basic-quantum.yaml

@@ -12,7 +12,7 @@ components:
 # Clients used by nova (+ others)
 - glance-client
 - cinder-client
-- quantum-client
+- neutron-client
 - quantum
 - cinder
 - nova

conf/personas/in-a-box/basic-web.yaml

@@ -12,7 +12,7 @@ components:
 # Clients used by nova (+ others)
 - glance-client
 - cinder-client
-- quantum-client
+- neutron-client
 - swift-client # Seems only needed for horizon?
 - quantum
 - openvswitch

conf/personas/in-a-box/basic.yaml

@@ -13,7 +13,7 @@ components:
 # Clients used by nova (+ others)
 - glance-client
 - cinder-client
-- quantum-client
+- neutron-client
 - nova
 - nova-client
 options: