From 03fb24cadb527f510a146d7edba4390cf10268a6 Mon Sep 17 00:00:00 2001
From: Ralph Bean <rbean@redhat.com>
Date: Tue, 24 Nov 2015 19:48:16 +0000
Subject: [PATCH] Rebuilding taiga.

---
 inventory/backups                                             | 2 +-
 ...iga.cloud.fedoraproject.org => taiga.fedorainfracloud.org} | 4 ++--
 ....cloud.fedoraproject.org => taigastg.fedorainfracloud.org} | 4 ++--
 inventory/inventory                                           | 4 ++--
 ...d.fedoraproject.org.yml => taiga.fedorainfracloud.org.yml} | 4 ++--
 ...edoraproject.org.yml => taigastg.fedorainfracloud.org.yml} | 4 ++--
 6 files changed, 11 insertions(+), 11 deletions(-)
 rename inventory/host_vars/{taiga.cloud.fedoraproject.org => taiga.fedorainfracloud.org} (86%)
 rename inventory/host_vars/{taigastg.cloud.fedoraproject.org => taigastg.fedorainfracloud.org} (85%)
 rename playbooks/hosts/{taiga.cloud.fedoraproject.org.yml => taiga.fedorainfracloud.org.yml} (91%)
 rename playbooks/hosts/{taigastg.cloud.fedoraproject.org.yml => taigastg.fedorainfracloud.org.yml} (91%)

diff --git a/inventory/backups b/inventory/backups
index 96bdd12920..f3d996d8bb 100644
--- a/inventory/backups
+++ b/inventory/backups
@@ -23,5 +23,5 @@ copr-fe.cloud.fedoraproject.org
 copr-keygen.cloud.fedoraproject.org
 copr-dist-git.fedorainfracloud.org
 value01.phx2.fedoraproject.org
-taiga.cloud.fedoraproject.org
+taiga.fedorainfracloud.org
 taskotron01.qa.fedoraproject.org
diff --git a/inventory/host_vars/taiga.cloud.fedoraproject.org b/inventory/host_vars/taiga.fedorainfracloud.org
similarity index 86%
rename from inventory/host_vars/taiga.cloud.fedoraproject.org
rename to inventory/host_vars/taiga.fedorainfracloud.org
index 998dc859bd..432e59cd05 100644
--- a/inventory/host_vars/taiga.cloud.fedoraproject.org
+++ b/inventory/host_vars/taiga.fedorainfracloud.org
@@ -1,5 +1,5 @@
 ---
-image: "{{ fedora21_x86_64 }}"
+image: "{{ fedora23_x86_64 }}"
 instance_type: m1.medium
 keypair: fedora-admin-20130801
 security_group: ssh-anywhere-persistent,web-80-anywhere-persistent,default
@@ -17,7 +17,7 @@ host_backup_targets: ['/backups']
 dbs_to_backup: ['taiga']
 
 volumes:
-  - volume_id: 4a99a0b3-6812-4c09-af1e-6313a467e3ec
+  - volume_id: 8878d26e-a296-4c81-b636-3eb4dca15ed0
     device: /dev/vdc
 
 cloud_networks:
diff --git a/inventory/host_vars/taigastg.cloud.fedoraproject.org b/inventory/host_vars/taigastg.fedorainfracloud.org
similarity index 85%
rename from inventory/host_vars/taigastg.cloud.fedoraproject.org
rename to inventory/host_vars/taigastg.fedorainfracloud.org
index 6e2e63f780..2a81af7317 100644
--- a/inventory/host_vars/taigastg.cloud.fedoraproject.org
+++ b/inventory/host_vars/taigastg.fedorainfracloud.org
@@ -1,5 +1,5 @@
 ---
-image: "{{ fedora21_x86_64 }}"
+image: "{{ fedora23_x86_64 }}"
 instance_type: m1.small
 keypair: fedora-admin-20130801
 security_group: ssh-anywhere-persistent,web-80-anywhere-persistent,default
@@ -14,7 +14,7 @@ root_auth_users:  ralph maxamillion
 description: stg instance of the taiga frontend server
 
 volumes:
-  - volume_id: 67f313d5-e345-4649-873c-9684985dca75
+  - volume_id: 5babf722-0046-4535-a6e5-398f9c67b844
     device: /dev/vdc
 
 cloud_networks:
diff --git a/inventory/inventory b/inventory/inventory
index 29b3954922..2a05dc4c70 100644
--- a/inventory/inventory
+++ b/inventory/inventory
@@ -935,8 +935,8 @@ copr-keygen.cloud.fedoraproject.org
 copr-be-dev.cloud.fedoraproject.org
 copr-fe-dev.cloud.fedoraproject.org
 # taiga for kanban-style project planning
-taiga.cloud.fedoraproject.org
-taigastg.cloud.fedoraproject.org
+taiga.fedorainfracloud.org
+taigastg.fedorainfracloud.org
 # graphite/statsd/grafana exploration
 grafana.cloud.fedoraproject.org
 # glittergallery GSoC dev work
diff --git a/playbooks/hosts/taiga.cloud.fedoraproject.org.yml b/playbooks/hosts/taiga.fedorainfracloud.org.yml
similarity index 91%
rename from playbooks/hosts/taiga.cloud.fedoraproject.org.yml
rename to playbooks/hosts/taiga.fedorainfracloud.org.yml
index d726432d17..2aaa8c7fe6 100644
--- a/playbooks/hosts/taiga.cloud.fedoraproject.org.yml
+++ b/playbooks/hosts/taiga.fedorainfracloud.org.yml
@@ -1,5 +1,5 @@
 - name: check/create instance
-  hosts: taiga.cloud.fedoraproject.org
+  hosts: taiga.fedorainfracloud.org
   gather_facts: False
 
   vars_files:
@@ -12,7 +12,7 @@
   - include: "{{ tasks }}/persistent_cloud_new.yml"
 
 - name: setup all the things
-  hosts: taiga.cloud.fedoraproject.org
+  hosts: taiga.fedorainfracloud.org
   vars_files:
    - /srv/web/infra/ansible/vars/global.yml
    - /srv/private/ansible/vars.yml
diff --git a/playbooks/hosts/taigastg.cloud.fedoraproject.org.yml b/playbooks/hosts/taigastg.fedorainfracloud.org.yml
similarity index 91%
rename from playbooks/hosts/taigastg.cloud.fedoraproject.org.yml
rename to playbooks/hosts/taigastg.fedorainfracloud.org.yml
index b66f8a0472..a4472747a7 100644
--- a/playbooks/hosts/taigastg.cloud.fedoraproject.org.yml
+++ b/playbooks/hosts/taigastg.fedorainfracloud.org.yml
@@ -1,5 +1,5 @@
 - name: check/create instance
-  hosts: taigastg.cloud.fedoraproject.org
+  hosts: taigastg.fedorainfracloud.org
   gather_facts: False
 
   vars_files:
@@ -12,7 +12,7 @@
   - include: "{{ tasks }}/persistent_cloud_new.yml"
 
 - name: setup all the things
-  hosts: taigastg.cloud.fedoraproject.org
+  hosts: taigastg.fedorainfracloud.org
   gather_facts: True
   vars_files:
    - /srv/web/infra/ansible/vars/global.yml