From f07c54101f01042c0ecbe48853bfde81a712735f Mon Sep 17 00:00:00 2001 From: Alfredo Deza Date: Fri, 15 Jul 2016 10:25:44 -0400 Subject: [PATCH] ansible: update examples for grafana and graphite to use correct fqdn Signed-off-by: Alfredo Deza --- ansible/examples/deploy_grafana.yml | 16 ++++++++++++++-- ansible/examples/deploy_graphite.yml | 12 ++++++++++++ ansible/examples/shaman_load_balancer.yml | 15 +++++++++++++++ 3 files changed, 41 insertions(+), 2 deletions(-) create mode 100644 ansible/examples/shaman_load_balancer.yml diff --git a/ansible/examples/deploy_grafana.yml b/ansible/examples/deploy_grafana.yml index 38b49b88..f3960e23 100644 --- 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 8d478eda..a3c7c23f 100644 --- 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 index 00000000..63c5c131 --- /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" -- 2.39.5