From d588856880ea232d9a56e3533fe7b2c75eca7bd7 Mon Sep 17 00:00:00 2001 From: Dmitriy Rabotyagov Date: Fri, 8 Mar 2024 15:10:52 +0100 Subject: [PATCH] Apply ironic virt_type only for ironic_compute group With current inventory state, ironic_compute group is not the same as ironic-compute_hosts, since latter does also include hosts, on which ironic_compute LXC container resides in LXC scenario. For example in AIO LXC, 'ironic-compute_hosts' includes aio1, while ironic_compute - aio1_ironic_compute_container-5fd060b3. This results in setting `nova_virt_type` for proper nova-compute, that resides on AIO breaking it. Change-Id: I47b2e9af86b5dceafe68c7e56e149a8b34c30439 --- inventory/group_vars/ironic-compute_hosts.yml | 16 ---------------- inventory/group_vars/ironic_compute.yml | 17 ++++++++++++++++- 2 files changed, 16 insertions(+), 17 deletions(-) delete mode 100644 inventory/group_vars/ironic-compute_hosts.yml mode change 120000 => 100644 inventory/group_vars/ironic_compute.yml diff --git a/inventory/group_vars/ironic-compute_hosts.yml b/inventory/group_vars/ironic-compute_hosts.yml deleted file mode 100644 index 8a54bf63dd..0000000000 --- a/inventory/group_vars/ironic-compute_hosts.yml +++ /dev/null @@ -1,16 +0,0 @@ ---- -# Copyright 2017, 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. - -nova_virt_type: ironic diff --git a/inventory/group_vars/ironic_compute.yml b/inventory/group_vars/ironic_compute.yml deleted file mode 120000 index 6d8aae380e..0000000000 --- a/inventory/group_vars/ironic_compute.yml +++ /dev/null @@ -1 +0,0 @@ -ironic-compute_hosts.yml \ No newline at end of file diff --git a/inventory/group_vars/ironic_compute.yml b/inventory/group_vars/ironic_compute.yml new file mode 100644 index 0000000000..8a54bf63dd --- /dev/null +++ b/inventory/group_vars/ironic_compute.yml @@ -0,0 +1,16 @@ +--- +# Copyright 2017, 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. + +nova_virt_type: ironic