Merge "multiple: remove duplicated variables between defaults and group vars"

ansible/group_vars/all.yml

@@ -187,7 +187,6 @@ keepalived_virtual_router_id: "51"
 #######################
 # Elasticsearch Options
 #######################
-es_heap_size: "1G"
 elasticsearch_datadir_volume: "elasticsearch"
 
 elasticsearch_internal_endpoint: "{{ internal_protocol }}://{{ elasticsearch_address | put_address_in_context('url') }}:{{ elasticsearch_port }}"
@@ -943,8 +942,6 @@ cinder_backup_mount_options_nfs: ""
 #######################
 # Cloudkitty options
 #######################
-# Valid option is gnocchi
-cloudkitty_collector_backend: "gnocchi"
 # Valid options are 'sqlalchemy' or 'influxdb'. The default value is
 # 'influxdb', which matches the default in Cloudkitty since the Stein release.
 # When the backend is "influxdb", we also enable Influxdb.
@@ -970,7 +967,7 @@ designate_public_endpoint: "{{ public_protocol }}://{{ designate_external_fqdn |
 # Neutron options
 #######################
 neutron_bgp_router_id: "1.1.1.1"
-neutron_bridge_name: "{{ 'br-dvs' if neutron_plugin_agent == 'vmware_dvs' else 'br-ex' }}"
+neutron_bridge_name: "{{ 'br-dvs' if neutron_plugin_agent == 'vmware_dvs' else 'br_dpdk' if enable_ovs_dpdk | bool else 'br-ex' }}"
 # Comma-separated type of enabled ml2 type drivers
 neutron_type_drivers: "flat,vlan,vxlan{% if neutron_plugin_agent == 'ovn' %},geneve{% endif %}"
 # Comma-separated types of tenant networks (should be listed in 'neutron_type_drivers')

ansible/roles/cloudkitty/defaults/main.yml

@@ -127,13 +127,6 @@ cloudkitty_custom_metrics_yaml_file: "metrics.yml"
 ####################
 # Storage backend
 ####################
-# Valid options are 'sqlalchemy', 'influxdb' or 'elasticsearch'. The default value is
-# 'influxdb', which matches the default in Cloudkitty since the Stein release.
-# When the backend is "influxdb" or "elasticsearch", we also enable the required service
-# accordingly.
-# Additionally, we use cloudkitty API v2 for any backend but sqlalchemy.
-cloudkitty_storage_backend: "influxdb"
-
 # InfluxDB retention policy to use (defaults to autogen).
 # cloudkitty_influxdb_retention_policy: "autogen"
 

ansible/roles/designate/defaults/main.yml

@@ -267,13 +267,8 @@ designate_sink_extra_volumes: "{{ designate_extra_volumes }}"
 ####################
 # OpenStack
 ####################
-designate_internal_endpoint: "{{ internal_protocol }}://{{ designate_internal_fqdn | put_address_in_context('url') }}:{{ designate_api_port }}"
-designate_public_endpoint: "{{ public_protocol }}://{{ designate_external_fqdn | put_address_in_context('url') }}:{{ designate_api_port }}"
-
 designate_logging_debug: "{{ openstack_logging_debug }}"
 
-designate_keystone_user: "designate"
-
 openstack_designate_auth: "{{ openstack_auth }}"
 
 

ansible/roles/glance/defaults/main.yml

@@ -208,8 +208,6 @@ glance_store_backends: "{{ glance_backends|selectattr('enabled', 'equalto', true
 
 glance_logging_debug: "{{ openstack_logging_debug }}"
 
-glance_keystone_user: "glance"
-
 openstack_glance_auth: "{{ openstack_auth }}"
 
 ###################

ansible/roles/nova-cell/defaults/main.yml

@@ -448,8 +448,6 @@ openstack_nova_auth: "{{ openstack_auth }}"
 # Set to KOLLA_UNSET to make Kolla unset these in the managed sysctl.conf file.
 nova_compute_host_rp_filter_mode: KOLLA_SKIP
 
-nova_safety_upgrade: "no"
-
 nova_libvirt_port: "{{'16514' if libvirt_tls | bool  else '16509'}}"
 nova_ssh_port: "8022"
 

ansible/roles/nova/defaults/main.yml

@@ -184,8 +184,6 @@ nova_logging_debug: "{{ openstack_logging_debug }}"
 
 openstack_nova_auth: "{{ openstack_auth }}"
 
-nova_safety_upgrade: "no"
-
 nova_services_require_policy_json:
   - nova-api
 

ansible/roles/octavia/defaults/main.yml

@@ -246,7 +246,6 @@ octavia_source_version: "{{ kolla_source_version }}"
 octavia_amp_ssh_key_name: "octavia_ssh_key"
 octavia_amp_listen_port: "9443"
 octavia_amp_image_tag: "amphora"
-octavia_network_type: "provider"
 
 # Load balancer topology options are [ SINGLE, ACTIVE_STANDBY ]
 octavia_loadbalancer_topology: "SINGLE"

ansible/roles/ovs-dpdk/defaults/main.yml

@@ -53,9 +53,6 @@ ovs_hugepage_mountpoint: /dev/hugepages
 # valid values are indexed or named.
 ovs_physical_port_policy: named
 
-neutron_bridge_name: "br_dpdk"
-
-
 ####################
 # Docker
 ####################

ansible/roles/rabbitmq/defaults/main.yml

@@ -79,9 +79,6 @@ rabbitmq_extra_volumes: "{{ default_extra_volumes }}"
 ####################
 # Message-Broker
 ####################
-rabbitmq_user: "openstack"
-rabbitmq_cluster_name: "openstack"
-rabbitmq_hostname: "{{ ansible_facts.hostname }}"
 rabbitmq_pid_file: "/var/lib/rabbitmq/mnesia/rabbitmq.pid"
 rabbitmq_server_additional_erl_args: "+S 2:2 +sbwt none +sbwtdcpu none +sbwtdio none"
 # Dict of TLS options for RabbitMQ. Keys will be prefixed with 'ssl_options.'.