From 1736c788d1727b319324884ed552553b963e988d Mon Sep 17 00:00:00 2001 From: Michal Nasiadka Date: Tue, 11 Jan 2022 11:24:36 +0100 Subject: [PATCH] multiple: remove duplicated variables between defaults and group vars Change-Id: I547ab4b05aa14ed3bbee8be2dc77a6840d4816f6 --- ansible/group_vars/all.yml | 5 +---- ansible/roles/cloudkitty/defaults/main.yml | 7 ------- ansible/roles/designate/defaults/main.yml | 5 ----- ansible/roles/glance/defaults/main.yml | 2 -- ansible/roles/nova-cell/defaults/main.yml | 2 -- ansible/roles/nova/defaults/main.yml | 2 -- ansible/roles/octavia/defaults/main.yml | 1 - ansible/roles/ovs-dpdk/defaults/main.yml | 3 --- ansible/roles/rabbitmq/defaults/main.yml | 3 --- 9 files changed, 1 insertion(+), 29 deletions(-) diff --git a/ansible/group_vars/all.yml b/ansible/group_vars/all.yml index cfb6d7f332..e0f50c05de 100644 --- a/ansible/group_vars/all.yml +++ b/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 }}" @@ -950,8 +949,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. @@ -977,7 +974,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') diff --git a/ansible/roles/cloudkitty/defaults/main.yml b/ansible/roles/cloudkitty/defaults/main.yml index 8ac0bad807..cde0f5be3e 100644 --- a/ansible/roles/cloudkitty/defaults/main.yml +++ b/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" diff --git a/ansible/roles/designate/defaults/main.yml b/ansible/roles/designate/defaults/main.yml index 028c622d06..0755eaf31c 100644 --- a/ansible/roles/designate/defaults/main.yml +++ b/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 }}" diff --git a/ansible/roles/glance/defaults/main.yml b/ansible/roles/glance/defaults/main.yml index 364a0dfb60..259614fbc3 100644 --- a/ansible/roles/glance/defaults/main.yml +++ b/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 }}" ################### diff --git a/ansible/roles/nova-cell/defaults/main.yml b/ansible/roles/nova-cell/defaults/main.yml index 358808c5b4..f08302bd18 100644 --- a/ansible/roles/nova-cell/defaults/main.yml +++ b/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" diff --git a/ansible/roles/nova/defaults/main.yml b/ansible/roles/nova/defaults/main.yml index 3e6d413712..d38bbc4984 100644 --- a/ansible/roles/nova/defaults/main.yml +++ b/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 diff --git a/ansible/roles/octavia/defaults/main.yml b/ansible/roles/octavia/defaults/main.yml index 2dde6393dd..a381ceed8b 100644 --- a/ansible/roles/octavia/defaults/main.yml +++ b/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" diff --git a/ansible/roles/ovs-dpdk/defaults/main.yml b/ansible/roles/ovs-dpdk/defaults/main.yml index 1336ea0c4d..2441e95c2f 100644 --- a/ansible/roles/ovs-dpdk/defaults/main.yml +++ b/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 #################### diff --git a/ansible/roles/rabbitmq/defaults/main.yml b/ansible/roles/rabbitmq/defaults/main.yml index 07af33c027..469ab27e27 100644 --- a/ansible/roles/rabbitmq/defaults/main.yml +++ b/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.'.