diff --git a/inventory/host_vars/waverdb-dev.fedorainfracloud.org b/inventory/host_vars/waverdb-dev.fedorainfracloud.org
new file mode 100644
index 0000000000..189ab06af3
--- /dev/null
+++ b/inventory/host_vars/waverdb-dev.fedorainfracloud.org
@@ -0,0 +1,18 @@
+---
+image: rhel7-20141015
+instance_type: m1.medium
+keypair: fedora-admin-20130801
+security_group: ssh-anywhere-persistent,all-icmp-persistent,default,web-80-anywhere-persistent,web-443-anywhere-persistent
+zone: nova
+tcp_ports: [22, 80, 443]
+
+inventory_tenant: persistent
+inventory_instance_name: waverdb-dev
+hostbase: waverdb-dev
+public_ip: 209.132.184.51
+root_auth_users: mjia
+description: waverdb development instance
+
+cloud_networks:
+  # persistent-net
+  - net-id: "67b77354-39a4-43de-b007-bb813ac5c35f"
diff --git a/inventory/inventory b/inventory/inventory
index cacba691b4..d54b210964 100644
--- a/inventory/inventory
+++ b/inventory/inventory
@@ -1158,6 +1158,8 @@ commops.fedorainfracloud.org
 kolinahr.fedorainfracloud.org
 # respins
 respins.fedorainfracloud.org
+# waverdb-dev - ticket 6009
+waverdb-dev.fedorainfracloud.org
 
 #
 # These are in the new cloud
diff --git a/playbooks/hosts/waverdb-dev.fedorainfracloud.org.yml b/playbooks/hosts/waverdb-dev.fedorainfracloud.org.yml
new file mode 100644
index 0000000000..c7dcbeb492
--- /dev/null
+++ b/playbooks/hosts/waverdb-dev.fedorainfracloud.org.yml
@@ -0,0 +1,26 @@
+- name: check/create instance
+  hosts: waverdb-dev.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_path }}/persistent_cloud.yml"
+
+- name: setup all the things
+  hosts: waverdb-dev.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
+
+  pre_tasks:
+  - include: "{{ tasks_path }}/cloud_setup_basic.yml"
+  - name: set hostname (required by some services, at least postfix need it)
+    hostname: name="{{inventory_hostname}}"