Add the needed oslo.config + oslo.incubator yaml settings.

Keystone, glance and others now dependent on oslo.config as
a pip requirement so we need to make sure we download and
setup that component as well so that it can be located when
installing components that depend on it.

Change-Id: Iab2ee40e18e356daca5590a12c426c536e571508

anvil/components/glance.py

@@ -68,7 +68,11 @@ class GlanceInstaller(comp.PythonInstallComponent):
 
     def _filter_pip_requires(self, fn, lines):
         return [l for l in lines
-                if not utils.has_any(l.lower(), 'swift', 'keystoneclient')]
+                # Take out entries that aren't really always needed or are
+                # resolved/installed by anvil during installation in the first
+                # place..
+                if not utils.has_any(l.lower(), 'swift', 'keystoneclient',
+                                     'oslo.config')]
 
     def post_install(self):
         comp.PythonInstallComponent.post_install(self)

anvil/components/keystone.py

@@ -72,8 +72,12 @@ class KeystoneInstaller(comp.PythonInstallComponent):
 
     def _filter_pip_requires(self, fn, lines):
         return [l for l in lines
-                if not utils.has_any(l.lower(), 'keystoneclient',
-                                     'ldap', 'http://tarballs.openstack.org', 'memcached')]
+                # Take out entries that aren't really always needed or are
+                # resolved/installed by anvil during installation in the first
+                # place..
+                if not utils.has_any(l.lower(), 'keystoneclient', 'oslo.config',
+                                     'ldap', 'http://tarballs.openstack.org',
+                                     'memcached')]
 
     def post_install(self):
         comp.PythonInstallComponent.post_install(self)

anvil/components/keystone_client.py

@@ -0,0 +1,27 @@
+# vim: tabstop=4 shiftwidth=4 softtabstop=4
+
+#    Copyright (C) 2012 Yahoo! Inc. All Rights Reserved.
+#
+#    Licensed under the Apache License, Version 2.0 (the "License"); you may
+#    not use this file except in compliance with the License. You may obtain
+#    a copy of the License at
+#
+#         http://www.apache.org/licenses/LICENSE-2.0
+#
+#    Unless required by applicable law or agreed to in writing, software
+#    distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+#    WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+#    License for the specific language governing permissions and limitations
+#    under the License.
+
+from anvil import components as comp
+from anvil import utils
+
+
+class KeystoneClientInstaller(comp.PythonInstallComponent):
+    def _filter_pip_requires(self, fn, lines):
+        return [l for l in lines
+                # Take out entries that aren't really always needed or are
+                # resolved/installed by anvil during installation in the first
+                # place..
+                if not utils.has_any(l.lower(), 'oslo.config')]

anvil/components/nova.py

@@ -116,8 +116,12 @@ class NovaInstaller(comp.PythonInstallComponent):
 
     def _filter_pip_requires(self, fn, lines):
         return [l for l in lines
+                # Take out entries that aren't really always needed or are
+                # resolved/installed by anvil during installation in the first
+                # place..
                 if not utils.has_any(l.lower(), 'quantumclient',
-                                     'cinder', 'glance', 'ldap', 'keystoneclient')]
+                                     'cinder', 'glance', 'ldap', 'oslo.config',
+                                     'keystoneclient')]
 
     @property
     def env_exports(self):

conf/components/oslo-config.yaml

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

conf/components/oslo-incubator.yaml

@@ -0,0 +1,6 @@
+# Settings for component oslo.config
+---
+
+get_from: "git://github.com/openstack/oslo-incubator.git?branch=master"
+
+...

conf/distros/rhel.yaml

@@ -280,7 +280,7 @@ components:
         -   name: webtest  # This version in package form conflicts with webob1.0
     keystone-client:
         action_classes:
-            install: anvil.components:PythonInstallComponent
+            install: anvil.components.keystone_client:KeystoneClientInstaller
             package: anvil.packaging.rpm:PythonPackager
             running: anvil.components:EmptyRuntime
             test: anvil.components:PythonTestingComponent
@@ -390,6 +390,20 @@ components:
             running: anvil.components:EmptyRuntime
             test: anvil.components.openstack_client:OpenStackClientTester
             uninstall: anvil.components:PythonUninstallComponent
+    oslo-config:
+        action_classes:
+            install: anvil.components:PythonInstallComponent
+            package: anvil.packaging.rpm:PythonPackager
+            running: anvil.components:EmptyRuntime
+            test: anvil.components:PythonTestingComponent
+            uninstall: anvil.components:PythonUninstallComponent
+    oslo-incubator:
+        action_classes:
+            install: anvil.components:PythonInstallComponent
+            package: anvil.packaging.rpm:PythonPackager
+            running: anvil.components:EmptyRuntime
+            test: anvil.components:PythonTestingComponent
+            uninstall: anvil.components:PythonUninstallComponent
     quantum-client:
         action_classes:
             install: anvil.components:PythonInstallComponent

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

@@ -4,6 +4,7 @@ components:
 - general
 - db
 - rabbit-mq
+- oslo-config
 - keystone
 # Client used by many components
 - keystone-client

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

@@ -4,6 +4,7 @@ components:
 - general
 - db
 - rabbit-mq
+- oslo-config
 - keystone
 # Client used by many components
 - keystone-client