Mike Kolesnik has uploaded a new change for review. Change subject: openstack: neutron: renamed quantum to neutron ......................................................................
openstack: neutron: renamed quantum to neutron Renamed quantum to neutron in all references to packages and configuration files in order to support the new naming scheme that the OpenStack Networking project uses. Bug-Url: https://bugzilla.redhat.com/1032890 Change-Id: Ia0629b2f3693f89bfd5fa1bbe16f2f029617b3d9 Signed-off-by: Mike Kolesnik <[email protected]> --- M src/ovirt_host_deploy/constants.py M src/plugins/ovirt-host-deploy/openstack/neutron.py M src/plugins/ovirt-host-deploy/openstack/neutron_linuxbridge.py M src/plugins/ovirt-host-deploy/openstack/neutron_openvswitch.py 4 files changed, 12 insertions(+), 12 deletions(-) git pull ssh://gerrit.ovirt.org:29418/ovirt-host-deploy refs/changes/94/21494/1 diff --git a/src/ovirt_host_deploy/constants.py b/src/ovirt_host_deploy/constants.py index acc8ca1..eaf1fe1 100644 --- a/src/ovirt_host_deploy/constants.py +++ b/src/ovirt_host_deploy/constants.py @@ -53,12 +53,12 @@ HOOKS_PLUGIN_HOOKS_DIR = 'hooks.d' HOOKS_PLUGIN_PACKAGES_DIR = 'packages.d' - OPENSTACK_NEUTRON_CONFIG = '/etc/quantum/quantum.conf' - OPENSTACK_NEUTRON_PLUGIN_CONFIG = '/etc/quantum/plugin.ini' + OPENSTACK_NEUTRON_CONFIG = '/etc/neutron/neutron.conf' + OPENSTACK_NEUTRON_PLUGIN_CONFIG = '/etc/neutron/plugin.ini' OPENSTACK_NEUTRON_LINUXBRIDGE_CONFIG = \ - '/etc/quantum/plugins/linuxbridge/linuxbridge_conf.ini' + '/etc/neutron/plugins/linuxbridge/linuxbridge_conf.ini' OPENSTACK_NEUTRON_OPENVSWITCH_CONFIG = \ - '/etc/quantum/plugins/openvswitch/ovs_quantum_plugin.ini' + '/etc/neutron/plugins/openvswitch/ovs_neutron_plugin.ini' @util.export diff --git a/src/plugins/ovirt-host-deploy/openstack/neutron.py b/src/plugins/ovirt-host-deploy/openstack/neutron.py index 769b090..cc25fae 100644 --- a/src/plugins/ovirt-host-deploy/openstack/neutron.py +++ b/src/plugins/ovirt-host-deploy/openstack/neutron.py @@ -78,7 +78,7 @@ condition=lambda self: self._enabled, ) def _packages(self): - self.packager.installUpdate(('openstack-quantum',)) + self.packager.installUpdate(('openstack-neutron',)) @plugin.event( stage=plugin.Stages.STAGE_MISC, diff --git a/src/plugins/ovirt-host-deploy/openstack/neutron_linuxbridge.py b/src/plugins/ovirt-host-deploy/openstack/neutron_linuxbridge.py index 5a7fadd..65b5af2 100644 --- a/src/plugins/ovirt-host-deploy/openstack/neutron_linuxbridge.py +++ b/src/plugins/ovirt-host-deploy/openstack/neutron_linuxbridge.py @@ -83,7 +83,7 @@ def _packages(self): self.packager.installUpdate( ( - 'openstack-quantum-linuxbridge', + 'openstack-neutron-linuxbridge', 'vdsm-hook-openstacknet', ), ) @@ -152,8 +152,8 @@ def _closeup(self): self.logger.info(_('Starting neutron linuxbridge plugin')) for state in (False, True): - self.services.state('quantum-linuxbridge-agent', state) - self.services.startup('quantum-linuxbridge-agent', True) + self.services.state('neutron-linuxbridge-agent', state) + self.services.startup('neutron-linuxbridge-agent', True) # vim: expandtab tabstop=4 shiftwidth=4 diff --git a/src/plugins/ovirt-host-deploy/openstack/neutron_openvswitch.py b/src/plugins/ovirt-host-deploy/openstack/neutron_openvswitch.py index d86cbde..a23043d 100644 --- a/src/plugins/ovirt-host-deploy/openstack/neutron_openvswitch.py +++ b/src/plugins/ovirt-host-deploy/openstack/neutron_openvswitch.py @@ -115,7 +115,7 @@ def _packages(self): self.packager.installUpdate( ( - 'openstack-quantum-openvswitch', + 'openstack-neutron-openvswitch', 'vdsm-hook-openstacknet', ), ) @@ -207,9 +207,9 @@ def _closeup(self): self.logger.info(_('Starting neutron openvswitch plugin')) for state in (False, True): - self.services.state('quantum-openvswitch-agent', state) - self.services.startup('quantum-openvswitch-agent', True) - self.services.startup('quantum-ovs-cleanup', True) + self.services.state('neutron-openvswitch-agent', state) + self.services.startup('neutron-openvswitch-agent', True) + self.services.startup('neutron-ovs-cleanup', True) self.services.startup('openvswitch', True) -- To view, visit http://gerrit.ovirt.org/21494 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Ia0629b2f3693f89bfd5fa1bbe16f2f029617b3d9 Gerrit-PatchSet: 1 Gerrit-Project: ovirt-host-deploy Gerrit-Branch: ovirt-host-deploy-1.1 Gerrit-Owner: Mike Kolesnik <[email protected]> _______________________________________________ Engine-patches mailing list [email protected] http://lists.ovirt.org/mailman/listinfo/engine-patches
