openstack/kolla-ansible
Code Issues Proposed changes

Merge "remove obsolete configurations"

Browse Source
This commit is contained in:
Zuul 2020-08-24 11:22:32 +00:00 committed by Gerrit Code Review
commit 72fd444e31
4 changed files with 3 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
ansible/group_vars/all.yml
View File

@ -66,9 +66,6 @@ container_proxy:
# to the api_interface. Allow the bind address to be an override. # to the api_interface. Allow the bind address to be an override.
api_interface_address: "{{ 'api' | kolla_address }}" api_interface_address: "{{ 'api' | kolla_address }}"
# This is used to get the ip corresponding to the storage_interface.
storage_interface_address: "{{ 'storage' | kolla_address }}"
################ ################
# Chrony options # Chrony options
################ ################
@ -201,7 +198,6 @@ neutron_external_interface: "eth1"
kolla_external_vip_interface: "{{ network_interface }}" kolla_external_vip_interface: "{{ network_interface }}"
api_interface: "{{ network_interface }}" api_interface: "{{ network_interface }}"
storage_interface: "{{ network_interface }}" storage_interface: "{{ network_interface }}"
cluster_interface: "{{ network_interface }}"
swift_storage_interface: "{{ storage_interface }}" swift_storage_interface: "{{ storage_interface }}"
swift_replication_interface: "{{ swift_storage_interface }}" swift_replication_interface: "{{ swift_storage_interface }}"
migration_interface: "{{ api_interface }}" migration_interface: "{{ api_interface }}"
@ -215,7 +211,6 @@ dns_interface: "{{ network_interface }}"
network_address_family: "ipv4" network_address_family: "ipv4"
api_address_family: "{{ network_address_family }}" api_address_family: "{{ network_address_family }}"
storage_address_family: "{{ network_address_family }}" storage_address_family: "{{ network_address_family }}"
cluster_address_family: "{{ network_address_family }}"
swift_storage_address_family: "{{ storage_address_family }}" swift_storage_address_family: "{{ storage_address_family }}"
swift_replication_address_family: "{{ swift_storage_address_family }}" swift_replication_address_family: "{{ swift_storage_address_family }}"
migration_address_family: "{{ api_address_family }}" migration_address_family: "{{ api_address_family }}"

12
doc/source/admin/production-architecture-guide.rst
View File

@ -54,15 +54,9 @@ In Kolla operators should configure following network interfaces:
``kolla_enable_tls_external`` is set to yes. Defaults to ``kolla_enable_tls_external`` is set to yes. Defaults to
``network_interface``. ``network_interface``.
* ``storage_interface`` - This is the interface that is used by virtual * ``storage_interface`` - This is the interface that is used by Swift.
machines to communicate to Ceph. This can be heavily utilized so it's This can be heavily utilized so it's recommended to use a high speed
recommended to use a high speed network fabric. Defaults to network fabric. Defaults to ``network_interface``.
``network_interface``.
* ``cluster_interface`` - This is another interface used by Ceph. It's used for
data replication. It can be heavily utilized also and if it becomes a
bottleneck it can affect data consistency and performance of whole cluster.
Defaults to ``network_interface``.
* ``swift_storage_interface`` - This interface is used by Swift for storage * ``swift_storage_interface`` - This interface is used by Swift for storage
access traffic. This can be heavily utilized so it's recommended to use access traffic. This can be heavily utilized so it's recommended to use

2
etc/kolla/globals.yml
View File

@ -104,7 +104,6 @@
#kolla_external_vip_interface: "{{ network_interface }}" #kolla_external_vip_interface: "{{ network_interface }}"
#api_interface: "{{ network_interface }}" #api_interface: "{{ network_interface }}"
#storage_interface: "{{ network_interface }}" #storage_interface: "{{ network_interface }}"
#cluster_interface: "{{ network_interface }}"
#swift_storage_interface: "{{ storage_interface }}" #swift_storage_interface: "{{ storage_interface }}"
#swift_replication_interface: "{{ swift_storage_interface }}" #swift_replication_interface: "{{ swift_storage_interface }}"
#tunnel_interface: "{{ network_interface }}" #tunnel_interface: "{{ network_interface }}"
@ -116,7 +115,6 @@
#network_address_family: "ipv4" #network_address_family: "ipv4"
#api_address_family: "{{ network_address_family }}" #api_address_family: "{{ network_address_family }}"
#storage_address_family: "{{ network_address_family }}" #storage_address_family: "{{ network_address_family }}"
#cluster_address_family: "{{ network_address_family }}"
#swift_storage_address_family: "{{ storage_address_family }}" #swift_storage_address_family: "{{ storage_address_family }}"
#swift_replication_address_family: "{{ swift_storage_address_family }}" #swift_replication_address_family: "{{ swift_storage_address_family }}"
#migration_address_family: "{{ api_address_family }}" #migration_address_family: "{{ api_address_family }}"

2
tools/validate-all-file.py
View File

@ -43,7 +43,6 @@ YAML_EXCLUDE_PATTERNS = ['.tox', '.testrepository', '.git',
KOLLA_NETWORKS = [ KOLLA_NETWORKS = [
'api', 'api',
'storage', 'storage',
'cluster',
'swift_storage', 'swift_storage',
'swift_replication', 'swift_replication',
'migration', 'migration',
@ -124,7 +123,6 @@ def check_json_j2():
context = { context = {
'hostvars': hostvars(), 'hostvars': hostvars(),
'groups': groups(), 'groups': groups(),
'cluster_interface': 'cluster_interface',
'storage_interface': 'storage_interface', 'storage_interface': 'storage_interface',
'inventory_hostname': 'hostname' 'inventory_hostname': 'hostname'
} }