aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKristian Lyngstol <kly@kly.no>2017-04-19 18:17:40 +0200
committerKristian Lyngstol <kly@kly.no>2017-04-19 18:17:40 +0200
commit4e04c35f04c264d728587a54d0515eef0a42a44b (patch)
tree7850ac76ba7d494014ecc97d54322567ed44af5d
parent5bd19932a886eae468fea8bcb0e30c78f1d45141 (diff)
build/: Make room for new deployment scheme
-rw-r--r--ansible/inventory-dx2
-rw-r--r--ansible/inventory-localhost (renamed from inventory-localhost)0
-rw-r--r--ansible/playbook-new.yml (renamed from playbook-new.yml)0
-rw-r--r--ansible/playbook-prod.yml16
-rw-r--r--ansible/roles/basics/tasks/main.yml (renamed from roles/basics/tasks/main.yml)0
-rw-r--r--ansible/roles/common/tasks/main.yml (renamed from roles/common/tasks/main.yml)0
-rw-r--r--ansible/roles/ping/files/gondul-pinger.service (renamed from roles/ping/files/gondul-pinger.service)0
-rw-r--r--ansible/roles/ping/handlers/main.yml (renamed from roles/ping/handlers/main.yml)0
-rw-r--r--ansible/roles/ping/tasks/main.yml (renamed from roles/ping/tasks/main.yml)0
-rw-r--r--ansible/roles/postgres/files/postgresql.conf (renamed from roles/postgres/files/postgresql.conf)0
-rw-r--r--ansible/roles/postgres/tasks/main.yml (renamed from roles/postgres/tasks/main.yml)0
-rw-r--r--ansible/roles/snmp/files/gondul-snmp.service (renamed from roles/snmp/files/gondul-snmp.service)0
-rw-r--r--ansible/roles/snmp/handlers/main.yml (renamed from roles/snmp/handlers/main.yml)0
-rw-r--r--ansible/roles/snmp/tasks/main.yml (renamed from roles/snmp/tasks/main.yml)0
-rw-r--r--ansible/roles/test/tasks/main.yml (renamed from roles/test/tasks/main.yml)0
-rw-r--r--ansible/roles/test/vars/main.yml (renamed from roles/test/vars/main.yml)0
-rw-r--r--ansible/roles/web/files/gondul.conf (renamed from roles/web/files/gondul.conf)0
-rw-r--r--ansible/roles/web/handlers/main.yml (renamed from roles/web/handlers/main.yml)0
-rw-r--r--ansible/roles/web/tasks/main.yml (renamed from roles/web/tasks/main.yml)0
-rw-r--r--group_vars/front-test.yml3
-rw-r--r--group_vars/prod.yml3
-rw-r--r--playbook-prod.yml31
-rw-r--r--playbook-test.yml40
23 files changed, 0 insertions, 95 deletions
diff --git a/ansible/inventory-dx b/ansible/inventory-dx
deleted file mode 100644
index 365c31b..0000000
--- a/ansible/inventory-dx
+++ /dev/null
@@ -1,2 +0,0 @@
-[prod]
-localhost ansible_connection=local
diff --git a/inventory-localhost b/ansible/inventory-localhost
index ee4e0bc..ee4e0bc 100644
--- a/inventory-localhost
+++ b/ansible/inventory-localhost
diff --git a/playbook-new.yml b/ansible/playbook-new.yml
index 7961f21..7961f21 100644
--- a/playbook-new.yml
+++ b/ansible/playbook-new.yml
diff --git a/ansible/playbook-prod.yml b/ansible/playbook-prod.yml
deleted file mode 100644
index e0e778b..0000000
--- a/ansible/playbook-prod.yml
+++ /dev/null
@@ -1,16 +0,0 @@
----
-- hosts: all
- become: false
- roles:
- - basics
- vars:
- - images:
- - name: "gondul-front-test"
- links: []
- ports: "{{ front_ports }}"
- - name: "gondul-varnish-test"
- links: [ "gondul-front-test:gondul-front" ]
- ports: "{{ varnish_ports }}"
- - name: "gondul-snmp-test"
- links: [ ]
- ports: []
diff --git a/roles/basics/tasks/main.yml b/ansible/roles/basics/tasks/main.yml
index 6a92a19..6a92a19 100644
--- a/roles/basics/tasks/main.yml
+++ b/ansible/roles/basics/tasks/main.yml
diff --git a/roles/common/tasks/main.yml b/ansible/roles/common/tasks/main.yml
index fbd42d1..fbd42d1 100644
--- a/roles/common/tasks/main.yml
+++ b/ansible/roles/common/tasks/main.yml
diff --git a/roles/ping/files/gondul-pinger.service b/ansible/roles/ping/files/gondul-pinger.service
index fc9cabd..fc9cabd 100644
--- a/roles/ping/files/gondul-pinger.service
+++ b/ansible/roles/ping/files/gondul-pinger.service
diff --git a/roles/ping/handlers/main.yml b/ansible/roles/ping/handlers/main.yml
index 6592e88..6592e88 100644
--- a/roles/ping/handlers/main.yml
+++ b/ansible/roles/ping/handlers/main.yml
diff --git a/roles/ping/tasks/main.yml b/ansible/roles/ping/tasks/main.yml
index cb435d1..cb435d1 100644
--- a/roles/ping/tasks/main.yml
+++ b/ansible/roles/ping/tasks/main.yml
diff --git a/roles/postgres/files/postgresql.conf b/ansible/roles/postgres/files/postgresql.conf
index cf6e67e..cf6e67e 100644
--- a/roles/postgres/files/postgresql.conf
+++ b/ansible/roles/postgres/files/postgresql.conf
diff --git a/roles/postgres/tasks/main.yml b/ansible/roles/postgres/tasks/main.yml
index ee53327..ee53327 100644
--- a/roles/postgres/tasks/main.yml
+++ b/ansible/roles/postgres/tasks/main.yml
diff --git a/roles/snmp/files/gondul-snmp.service b/ansible/roles/snmp/files/gondul-snmp.service
index e5f2179..e5f2179 100644
--- a/roles/snmp/files/gondul-snmp.service
+++ b/ansible/roles/snmp/files/gondul-snmp.service
diff --git a/roles/snmp/handlers/main.yml b/ansible/roles/snmp/handlers/main.yml
index b0232f2..b0232f2 100644
--- a/roles/snmp/handlers/main.yml
+++ b/ansible/roles/snmp/handlers/main.yml
diff --git a/roles/snmp/tasks/main.yml b/ansible/roles/snmp/tasks/main.yml
index 2cb7165..2cb7165 100644
--- a/roles/snmp/tasks/main.yml
+++ b/ansible/roles/snmp/tasks/main.yml
diff --git a/roles/test/tasks/main.yml b/ansible/roles/test/tasks/main.yml
index 798644a..798644a 100644
--- a/roles/test/tasks/main.yml
+++ b/ansible/roles/test/tasks/main.yml
diff --git a/roles/test/vars/main.yml b/ansible/roles/test/vars/main.yml
index 0bed216..0bed216 100644
--- a/roles/test/vars/main.yml
+++ b/ansible/roles/test/vars/main.yml
diff --git a/roles/web/files/gondul.conf b/ansible/roles/web/files/gondul.conf
index 0cdbff7..0cdbff7 100644
--- a/roles/web/files/gondul.conf
+++ b/ansible/roles/web/files/gondul.conf
diff --git a/roles/web/handlers/main.yml b/ansible/roles/web/handlers/main.yml
index 407739b..407739b 100644
--- a/roles/web/handlers/main.yml
+++ b/ansible/roles/web/handlers/main.yml
diff --git a/roles/web/tasks/main.yml b/ansible/roles/web/tasks/main.yml
index b716f87..b716f87 100644
--- a/roles/web/tasks/main.yml
+++ b/ansible/roles/web/tasks/main.yml
diff --git a/group_vars/front-test.yml b/group_vars/front-test.yml
deleted file mode 100644
index 6682d96..0000000
--- a/group_vars/front-test.yml
+++ /dev/null
@@ -1,3 +0,0 @@
----
-front_ports: []
-varnish_ports: ["127.0.0.1:8080:80"]
diff --git a/group_vars/prod.yml b/group_vars/prod.yml
deleted file mode 100644
index dfb8f6a..0000000
--- a/group_vars/prod.yml
+++ /dev/null
@@ -1,3 +0,0 @@
----
-front_ports: [ ]
-varnish_ports: [ "80:80" ]
diff --git a/playbook-prod.yml b/playbook-prod.yml
deleted file mode 100644
index c452438..0000000
--- a/playbook-prod.yml
+++ /dev/null
@@ -1,31 +0,0 @@
----
-- hosts: all
- become: false
- roles:
- - basics
- vars:
- - images:
- - name: "gondul-graphite-test"
- volumes: [ "{{ pwd.stdout }}/:/opt/gondul" , "{{ pwd.stdout }}/data/graphite:/var/lib/graphite" ]
- links: []
- ports: [ "2003:2003" ]
- - name: "gondul-grafana-test"
- volumes: [ "{{ pwd.stdout }}/:/opt/gondul" , "{{ pwd.stdout }}/data/grafana:/var/lib/grafana" ]
- links: ["gondul-graphite-test:graphite" ]
- ports: []
- - name: "gondul-front-test"
- volumes: [ "{{ pwd.stdout }}/:/opt/gondul" ]
- links: [ ]
- ports: "{{ front_ports }}"
- - name: "gondul-templating-test"
- volumes: [ "{{ pwd.stdout }}/:/opt/gondul" ]
- links: [ "gondul-front-test:gondul-front"]
- ports: []
- - name: "gondul-varnish-test"
- volumes: [ "{{ pwd.stdout }}/:/opt/gondul" ]
- links: [ "gondul-front-test:gondul-front", "gondul-graphite-test:gondul-graphite", "gondul-templating-test:gondul-templating", "gondul-grafana-test:gondul-grafana" ]
- ports: "{{ varnish_ports }}"
- - name: "gondul-snmp-test"
- volumes: [ "{{ pwd.stdout }}/:/opt/gondul" ]
- links: [ "gondul-graphite-test:graphite" ]
- ports: [ ]
diff --git a/playbook-test.yml b/playbook-test.yml
deleted file mode 100644
index 6bb95ec..0000000
--- a/playbook-test.yml
+++ /dev/null
@@ -1,40 +0,0 @@
----
-- hosts: all
- become: false
- roles:
- - basics
- - test
- vars:
- - images:
- - name: "gondul-db-test"
- volumes: [ "{{ pwd.stdout }}/:/opt/gondul", "{{ pwd.stdout }}/data/postgresql:/var/lib/postgresql" ]
- links: []
- ports: []
- - name: "gondul-graphite-test"
- volumes: [ "{{ pwd.stdout }}/:/opt/gondul" , "{{ pwd.stdout }}/data/graphite:/var/lib/graphite" ]
- links: []
- ports: []
- - name: "gondul-grafana-test"
- volumes: [ "{{ pwd.stdout }}/:/opt/gondul" , "{{ pwd.stdout }}/data/grafana:/var/lib/grafana" ]
- links: ["gondul-graphite-test:graphite","gondul-db-test:db" ]
- ports: []
- - name: "gondul-front-test"
- volumes: [ "{{ pwd.stdout }}/:/opt/gondul" ]
- links: [ "gondul-db-test:db" ]
- ports: "{{ front_ports }}"
- - name: "gondul-templating-test"
- volumes: [ "{{ pwd.stdout }}/:/opt/gondul" ]
- links: [ "gondul-front-test:gondul-front"]
- ports: []
- - name: "gondul-varnish-test"
- volumes: [ "{{ pwd.stdout }}/:/opt/gondul" ]
- links: [ "gondul-front-test:gondul-front", "gondul-graphite-test:gondul-graphite", "gondul-templating-test:gondul-templating", "gondul-grafana-test:gondul-grafana" ]
- ports: "{{ varnish_ports }}"
- - name: "gondul-collector-test"
- volumes: [ "{{ pwd.stdout }}/:/opt/gondul" ]
- links: [ "gondul-db-test:db", "gondul-graphite-test:graphite" ]
- ports: []
- - name: "gondul-snmp-test"
- volumes: [ "{{ pwd.stdout }}/:/opt/gondul" ]
- links: [ "gondul-db-test:db", "gondul-graphite-test:graphite" ]
- ports: []