Merge remote-tracking branch 'remotes/upstream/stable/wallaby' into wallaby_import_26012022

Author: mnasiadka

ansible/group_vars/all.yml

@@ -438,6 +438,7 @@ outward_rabbitmq_port: "5674"
 outward_rabbitmq_management_port: "15674"
 outward_rabbitmq_cluster_port: "25674"
 outward_rabbitmq_epmd_port: "4371"
+outward_rabbitmq_prometheus_port: "15694"
 
 ovsdb_port: "6640"
 
@@ -454,7 +455,7 @@ prometheus_node_exporter_port: "9100"
 prometheus_mysqld_exporter_port: "9104"
 prometheus_haproxy_exporter_port: "9101"
 prometheus_memcached_exporter_port: "9150"
-prometheus_rabbitmq_exporter_port: "15692"
+prometheus_rabbitmq_exporter_port: "{{ rabbitmq_prometheus_port }}"
 # Default cadvisor port of 8080 already in use
 prometheus_cadvisor_port: "18080"
 prometheus_fluentd_integration_port: "24231"
@@ -476,6 +477,7 @@ rabbitmq_port: "{{ '5671' if rabbitmq_enable_tls | bool else '5672' }}"
 rabbitmq_management_port: "15672"
 rabbitmq_cluster_port: "25672"
 rabbitmq_epmd_port: "4369"
+rabbitmq_prometheus_port: "15692"
 
 redis_port: "6379"
 redis_sentinel_port: "26379"
@@ -525,6 +527,7 @@ zookeeper_quorum_port: "3888"
 
 zun_api_port: "9517"
 zun_wsproxy_port: "6784"
+zun_wsproxy_protocol: "{{ 'wss' if kolla_enable_tls_external | bool else 'ws' }}"
 zun_cni_daemon_port: "9036"
 
 vitrage_api_port: "8999"
@@ -1047,6 +1050,8 @@ enable_keystone_horizon_policy_file: "{{ enable_keystone }}"
 enable_neutron_horizon_policy_file: "{{ enable_neutron }}"
 enable_nova_horizon_policy_file: "{{ enable_nova }}"
 
+horizon_enable_tls_backend: "{{ kolla_enable_tls_backend }}"
+
 horizon_internal_endpoint: "{{ internal_protocol }}://{{ kolla_internal_fqdn | put_address_in_context('url') }}:{{ horizon_tls_port if kolla_enable_tls_internal | bool else horizon_port }}"
 horizon_public_endpoint: "{{ public_protocol }}://{{ kolla_external_fqdn | put_address_in_context('url') }}:{{ horizon_tls_port if kolla_enable_tls_external | bool else horizon_port }}"
 

ansible/roles/aodh/defaults/main.yml

@@ -1,6 +1,4 @@
 ---
-project_name: "aodh"
-
 aodh_services:
   aodh-api:
     container_name: aodh_api

ansible/roles/aodh/templates/wsgi-aodh.conf.j2

@@ -34,9 +34,5 @@ LogLevel info
   WSGIApplicationGroup %{GLOBAL}
   WSGIDaemonProcess aodh group=aodh processes={{ openstack_service_workers }} threads=1 user=aodh
   WSGIProcessGroup aodh
-{% if aodh_install_type == 'binary' and kolla_base_distro in ['debian', 'ubuntu'] %}
-  WSGIScriptAlias / "{{ binary_path }}/python3-aodh-api"
-{% else %}
   WSGIScriptAlias / "{{ binary_path }}/aodh-api"
-{% endif %}
 </VirtualHost>

ansible/roles/aodh/vars/main.yml

@@ -0,0 +1,2 @@
+---
+project_name: "aodh"

ansible/roles/barbican/defaults/main.yml

@@ -1,6 +1,4 @@
 ---
-project_name: "barbican"
-
 barbican_services:
   barbican-api:
     container_name: barbican_api

ansible/roles/barbican/templates/barbican.conf.j2

@@ -10,7 +10,6 @@ bind_host = {{ api_interface_address }}
 host_href = {{ barbican_public_endpoint }}
 
 backlog = 4096
-max_allowed_secret_in_bytes = 10000
 max_allowed_request_size_in_bytes = 1000000
 
 db_auto_create = False

ansible/roles/barbican/vars/main.yml

@@ -0,0 +1,2 @@
+---
+project_name: "barbican"

ansible/roles/baremetal/tasks/pre-install.yml

@@ -41,6 +41,15 @@
     - inventory_hostname not in groups['bifrost'] or
       hostvars[inventory_hostname]['api_interface'] | replace('-', '_') in hostvars[inventory_hostname].ansible_facts
 
+- name: Ensure unprivileged users can use ping
+  become: true
+  sysctl:
+    name: net.ipv4.ping_group_range
+    value: '0 2147483647'
+    state: present
+    sysctl_file: "{{ kolla_sysctl_conf_path }}"
+  when: ansible_facts.os_family == 'RedHat'
+
 # NOTE(osmanlicilegi): The distribution might come with cloud-init installed, and manage_etc_hosts
 # configuration enabled. If so, it will override the file /etc/hosts from cloud-init templates at
 # every boot, which will break RabbitMQ. To prevent this happens, first we check whether cloud-init

ansible/roles/bifrost/defaults/main.yml

@@ -1,6 +1,4 @@
 ---
-project_name: "bifrost"
-
 ####################
 # Docker
 ####################

ansible/roles/bifrost/vars/main.yml

@@ -0,0 +1,2 @@
+---
+project_name: "bifrost"