Merge "Fix net for contrail."
diff --git a/classes/cluster/sl-os-ovs/infra/config.yml b/classes/cluster/sl-os-ovs/infra/config.yml
index 6477821..25cf3d8 100644
--- a/classes/cluster/sl-os-ovs/infra/config.yml
+++ b/classes/cluster/sl-os-ovs/infra/config.yml
@@ -67,7 +67,7 @@
site:
nginx_proxy_openstack_web:
proxy:
- host: prx
+ host: prx01
nginx_proxy_openstack_api_heat_cfn:
enabled: false
salt:
diff --git a/classes/cluster/sl-os-ovs/openstack/proxy.yml b/classes/cluster/sl-os-ovs/openstack/proxy.yml
index bac17ef..c40845b 100644
--- a/classes/cluster/sl-os-ovs/openstack/proxy.yml
+++ b/classes/cluster/sl-os-ovs/openstack/proxy.yml
@@ -1,15 +1,12 @@
classes:
- system.nginx.server.single
-- 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.nginx.server.proxy.openstack_api
+- system.nginx.server.proxy.openstack_vnc
+- system.nginx.server.proxy.openstack_web
- 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}
diff --git a/classes/cluster/sl-os-ovs/stacklight/proxy.yml b/classes/cluster/sl-os-ovs/stacklight/proxy.yml
index 3a2671b..8efba79 100644
--- a/classes/cluster/sl-os-ovs/stacklight/proxy.yml
+++ b/classes/cluster/sl-os-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.sl-os-ovs
parameters:
_param:
- cluster_public_host: ${_param:prometheus_control_address}
+ nginx_proxy_grafana_port: 15013
nginx_proxy_ssl:
enabled: true
authority: ${_param:salt_minion_ca_authority}
diff --git a/classes/cluster/sl-os-ovs/stacklight/server.yml b/classes/cluster/sl-os-ovs/stacklight/server.yml
index 66990bc..7c927b4 100644
--- a/classes/cluster/sl-os-ovs/stacklight/server.yml
+++ b/classes/cluster/sl-os-ovs/stacklight/server.yml
@@ -16,7 +16,6 @@
- system.influxdb.relay.cluster
- system.influxdb.server.single
- system.influxdb.database.prometheus
-- system.salt.minion.cert.prometheus_server
- system.keepalived.cluster.instance.prometheus_server_vip
- system.telegraf.agent.remote
- system.prometheus.server.remote_write.docker
diff --git a/classes/cluster/virtual-mcp-ocata-cicd/stacklight/server.yml b/classes/cluster/virtual-mcp-ocata-cicd/stacklight/server.yml
index 49a68af..3a493c4 100644
--- a/classes/cluster/virtual-mcp-ocata-cicd/stacklight/server.yml
+++ b/classes/cluster/virtual-mcp-ocata-cicd/stacklight/server.yml
@@ -15,7 +15,6 @@
- system.galera.server.database.grafana
- system.influxdb.server.single
- system.influxdb.database.prometheus
-- system.salt.minion.cert.prometheus_server
#- system.keepalived.cluster.instance.prometheus_server_vip
- system.telegraf.agent.remote
- system.prometheus.server.remote_write.docker