diff --git a/files/fedora-cloud/packstack-controller-answers.txt b/files/fedora-cloud/packstack-controller-answers.txt
index f4e02b4bdb..347aebfb49 100644
--- a/files/fedora-cloud/packstack-controller-answers.txt
+++ b/files/fedora-cloud/packstack-controller-answers.txt
@@ -368,15 +368,15 @@ CONFIG_SWIFT_KS_PW={{ SWIFT_PASS }}
 # on 127.0.0.1 as a swift storage device(packstack does not create the
 # filesystem, you must do this first), if /dev is omitted Packstack
 # will create a loopback device for a test setup
-CONFIG_SWIFT_STORAGES=127.0.0.1/vg_server/swift_store
+CONFIG_SWIFT_STORAGES={{ swift_storages }}
 
 # Number of swift storage zones, this number MUST be no bigger than
 # the number of storage devices configured
-CONFIG_SWIFT_STORAGE_ZONES=1
+CONFIG_SWIFT_STORAGE_ZONES=6
 
 # Number of swift storage replicas, this number MUST be no bigger
 # than the number of storage zones configured
-CONFIG_SWIFT_STORAGE_REPLICAS=1
+CONFIG_SWIFT_STORAGE_REPLICAS=2
 
 # FileSystem type for storage nodes
 CONFIG_SWIFT_STORAGE_FSTYPE=ext4
diff --git a/playbooks/hosts/fed-cloud09.cloud.fedoraproject.org.yml b/playbooks/hosts/fed-cloud09.cloud.fedoraproject.org.yml
index 0db984b16d..1c4ed66700 100644
--- a/playbooks/hosts/fed-cloud09.cloud.fedoraproject.org.yml
+++ b/playbooks/hosts/fed-cloud09.cloud.fedoraproject.org.yml
@@ -1,4 +1,23 @@
 ---
+- name:  Prepare storage on compute nodes
+  hosts: openstack-compute
+  user:  root
+  sudo:  yes
+  gather_facts: True
+
+  vars_files:
+  - /srv/web/infra/ansible/vars/fedora-cloud.yml
+
+  tasks:
+  # This is in fact duplicate from compute nodes, just be sure in case we did not run
+  # compute nodes playbook yet.
+  - name: Create logical volume for Swift
+    lvol: vg=vg_server lv=swift_store size=100g
+  - name: Create FS on Swift storage
+    filesystem: fstype=ext4 dev=/dev/vg_server/swift_store
+  - name: SSH authorized key for root user
+    authorized_key: user=nova key="{{fed_cloud09_root_public_key}}"
+
 - name: deploy Open Stack controler
   hosts: fed-cloud09.cloud.fedoraproject.org
   user: root
@@ -36,9 +55,10 @@
     user: name=root password={{ cloud_rootpw }} state=present
     tags:
     - rootpw
-
   - name: Set the hostname
     action: hostname name={{ controller_hostname }}
+  - name: Deploy root private SSH key
+    copy: src={{ private }}/files/openstack/fed-cloud09-root.key dest=/root/.ssh/id_rsa mode=600 owner=root group=root
 
   - name: install core pkgs
     action: yum state=present pkg={{ item }}
diff --git a/vars/fedora-cloud.yml b/vars/fedora-cloud.yml
index 0ddd098ec0..18595eecc3 100644
--- a/vars/fedora-cloud.yml
+++ b/vars/fedora-cloud.yml
@@ -36,6 +36,10 @@ compute6_private_ip: 172.24.0.15
 
 fed_cloud09_nova_public_key: "ssh-rsa AAAAB3NzaC1yc2EAAAABIwAAAQEA3hXR1h1L5PKIB0DXN7QQcpBg43NeCx8xmSXVqz9EEcOkF48SQjjqLSI/NX/1B9sWJbnCiJXfcH5WiYUFRIcOKK7dPyp7cw/HghljkzeBVN0z4T1/p0p39svmqhzhMyxtbeVZr/s/ES61dj/J2VIsN6ynuIgVgxUj2fNWUt8x8z5Bdu0Q2ThovU8rA+lEM1C/uB2MIpOoXYjkn1a2FsRUz17c1Rn50zL2w8JFCHHcHsHgbQ4G3OvZSTrEiSp7ggZtLepwBWuGSjix69484URaiYSf284+6Sb2dIXo9HV/0Vt108Qc0x9Anw2WARAcPqqAPGF4agA4mere//LBPW+OxQ== fed-cloud09-nova"
 
+fed_clou09_root_public_key: "ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQCv8WqXOuL78Rd7ZvDqoi84M7uRV3uueXTXtvlPdyNQBzIBmxh+spw9IhtoR+FlzgQQ1MN4B7YVLTGki6QDxWDM5jgTVfzxTh/HTg7kJ31HbM1/jDuBK7HMfay2BGx/HCqS2oxIBgIBwIMQAU93jBZUxNyYWvO+5TiU35IHEkYOtHyGYtTtuGCopYRQoAAOIVIIzzDbPvopojCBF5cMYglR/G02YgWM7hMpQ9IqEttLctLmpg6ckcp/sDTHV/8CbXbrSN6pOYxn1YutOgC9MHNmxC1joMH18qkwvSnzXaeVNh4PBWnm1f3KVTSZXKuewPThc3fk2sozgM9BH6KmZoKl root@fed-cloud09.cloud.fedoraproject.org"
+
+swift_storages: "fed-cloud09.cloud.fedoraproject.org/vg_server/swift_store,fed-cloud10.cloud.fedoraproject.org/vg_server/swift_store,fed-cloud11.cloud.fedoraproject.org/vg_server/swift_store,fed-cloud12.cloud.fedoraproject.org/vg_server/swift_store,fed-cloud13.cloud.fedoraproject.org/vg_server/swift_store,fed-cloud14.cloud.fedoraproject.org/vg_server/swift_store,fed-cloud15.cloud.fedoraproject.org/vg_server/swift_store"
+
 #Dell Equalogic public variables
 EQLX_GROUP: cloud-equallogics
 os_auth_url: "https://fed-cloud09.cloud.fedoraproject.org:5000/v2.0"