commit 50a9b8e38968a2d11557057a6033d9a3004092f2
author mcp-jenkins <mcp-jenkins@mirantis.com> Mon Jan 28 14:09:59 2019 +0000
committer Gerrit Code Review <mail@domain.com> Mon Jan 28 14:09:59 2019 +0000
tree 833870ad530b12493d3f9c4f8c8e1e54125946f1
parent 527531c4af122f8fd5604e0b767dc60265b53c03
parent 6a26e28ff15913b2974cd72aee41080220cc7a68

Merge "Add apache proxy site for octavia"

ironic/conductor/cluster.yml

diff --git a/ironic/conductor/cluster.yml b/ironic/conductor/cluster.yml
index 3478413..09548b7 100644
--- a/ironic/conductor/cluster.yml
+++ b/ironic/conductor/cluster.yml
@@ -36,3 +36,6 @@
           secret_key: ${_param:ironic_memcache_secret_key}
       identity:
         region: ${_param:openstack_region}
+      automated_clean: true
+      erase_devices_priority: 0
+      erase_devices_metadata_priority: 1

ironic/conductor/single.yml

diff --git a/ironic/conductor/single.yml b/ironic/conductor/single.yml
index 36d92be..4bbdfa9 100644
--- a/ironic/conductor/single.yml
+++ b/ironic/conductor/single.yml
@@ -37,3 +37,6 @@
           secret_key: ${_param:ironic_memcache_secret_key}
       identity:
         region: ${_param:openstack_region}
+      automated_clean: true
+      erase_devices_priority: 0
+      erase_devices_metadata_priority: 1

nginx/server/proxy/monitoring/prometheus_server_lts.yml

diff --git a/nginx/server/proxy/monitoring/prometheus_server_lts.yml b/nginx/server/proxy/monitoring/prometheus_server_lts.yml
new file mode 100644
index 0000000..512d018
--- /dev/null
+++ b/nginx/server/proxy/monitoring/prometheus_server_lts.yml
@@ -0,0 +1,18 @@
+parameters:
+  nginx:
+    server:
+      enabled: true
+      site:
+        nginx_proxy_prometheus_server_lts:
+          enabled: true
+          type: nginx_proxy
+          name: prometheus_server_lts
+          proxy:
+            host: ${_param:stacklight_telemetry_address}
+            port: 9090
+            protocol: http
+          host:
+            name: ${_param:cluster_public_host}
+            port: 9090
+            protocol: https
+          ssl: ${_param:nginx_proxy_ssl}