Major update to all SL models, remove old params, renaming

Change-Id: I9d089bcdc7deee8a3ec6d8b722e440a832ef2db0
diff --git a/classes/cluster/sl_os_ovs/openstack/proxy.yml b/classes/cluster/sl_os_ovs/openstack/proxy.yml
index 456d7c9..3a76f36 100644
--- a/classes/cluster/sl_os_ovs/openstack/proxy.yml
+++ b/classes/cluster/sl_os_ovs/openstack/proxy.yml
@@ -1,15 +1,18 @@
 classes:
 - system.nginx.server.single
-- system.nginx.server.proxy.openstack_api
-- system.nginx.server.proxy.openstack_vnc
-- system.nginx.server.proxy.openstack_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.sl_os_ovs
 parameters:
   _param:
+    nginx_proxy_grafana_port: 15013
+    cluster_public_host: ${_param:prometheus_control_address}
     nginx_proxy_ssl:
       enabled: true
       authority: ${_param:salt_minion_ca_authority}
       engine: salt
       mode: secure
-    salt_minion_ca_host: cfg01.${_param:cluster_domain}
\ No newline at end of file
+    salt_minion_ca_host: cfg01.${_param:cluster_domain}