4ba6bc315e
Revert I3aaf8ced1ac406069f2d6e3b52b8d59eddda7eac to fix a bug where deployments not using OVS+DVR contain unnecessary group mappings that are filtered out within the Neutron role. Instead, we stop adding these services to the compute host groups by default, and conditionally add them when DVR is selected as the Neutron plugin. Closes-Bug: #1645979 Change-Id: I543d1b5d3d50b6e7936605f436805d2f0ad9b3e9
103 lines
2.3 KiB
YAML
103 lines
2.3 KiB
YAML
---
|
|
# Copyright 2014, Rackspace US, Inc.
|
|
#
|
|
# 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.
|
|
|
|
component_skel:
|
|
nova_api_metadata:
|
|
belongs_to:
|
|
- nova_all
|
|
nova_api_os_compute:
|
|
belongs_to:
|
|
- nova_all
|
|
nova_compute:
|
|
belongs_to:
|
|
- nova_all
|
|
nova_conductor:
|
|
belongs_to:
|
|
- nova_all
|
|
nova_scheduler:
|
|
belongs_to:
|
|
- nova_all
|
|
nova_console:
|
|
belongs_to:
|
|
- nova_all
|
|
|
|
|
|
container_skel:
|
|
nova_api_metadata_container:
|
|
belongs_to:
|
|
- compute-infra_containers
|
|
- os-infra_containers
|
|
contains:
|
|
- nova_api_metadata
|
|
properties:
|
|
service_name: nova
|
|
nova_api_os_compute_container:
|
|
belongs_to:
|
|
- compute-infra_containers
|
|
- os-infra_containers
|
|
contains:
|
|
- nova_api_os_compute
|
|
properties:
|
|
service_name: nova
|
|
nova_compute_container:
|
|
belongs_to:
|
|
- compute_containers
|
|
contains:
|
|
- neutron_linuxbridge_agent
|
|
- neutron_openvswitch_agent
|
|
- nova_compute
|
|
properties:
|
|
is_metal: true
|
|
service_name: nova
|
|
nova_conductor_container:
|
|
belongs_to:
|
|
- compute-infra_containers
|
|
- os-infra_containers
|
|
contains:
|
|
- nova_conductor
|
|
properties:
|
|
service_name: nova
|
|
nova_scheduler_container:
|
|
belongs_to:
|
|
- compute-infra_containers
|
|
- os-infra_containers
|
|
contains:
|
|
- nova_scheduler
|
|
properties:
|
|
service_name: nova
|
|
nova_console_container:
|
|
belongs_to:
|
|
- compute-infra_containers
|
|
- os-infra_containers
|
|
contains:
|
|
- nova_console
|
|
properties:
|
|
service_name: nova
|
|
|
|
|
|
physical_skel:
|
|
compute-infra_containers:
|
|
belongs_to:
|
|
- all_containers
|
|
compute-infra_hosts:
|
|
belongs_to:
|
|
- hosts
|
|
compute_containers:
|
|
belongs_to:
|
|
- all_containers
|
|
compute_hosts:
|
|
belongs_to:
|
|
- hosts
|