diff --git a/anvil/components/cinder_client.py b/anvil/components/cinder_client.py deleted file mode 100644 index 4baeb458..00000000 --- a/anvil/components/cinder_client.py +++ /dev/null @@ -1,29 +0,0 @@ -# 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 - - -class CinderClientUninstaller(comp.PythonUninstallComponent): - pass - - -class CinderClientInstaller(comp.PythonInstallComponent): - pass - - -class CinderClientRuntime(comp.EmptyRuntime): - pass diff --git a/anvil/components/glance_client.py b/anvil/components/glance_client.py index e8bdd164..a826a5b1 100644 --- a/anvil/components/glance_client.py +++ b/anvil/components/glance_client.py @@ -17,10 +17,6 @@ from anvil import components as comp -class GlanceClientUninstaller(comp.PythonUninstallComponent): - pass - - class GlanceClientInstaller(comp.PythonInstallComponent): def _filter_pip_requires_line(self, fn, line): if line.lower().find('keystoneclient') != -1: @@ -28,10 +24,6 @@ class GlanceClientInstaller(comp.PythonInstallComponent): return line -class GlanceClientRuntime(comp.EmptyRuntime): - pass - - class GlanceClientTester(comp.PythonTestingComponent): def _use_run_tests(self): return False diff --git a/anvil/components/keystone_client.py b/anvil/components/keystone_client.py deleted file mode 100644 index 9a9563f7..00000000 --- a/anvil/components/keystone_client.py +++ /dev/null @@ -1,29 +0,0 @@ -# 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 - - -class KeyStoneClientUninstaller(comp.PythonUninstallComponent): - pass - - -class KeyStoneClientInstaller(comp.PythonInstallComponent): - pass - - -class KeyStoneClientRuntime(comp.EmptyRuntime): - pass diff --git a/anvil/components/nova_client.py b/anvil/components/nova_client.py deleted file mode 100644 index e8cafb58..00000000 --- a/anvil/components/nova_client.py +++ /dev/null @@ -1,29 +0,0 @@ -# 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 - - -class NovaClientUninstaller(comp.PythonUninstallComponent): - pass - - -class NovaClientInstaller(comp.PythonInstallComponent): - pass - - -class NovaClientRuntime(comp.EmptyRuntime): - pass diff --git a/anvil/components/openstack_client.py b/anvil/components/openstack_client.py index 12457422..6b5e656f 100644 --- a/anvil/components/openstack_client.py +++ b/anvil/components/openstack_client.py @@ -15,13 +15,6 @@ # under the License. from anvil import components as comp -from anvil import log as logging - -LOG = logging.getLogger(__name__) - - -class OpenStackClientUninstaller(comp.PythonUninstallComponent): - pass class OpenStackClientInstaller(comp.PythonInstallComponent): @@ -35,10 +28,6 @@ class OpenStackClientInstaller(comp.PythonInstallComponent): return line -class OpenStackClientRuntime(comp.EmptyRuntime): - pass - - class OpenStackClientTester(comp.PythonTestingComponent): def _use_run_tests(self): return False diff --git a/anvil/components/quantum_client.py b/anvil/components/quantum_client.py deleted file mode 100644 index 58f41a1c..00000000 --- a/anvil/components/quantum_client.py +++ /dev/null @@ -1,29 +0,0 @@ -# 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 - - -class QuantumClientUninstaller(comp.PythonUninstallComponent): - pass - - -class QuantumClientInstaller(comp.PythonInstallComponent): - pass - - -class QuantumClientRuntime(comp.EmptyRuntime): - pass diff --git a/anvil/components/swift_client.py b/anvil/components/swift_client.py index 56ede5bb..27e830d3 100644 --- a/anvil/components/swift_client.py +++ b/anvil/components/swift_client.py @@ -17,16 +17,8 @@ from anvil import components as comp -class SwiftClientUninstaller(comp.PythonUninstallComponent): - pass - - class SwiftClientInstaller(comp.PythonInstallComponent): def _filter_pip_requires_line(self, fn, line): if line.lower().find('keystoneclient') != -1: return None return line - - -class SwiftClientRuntime(comp.EmptyRuntime): - pass diff --git a/conf/distros/rhel.yaml b/conf/distros/rhel.yaml index 5a8cc6bb..caa09490 100644 --- a/conf/distros/rhel.yaml +++ b/conf/distros/rhel.yaml @@ -50,28 +50,28 @@ commands: components: cinder-client: action_classes: - install: anvil.components.cinder_client:CinderClientInstaller - running: anvil.components.cinder_client:CinderClientRuntime - uninstall: anvil.components.cinder_client:CinderClientUninstaller - test: anvil.components:PythonTestingComponent + install: anvil.components:PythonInstallComponent package: anvil.packaging.rpm:PythonPackager + running: anvil.components:EmptyRuntime + test: anvil.components:PythonTestingComponent + uninstall: anvil.components:PythonUninstallComponent db: action_classes: install: anvil.distros.rhel:DBInstaller - running: anvil.components.db:DBRuntime - uninstall: anvil.components.db:DBUninstaller - test: anvil.components:EmptyTestingComponent package: anvil.packaging.rpm:DependencyPackager + running: anvil.components.db:DBRuntime + test: anvil.components:EmptyTestingComponent + uninstall: anvil.components.db:DBUninstaller packages: - name: mysql - name: mysql-server general: action_classes: install: anvil.components.pkglist:Installer - running: anvil.components:EmptyRuntime - uninstall: anvil.components.pkglist:Uninstaller - test: anvil.components:EmptyTestingComponent package: anvil.packaging.rpm:DependencyPackager + running: anvil.components:EmptyRuntime + test: anvil.components:EmptyTestingComponent + uninstall: anvil.components.pkglist:Uninstaller packages: # Shared system packages - name: coreutils @@ -249,10 +249,10 @@ components: glance: action_classes: install: anvil.components.glance:GlanceInstaller - running: anvil.components.glance:GlanceRuntime - uninstall: anvil.components.glance:GlanceUninstaller - test: anvil.components.glance:GlanceTester package: anvil.packaging.rpm:PythonPackager + running: anvil.components.glance:GlanceRuntime + test: anvil.components.glance:GlanceTester + uninstall: anvil.components.glance:GlanceUninstaller # When parsing 'tools/pip-requires' and # 'tools/test-requires' (if they exist) # the following map will be used to translate names @@ -278,10 +278,10 @@ components: glance-client: action_classes: install: anvil.components.glance_client:GlanceClientInstaller - running: anvil.components.glance_client:GlanceClientRuntime - uninstall: anvil.components.glance_client:GlanceClientUninstaller - test: anvil.components.glance_client:GlanceClientTester package: anvil.packaging.rpm:PythonPackager + running: anvil.components:EmptyRuntime + test: anvil.components.glance_client:GlanceClientTester + uninstall: anvil.components:PythonUninstallComponent pips: - name: nosexcover - name: setuptools-git @@ -290,10 +290,10 @@ components: horizon: action_classes: install: anvil.distros.rhel:HorizonInstaller - running: anvil.components.horizon:HorizonRuntime - uninstall: anvil.components.horizon:HorizonUninstaller - test: anvil.components:PythonTestingComponent package: anvil.packaging.rpm:PythonPackager + running: anvil.components.horizon:HorizonRuntime + test: anvil.components:PythonTestingComponent + uninstall: anvil.components.horizon:HorizonUninstaller pip_to_package: - name: pytz package: @@ -315,10 +315,10 @@ components: keystone: action_classes: install: anvil.components.keystone:KeystoneInstaller - running: anvil.components.keystone:KeystoneRuntime - uninstall: anvil.components.keystone:KeystoneUninstaller - test: anvil.components.keystone:KeystoneTester package: anvil.packaging.rpm:PythonPackager + running: anvil.components.keystone:KeystoneRuntime + test: anvil.components.keystone:KeystoneTester + uninstall: anvil.components.keystone:KeystoneUninstaller packages: - name: MySQL-python pip_to_package: @@ -332,18 +332,18 @@ components: - name: webtest # This version in package form conflicts with webob1.0 keystone-client: action_classes: - install: anvil.components.keystone_client:KeyStoneClientInstaller - running: anvil.components.keystone_client:KeyStoneClientRuntime - uninstall: anvil.components.keystone_client:KeyStoneClientUninstaller - test: anvil.components:PythonTestingComponent + install: anvil.components:PythonInstallComponent package: anvil.packaging.rpm:PythonPackager + running: anvil.components:EmptyRuntime + test: anvil.components:PythonTestingComponent + uninstall: anvil.components:PythonUninstallComponent nova: action_classes: install: anvil.distros.rhel:NovaInstaller - running: anvil.components.nova:NovaRuntime - uninstall: anvil.components.nova:NovaUninstaller - test: anvil.components.nova:NovaTester package: anvil.packaging.rpm:PythonPackager + running: anvil.components.nova:NovaRuntime + test: anvil.components.nova:NovaTester + uninstall: anvil.components.nova:NovaUninstaller packages: - name: MySQL-python - name: dnsmasq @@ -415,27 +415,27 @@ components: removable: false nova-client: action_classes: - install: anvil.components.nova_client:NovaClientInstaller - running: anvil.components.nova_client:NovaClientRuntime - uninstall: anvil.components.nova_client:NovaClientUninstaller - test: anvil.components:PythonTestingComponent + install: anvil.components:PythonInstallComponent package: anvil.packaging.rpm:PythonPackager + running: anvil.components:EmptyRuntime + test: anvil.components:PythonTestingComponent + uninstall: anvil.components:PythonUninstallComponent no-vnc: action_classes: install: anvil.components.novnc:NoVNCInstaller - running: anvil.components.novnc:NoVNCRuntime - uninstall: anvil.components.novnc:NoVNCUninstaller - test: anvil.components:EmptyTestingComponent package: anvil.components:EmptyPackagingComponent + running: anvil.components.novnc:NoVNCRuntime + test: anvil.components:EmptyTestingComponent + uninstall: anvil.components.novnc:NoVNCUninstaller packages: - name: python-websockify openstack-client: action_classes: install: anvil.components.openstack_client:OpenStackClientInstaller - running: anvil.components.openstack_client:OpenStackClientRuntime - uninstall: anvil.components.openstack_client:OpenStackClientUninstaller - test: anvil.components.openstack_client:OpenStackClientTester package: anvil.packaging.rpm:PythonPackager + running: anvil.components:EmptyRuntime + test: anvil.components.openstack_client:OpenStackClientTester + uninstall: anvil.components:PythonUninstallComponent pips: - name: cliff pip_to_package: @@ -444,21 +444,21 @@ components: name: python-keyring quantum-client: action_classes: - install: anvil.components.quantum_client:QuantumClientInstaller - running: anvil.components.quantum_client:QuantumClientRuntime - uninstall: anvil.components.quantum_client:QuantumClientUninstaller - test: anvil.components:PythonTestingComponent + install: anvil.components:PythonInstallComponent package: anvil.packaging.rpm:PythonPackager + running: anvil.components:EmptyRuntime + test: anvil.components:PythonTestingComponent + uninstall: anvil.components:PythonUninstallComponent pips: - name: cliff - name: cliff-tablib rabbit-mq: action_classes: install: anvil.components.rabbit:RabbitInstaller - running: anvil.distros.rhel:RabbitRuntime - uninstall: anvil.components.rabbit:RabbitUninstaller - test: anvil.components:EmptyTestingComponent package: anvil.packaging.rpm:DependencyPackager + running: anvil.distros.rhel:RabbitRuntime + test: anvil.components:EmptyTestingComponent + uninstall: anvil.components.rabbit:RabbitUninstaller packages: - name: rabbitmq-server pre-install: @@ -477,9 +477,9 @@ components: swift-client: action_classes: install: anvil.components.swift_client:SwiftClientInstaller - running: anvil.components.swift_client:SwiftClientRuntime - uninstall: anvil.components.swift_client:SwiftClientUninstaller - test: anvil.components:PythonTestingComponent package: anvil.packaging.rpm:PythonPackager + running: anvil.components:EmptyRuntime + test: anvil.components:PythonTestingComponent + uninstall: anvil.components:PythonUninstallComponent ...