From 07ed845c2634fde5cf941a04ebbd4247d508476b Mon Sep 17 00:00:00 2001
From: Ricky Elrod <codeblock@fedoraproject.org>
Date: Wed, 29 Jun 2016 11:22:42 +0000
Subject: [PATCH] separate out graphite instance from grafana frontend. It
 needed more CPU.

Signed-off-by: Ricky Elrod <codeblock@fedoraproject.org>
---
 .../host_vars/graphite.fedorainfracloud.org   | 23 ++++++++++
 .../hosts/grafana.cloud.fedoraproject.org.yml |  6 +--
 .../hosts/graphite.fedorainfracloud.org.yml   | 43 +++++++++++++++++++
 3 files changed, 69 insertions(+), 3 deletions(-)
 create mode 100644 inventory/host_vars/graphite.fedorainfracloud.org
 create mode 100644 playbooks/hosts/graphite.fedorainfracloud.org.yml

diff --git a/inventory/host_vars/graphite.fedorainfracloud.org b/inventory/host_vars/graphite.fedorainfracloud.org
new file mode 100644
index 0000000000..65fe58e9c5
--- /dev/null
+++ b/inventory/host_vars/graphite.fedorainfracloud.org
@@ -0,0 +1,23 @@
+instance_type: m1.large
+image: "{{ fedora23_x86_64 }}"
+keypair: fedora-admin-20130801
+security_group: default,wide-open-persistent
+zone: nova
+tcp_ports: [22, 80, 443]
+custom_rules:
+  - "-A INPUT -p tcp -m tcp --dport 2003 -s 209.132.176.0/20 -j ACCEPT"
+
+inventory_tenant: persistent
+inventory_instance_name: graphite
+hostbase: graphite
+public_ip: 209.132.184.151
+root_auth_users: codeblock ralph
+description: graphite/statsd experimentation (backend)
+
+volumes:
+  - volume_id: 818172fb-c278-4569-978f-f2822ab2d021
+    device: /dev/vdc
+
+cloud_networks:
+  # persistent-net
+  - net-id: "67b77354-39a4-43de-b007-bb813ac5c35f"
diff --git a/playbooks/hosts/grafana.cloud.fedoraproject.org.yml b/playbooks/hosts/grafana.cloud.fedoraproject.org.yml
index 96dc9806e6..799d110957 100644
--- a/playbooks/hosts/grafana.cloud.fedoraproject.org.yml
+++ b/playbooks/hosts/grafana.cloud.fedoraproject.org.yml
@@ -24,9 +24,9 @@
   - base
   - rkhunter
   - apache
-  - graphite/graphite
-  - graphite/statsd
-  - graphite/fedmsg2statsd
+  #- graphite/graphite
+  #- graphite/statsd
+  #- graphite/fedmsg2statsd
   - graphite/grafana
 
   tasks:
diff --git a/playbooks/hosts/graphite.fedorainfracloud.org.yml b/playbooks/hosts/graphite.fedorainfracloud.org.yml
new file mode 100644
index 0000000000..b56c108dee
--- /dev/null
+++ b/playbooks/hosts/graphite.fedorainfracloud.org.yml
@@ -0,0 +1,43 @@
+- name: check/create instance
+  hosts: graphite.fedorainfracloud.org
+  gather_facts: False
+
+  vars_files:
+   - /srv/web/infra/ansible/vars/global.yml
+   - /srv/private/ansible/vars.yml
+   - /srv/web/infra/ansible/vars/fedora-cloud.yml
+   - /srv/private/ansible/files/openstack/passwords.yml
+
+  tasks:
+  - include: "{{ tasks }}/persistent_cloud.yml"
+
+- name: setup all the things
+  hosts: graphite.fedorainfracloud.org
+  gather_facts: True
+  vars_files:
+   - /srv/web/infra/ansible/vars/global.yml
+   - /srv/private/ansible/vars.yml
+   - /srv/private/ansible/files/openstack/passwords.yml
+   - /srv/web/infra/ansible/vars/{{ ansible_distribution }}.yml
+
+  roles:
+  - base
+  - rkhunter
+  - apache
+  - graphite/graphite
+  - graphite/statsd
+  - graphite/fedmsg2statsd
+
+  tasks:
+  - include: "{{ tasks }}/yumrepos.yml"
+  #- include: "{{ tasks }}/2fa_client.yml"
+  - include: "{{ tasks }}/motd.yml"
+  - include: "{{ tasks }}/mod_wsgi.yml"
+
+  handlers:
+  - include: "{{ handlers }}/restart_services.yml"
+
+  pre_tasks:
+  - include: "{{ tasks }}/cloud_setup_basic.yml"
+  - name: set hostname (required by some services, at least postfix need it)
+    hostname: name="{{inventory_hostname}}"