From 6c9bf1efbd13807d831d7dcb1bd21bfff906a13c Mon Sep 17 00:00:00 2001 From: Slawek Kaplonski Date: Wed, 27 Oct 2021 16:45:03 +0200 Subject: [PATCH] Remove functions to enable Neutron's placement integration Those functions were part of the neutron devstack plugin but we discussed it during last PTG [1] and decided to move to the Devstack repo as plugins which are used by e.g. CI jobs which are defined outside of the neutron repository. Placement integration is used e.g. in the tempest-slow job which is defined in tempest and used by many different OpenStack projects. [1] https://etherpad.opendev.org/p/neutron-yoga-ptg#L142 Depends-On: https://review.opendev.org/c/openstack/devstack/+/815682 Change-Id: I72e2c4c55a3c40e2a3c491fe66c05b659b76e349 --- devstack/lib/placement | 19 ------------------- devstack/plugin.sh | 4 ---- 2 files changed, 23 deletions(-) delete mode 100644 devstack/lib/placement diff --git a/devstack/lib/placement b/devstack/lib/placement deleted file mode 100644 index 737c7e0d690..00000000000 --- a/devstack/lib/placement +++ /dev/null @@ -1,19 +0,0 @@ -function configure_placement_service_plugin { - neutron_service_plugin_class_add "placement" -} - -function configure_placement_neutron { - iniset $NEUTRON_CONF placement auth_type "$NEUTRON_PLACEMENT_AUTH_TYPE" - iniset $NEUTRON_CONF placement auth_url "$KEYSTONE_SERVICE_URI" - iniset $NEUTRON_CONF placement username "$NEUTRON_PLACEMENT_USERNAME" - iniset $NEUTRON_CONF placement password "$SERVICE_PASSWORD" - iniset $NEUTRON_CONF placement user_domain_name "$SERVICE_DOMAIN_NAME" - iniset $NEUTRON_CONF placement project_name "$SERVICE_TENANT_NAME" - iniset $NEUTRON_CONF placement project_domain_name "$SERVICE_DOMAIN_NAME" - iniset $NEUTRON_CONF placement region_name "$REGION_NAME" -} - -function configure_placement_extension { - configure_placement_service_plugin - configure_placement_neutron -} diff --git a/devstack/plugin.sh b/devstack/plugin.sh index 12fed01cd6d..156e3503974 100644 --- a/devstack/plugin.sh +++ b/devstack/plugin.sh @@ -11,7 +11,6 @@ source $LIBDIR/ml2 source $LIBDIR/network_segment_range source $LIBDIR/qos source $LIBDIR/segments -source $LIBDIR/placement source $LIBDIR/log source $LIBDIR/fip_port_forwarding source $LIBDIR/uplink_status_propagation @@ -57,9 +56,6 @@ if [[ "$1" == "stack" ]]; then if is_service_enabled q-qos neutron-qos; then configure_qos fi - if is_service_enabled q-placement neutron-placement; then - configure_placement_extension - fi if is_service_enabled q-log neutron-log; then configure_log fi