From 3b325b7dbcc39764b14cd74f682b56caf91713a4 Mon Sep 17 00:00:00 2001 From: Jesse Pretorius Date: Mon, 9 Apr 2018 19:04:29 +0100 Subject: [PATCH] Add nova/ironic/glance cross-service vars to group_vars/all Given that nova implements a compute service for ironic it needs access to some of the vars. This moves the vars out of isolation back into the all space. The same goes for a glance var which ironic needs. While this is not ideal, it is the established pattern and this patch needs to be ported back to Queens. Change-Id: I2f65a0b26e8d46729959d87ae0dafcdba61c619f --- inventory/group_vars/all/glance.yml | 3 +++ inventory/group_vars/all/ironic.yml | 24 ++++++++++++++++++++++++ inventory/group_vars/glance_all.yml | 5 ----- inventory/group_vars/ironic_all.yml | 8 -------- 4 files changed, 27 insertions(+), 13 deletions(-) create mode 100644 inventory/group_vars/all/ironic.yml diff --git a/inventory/group_vars/all/glance.yml b/inventory/group_vars/all/glance.yml index bd39c8fb55..bb828b2d3c 100644 --- a/inventory/group_vars/all/glance.yml +++ b/inventory/group_vars/all/glance.yml @@ -13,6 +13,9 @@ # See the License for the specific language governing permissions and # limitations under the License. +# This var is used by glance and ironic +glance_service_user_name: glance + glance_service_port: 9292 glance_service_proto: http glance_service_publicuri_proto: "{{ openstack_service_publicuri_proto | default(glance_service_proto) }}" diff --git a/inventory/group_vars/all/ironic.yml b/inventory/group_vars/all/ironic.yml new file mode 100644 index 0000000000..cba7d8cde8 --- /dev/null +++ b/inventory/group_vars/all/ironic.yml @@ -0,0 +1,24 @@ +--- +# Copyright 2018, 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. + +# These vars are used for ironic and nova +ironic_keystone_auth_plugin: password +ironic_service_user_name: ironic +ironic_service_project_name: service +ironic_service_proto: http +ironic_service_port: 6385 +ironic_service_adminuri_proto: "{{ openstack_service_adminuri_proto | default(ironic_service_proto) }}" +ironic_service_adminuri: "{{ ironic_service_adminuri_proto }}://{{ internal_lb_vip_address }}:{{ ironic_service_port }}" +ironic_service_adminurl: "{{ ironic_service_adminuri }}/v1" diff --git a/inventory/group_vars/glance_all.yml b/inventory/group_vars/glance_all.yml index fca4ea42e9..7766a83b31 100644 --- a/inventory/group_vars/glance_all.yml +++ b/inventory/group_vars/glance_all.yml @@ -13,11 +13,6 @@ # See the License for the specific language governing permissions and # limitations under the License. -glance_service_user_name: glance - -# These are here rather than in glance_all because -# both the os_ceilometer and os_glance roles require them - # RPC glance_rabbitmq_userid: glance glance_rabbitmq_vhost: /glance diff --git a/inventory/group_vars/ironic_all.yml b/inventory/group_vars/ironic_all.yml index e0a2e416a5..c59cdd669b 100644 --- a/inventory/group_vars/ironic_all.yml +++ b/inventory/group_vars/ironic_all.yml @@ -13,7 +13,6 @@ # See the License for the specific language governing permissions and # limitations under the License. -ironic_keystone_auth_plugin: password ironic_rabbitmq_userid: ironic ironic_rabbitmq_vhost: /ironic ironic_rabbitmq_port: "{{ rabbitmq_port }}" @@ -21,16 +20,9 @@ ironic_rabbitmq_servers: "{{ rabbitmq_servers }}" ironic_rabbitmq_use_ssl: "{{ rabbitmq_use_ssl }}" ironic_rabbitmq_host_group: "{{ rabbitmq_host_group }}" ironic_service_name: ironic -ironic_service_user_name: ironic -ironic_service_proto: http -ironic_service_port: 6385 -ironic_service_project_name: service -ironic_service_adminuri_proto: "{{ openstack_service_adminuri_proto | default(ironic_service_proto) }}" -ironic_service_adminuri: "{{ ironic_service_adminuri_proto }}://{{ internal_lb_vip_address }}:{{ ironic_service_port }}" ironic_galera_database: ironic ironic_galera_user: ironic -ironic_service_adminurl: "{{ ironic_service_adminuri }}/v1" # Ensure that the package state matches the global setting ironic_package_state: "{{ package_state }}"