Add LMA2.0
* Align current model with use LMA2.0 aproach
* Delete linux_system_codename from openstack/control.yml, proxy.yaml,
as it defined in infra/config.yml
Change-Id: I3afd56a511f67f91dbda1af157407aeabb15c717
diff --git a/classes/cluster/virtual-mcp-ocata-ovs/stacklight/proxy.yml b/classes/cluster/virtual-mcp-ocata-ovs/stacklight/proxy.yml
index 10d7577..f1c017a 100644
--- a/classes/cluster/virtual-mcp-ocata-ovs/stacklight/proxy.yml
+++ b/classes/cluster/virtual-mcp-ocata-ovs/stacklight/proxy.yml
@@ -1,13 +1,14 @@
classes:
- system.nginx.server.single
-- system.nginx.server.proxy.grafana_web
-- system.nginx.server.proxy.kibana_web
-- system.nginx.server.proxy.nagios_web
+- system.nginx.server.proxy.stacklight.grafana
+- system.nginx.server.proxy.stacklight.kibana
+- system.nginx.server.proxy.monitoring.prometheus_server
+- system.nginx.server.proxy.monitoring.prometheus_alertmanager
- system.salt.minion.cert.proxy
- cluster.virtual-mcp-ocata-ovs
parameters:
_param:
- linux_system_codename: xenial
+ nginx_proxy_grafana_port: 15013
nginx_proxy_ssl:
enabled: true
authority: ${_param:salt_minion_ca_authority}