ansible: update examples for grafana and graphite to use correct fqdn

Signed-off-by: Alfredo Deza <adeza@redhat.com>

diff --git a/ansible/examples/deploy_grafana.yml b/ansible/examples/deploy_grafana.yml
index 38b49b88b815d7c21003e0855891ccfde2004865..f3960e23e043ed158673f9a26e7813558c4f78d8 100644 (file)
--- a/ansible/examples/deploy_grafana.yml
+++ b/ansible/examples/deploy_grafana.yml
@@ -3,12 +3,24 @@
 - hosts: all
   user: vagrant
   roles:
-    - grafana
     - nginx
+    - grafana
+  vars_files:
+    - vars/load-balance-vars.yml
   vars:
-     fqdn: "grafana.local"
+     fqdn: "grafana.ceph.com"
      app_name: "grafana"
      development_server: true
+     # ssl hosts need to be defined so that all required ssl certs are put into
+     # place. This is specially important when one host responds for multiple
+     # other domains.
+     ssl_hosts:
+       - hostname: "grafana.ceph.com"
+         ssl_cert: "files/ssl/dev/ssl/ssl.crt"
+         ssl_key: "files/ssl/dev/ssl/ssl.key"
+       - hostname: "shaman.ceph.com"
+         ssl_cert: "files/ssl/dev/ssl/ssl.crt"
+         ssl_key: "files/ssl/dev/ssl/ssl.key"
      # only needed when enabling Github Auth
      # github_client_id: "111aaa222"
      # github_client_secret: "qwerty1234"

diff --git a/ansible/examples/deploy_graphite.yml b/ansible/examples/deploy_graphite.yml
index 8d478edab02f7ebe159a1e900eadaff46577f795..a3c7c23f8811e98371bf92af1aef2b1fe2c23554 100644 (file)
--- a/ansible/examples/deploy_graphite.yml
+++ b/ansible/examples/deploy_graphite.yml
@@ -9,3 +9,15 @@
      app_name: "graphite"
      development_server: true
      graphite_api_key: "secret"
+
+     # This has nothing to do with grafana, but uses nginx templating that is
+     # deployed on the same server. To prevent overwriting we set these here
+     # too. It also means that you must pass in both shaman node IPs
+     nginx_upstreams:
+      - name: shaman
+        fqdn: "shaman.ceph.com"
+        strategy: "least_conn"
+        servers: {
+          "{{ shaman_node1_ip }}",
+          "{{ shaman_node2_ip }}",
+        }

diff --git a/ansible/examples/shaman_load_balancer.yml b/ansible/examples/shaman_load_balancer.yml
new file mode 100644 (file)
index 0000000..63c5c13
--- /dev/null
+++ b/ansible/examples/shaman_load_balancer.yml
@@ -0,0 +1,15 @@
+---
+
+- hosts: all
+  user: vagrant
+  roles:
+    - nginx
+  vars_files:
+    - vars/load-balance-vars.yml
+  vars:
+     app_name: "shaman"
+     fqdn: "shaman.ceph.com"
+     development_server: true
+     # only needed when enabling Github Auth
+     # github_client_id: "111aaa222"
+     # github_client_secret: "qwerty1234"