Cleanup group_vars

In this patch we're trying to sync up *_service_region and *_package_state
variables for services. We also cleanup service uri variables when they
are not used anywhere, since we're setting them to defaults which is not
necessary and at the same time unexpected for deployers.

Change-Id: Ia676393168cde3cbe8e37fb419ec54c551ec862e

inventory/group_vars/all/designate.yml

@@ -21,5 +21,5 @@ designate_service_project_domain_id: default
 designate_service_user_domain_id: default
 designate_service_region: "{{ service_region }}"
 
-designate_service_adminurl: "http://{{ internal_lb_vip_address }}:9001/v2"
-
+designate_service_adminuri_proto: "{{ openstack_service_adminuri_proto | default(designate_service_proto | default('http')) }}"
+designate_service_adminurl: "{{ designate_service_adminuri_proto }}://{{ internal_lb_vip_address }}:{{ designate_service_port | default('9001') }}/v2"

inventory/group_vars/all/glance.yml

@@ -16,9 +16,10 @@
 # This var is used by glance and ironic
 glance_service_user_name: glance
 
-glance_service_publicurl: "{{ openstack_service_publicuri_proto }}://{{ external_lb_vip_address }}:9292"
-glance_service_internalurl: "{{ openstack_service_internaluri_proto }}://{{ internal_lb_vip_address }}:9292"
-glance_service_adminurl: "{{ openstack_service_adminuri_proto }}://{{ internal_lb_vip_address }}:9292"
+glance_service_port: 9292
+glance_service_internaluri_proto: "{{ openstack_service_internaluri_proto | default(glance_service_proto | default('http')) }}"
+glance_service_internaluri: "{{ glance_service_internaluri_proto }}://{{ internal_lb_vip_address }}:{{ glance_service_port }}"
+glance_service_internalurl: "{{ glance_service_internaluri }}"
 
 # When running RBD or horizon image upload mode is direct allow multiple locations.
 # See https://bugs.launchpad.net/openstack-ansible/+bug/1730722 for more on the

inventory/group_vars/all/octavia.yml

@@ -1,17 +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.
-
-# used by neutron role to specify octavia v1 service url
-octavia_service_internaluri: "http://{{ internal_lb_vip_address }}:9876"

inventory/group_vars/all/panko.yml

@@ -1,15 +0,0 @@
----
-#
-# 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.
-
-panko_service_region: "{{ service_region }}"

inventory/group_vars/aodh_all.yml

@@ -16,9 +16,6 @@
 aodh_service_region: "{{ service_region }}"
 
 aodh_service_in_ldap: "{{ service_ldap_backend_enabled }}"
-aodh_service_publicuri: "{{ openstack_service_publicuri_proto|default(aodh_service_proto) }}://{{ external_lb_vip_address }}:{{ aodh_service_port }}"
-aodh_service_internaluri: "{{ openstack_service_internaluri_proto|default(aodh_service_proto) }}://{{ internal_lb_vip_address }}:{{ aodh_service_port }}"
-aodh_service_adminuri: "{{ openstack_service_adminuri_proto|default(aodh_service_proto) }}://{{ internal_lb_vip_address }}:{{ aodh_service_port }}"
 
 # Ensure that the package state matches the global setting
 aodh_package_state: "{{ package_state }}"

inventory/group_vars/barbican_all.yml

@@ -15,5 +15,6 @@
 
 barbican_service_region: "{{ service_region }}"
 barbican_service_in_ldap: "{{ service_ldap_backend_enabled }}"
+barbican_package_state: "{{ package_state }}"
 barbican_keystone_auth: yes
 barbican_ceilometer_enabled: "{{ (groups['ceilometer_all'] is defined) and (groups['ceilometer_all'] | length > 0) }}"

inventory/group_vars/gnocchi_all.yml

@@ -13,11 +13,6 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-gnocchi_service_port: 8041
-gnocchi_service_proto: http
-gnocchi_service_internaluri_proto: "{{ openstack_service_internaluri_proto | default(gnocchi_service_proto) }}"
-gnocchi_service_internalurl: "{{ gnocchi_service_internaluri_proto }}://{{ internal_lb_vip_address }}:{{ gnocchi_service_port }}"
-
 gnocchi_ssl_external: "{{ openstack_external_ssl }}"
 gnocchi_service_region: "{{ service_region }}"
 

inventory/group_vars/ironic_all.yml

@@ -13,7 +13,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-ironic_service_name: ironic
+ironic_service_region: "{{ service_region }}"
 
 # Ensure that the package state matches the global setting
 ironic_package_state: "{{ package_state }}"

inventory/group_vars/magnum_all.yml

@@ -13,14 +13,6 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-magnum_bind_port: 9511
-magnum_service_proto: http
-magnum_service_publicuri_proto: "{{ openstack_service_publicuri_proto | default(magnum_service_proto) }}"
-magnum_service_publicurl: "{{ magnum_service_publicuri_proto }}://{{ external_lb_vip_address }}:{{ magnum_bind_port }}"
-magnum_service_internaluri_proto: "{{ openstack_service_internaluri_proto | default(magnum_service_proto) }}"
-magnum_service_internalurl: "{{ magnum_service_internaluri_proto }}://{{ internal_lb_vip_address }}:{{ magnum_bind_port }}"
-magnum_service_adminuri_proto: "{{ openstack_service_adminuri_proto | default(magnum_service_proto) }}"
-magnum_service_adminurl: "{{ magnum_service_adminuri_proto }}://{{ internal_lb_vip_address }}:{{ magnum_bind_port }}"
 magnum_service_region: "{{ service_region }}"
 
 # Ensure that the package state matches the global setting

inventory/group_vars/manila_all.yml

@@ -26,15 +26,7 @@ manila_backend_lvm_inuse: "{{ (manila_backends | default({}) | to_json).find('lv
 # manila_backend_rbd_inuse: True if the current host has an rbd backend
 manila_backend_rbd_inuse: "{{ (manila_backends | default({}) | to_json).find('manila.share.drivers.cephfs') != -1 }}"
 
-# V1 api config
-manila_service_publicuri: "{{ openstack_service_publicuri_proto|default(manila_service_proto) }}://{{ external_lb_vip_address }}:{{ manila_service_port }}"
-manila_service_internaluri: "{{ openstack_service_internaluri_proto|default(manila_service_proto) }}://{{ internal_lb_vip_address }}:{{ manila_service_port }}"
-manila_service_adminuri: "{{ openstack_service_adminuri_proto|default(manila_service_proto) }}://{{ internal_lb_vip_address }}:{{ manila_service_port }}"
-
-# V2 api config
-manila_service_v2_publicuri: "{{ openstack_service_publicuri_proto|default(manila_service_proto) }}://{{ external_lb_vip_address }}:{{ manila_service_v2_port }}"
-manila_service_v2_internaluri: "{{ openstack_service_internaluri_proto|default(manila_service_proto) }}://{{ internal_lb_vip_address }}:{{ manila_service_v2_port }}"
-manila_service_v2_adminuri: "{{ openstack_service_adminuri_proto|default(manila_service_proto) }}://{{ internal_lb_vip_address }}:{{ manila_service_v2_port }}"
+manila_package_state: "{{ package_state }}"
 
 # Region
 manila_service_region: "{{ service_region }}"

inventory/group_vars/masakari_all.yml

@@ -14,3 +14,4 @@
 # limitations under the License.
 
 masakari_service_region: "{{ service_region }}"
+masakari_package_state: "{{ package_state }}"

inventory/group_vars/mistral_all.yml

@@ -13,13 +13,5 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-
-mistral_bind_port: 8989
-mistral_service_proto: http
-mistral_service_publicuri_proto: "{{ openstack_service_publicuri_proto | default(mistral_service_proto) }}"
-mistral_service_publicurl: "{{ mistral_service_publicuri_proto }}://{{ external_lb_vip_address }}:{{ mistral_bind_port }}/v2"
-mistral_service_internaluri_proto: "{{ openstack_service_internaluri_proto | default(mistral_service_proto) }}"
-mistral_service_internalurl: "{{ mistral_service_internaluri_proto }}://{{ internal_lb_vip_address }}:{{ mistral_bind_port }}/v2"
-mistral_service_adminuri_proto: "{{ openstack_service_adminuri_proto | default(mistral_service_proto) }}"
-mistral_service_adminurl: "{{ mistral_service_adminuri_proto }}://{{ internal_lb_vip_address }}:{{ mistral_bind_port }}/v2"
+mistral_package_state: "{{ package_state }}"
 mistral_service_region: "{{ service_region }}"

inventory/group_vars/murano_all.yml

@@ -13,14 +13,5 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-murano_service_port: 8082
-murano_service_proto: http
-murano_service_publicuri_proto: "{{ openstack_service_publicuri_proto | default(murano_service_proto) }}"
-murano_service_publicurl: "{{ murano_service_publicuri_proto }}://{{ external_lb_vip_address }}:{{ murano_service_port }}"
-murano_service_internaluri_proto: "{{ openstack_service_internaluri_proto | default(murano_service_proto) }}"
-murano_service_internalurl: "{{ murano_service_internaluri_proto }}://{{ internal_lb_vip_address }}:{{ murano_service_port }}"
-murano_service_adminuri_proto: "{{ openstack_service_adminuri_proto | default(murano_service_proto) }}"
-murano_service_adminurl: "{{ murano_service_adminuri_proto }}://{{ internal_lb_vip_address }}:{{ murano_service_port }}"
+murano_package_state: "{{ package_state }}"
 murano_service_region: "{{ service_region }}"
-
-

inventory/group_vars/nova_all.yml

@@ -13,11 +13,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-nova_service_port: 8774
-nova_service_proto: http
-nova_service_adminuri_proto: "{{ openstack_service_adminuri_proto | default(nova_service_proto) }}"
-nova_service_adminuri: "{{ nova_service_adminuri_proto }}://{{ internal_lb_vip_address }}:{{ nova_service_port }}"
-nova_service_adminurl: "{{ nova_service_adminuri }}/v2.1"
+
 nova_console_type: novnc
 nova_console_agent_enabled: "{{ ansible_architecture != 'aarch64' }}"
 nova_novncproxy_port: 6080

inventory/group_vars/octavia_all.yml

@@ -16,6 +16,5 @@
 # If there are any Ceilometer hosts in the environment, then enable its usage
 octavia_ceilometer_enabled: "{{ (groups['ceilometer_all'] is defined) and (groups['ceilometer_all'] | length > 0) }}"
 
-octavia_service_internalurl: "{{ octavia_service_internaluri }}/v1/%(project_id)s"
-octavia_service_user_name: octavia
 octavia_service_region: "{{ service_region }}"
+octavia_package_state: "{{ package_state }}"

inventory/group_vars/panko_all.yml

@@ -18,7 +18,4 @@ panko_service_publicuri: "{{ openstack_service_publicuri_proto|default(panko_ser
 
 # Ensure that the package state matches the global setting
 panko_package_state: "{{ package_state }}"
-
-# venv fetch configuration
-panko_venv_tag: "{{ venv_tag }}"
-panko_venv_download_url: "{{ venv_base_download_url }}/panko-{{ openstack_release }}-{{ ansible_architecture | lower }}.tgz"
+panko_service_region: "{{ service_region }}"