Merge pull request #185 from openstack/stable/victoria

Merge upstream stable/victoria

Author: priteau

ansible/group_vars/all.yml

@@ -434,6 +434,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"
 
@@ -450,7 +451,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"
 
@@ -473,6 +474,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"
@@ -1048,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 }}"
 
 #################

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

@@ -33,9 +33,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/vars/main.yml

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

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"

ansible/roles/blazar/defaults/main.yml

@@ -1,6 +1,4 @@
 ---
-project_name: "blazar"
-
 blazar_services:
   blazar-api:
     container_name: blazar_api

ansible/roles/blazar/vars/main.yml

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