From 812b4f9f73878ba5ba8fe5fb9e2dee51746a1c18 Mon Sep 17 00:00:00 2001
From: Kevin Carter <kevin.carter@rackspace.com>
Date: Fri, 17 Apr 2015 18:02:08 -0500
Subject: [PATCH] updated swift deps for use in stable/kilo

swift now depends on the package pyeclib which has a library dep
of liberasurecode1, liberasurecode-dev and this commit adds the
libs to the swift install as well as the repo server.

Change-Id: I36ff6354b78faedcfd716f31c53627c1bcb54d78
Partially-Implements: blueprint master-kilofication
---
 .../roles/lxc_container_create/tasks/container_create.yml      | 1 +
 playbooks/roles/os_swift/defaults/main.yml                     | 3 +++
 playbooks/roles/repo_server/defaults/main.yml                  | 2 ++
 playbooks/vars/repo_packages/openstack_services.yml            | 2 +-
 4 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/playbooks/roles/lxc_container_create/tasks/container_create.yml b/playbooks/roles/lxc_container_create/tasks/container_create.yml
index f9cc12b818..0d9bf32ba0 100644
--- a/playbooks/roles/lxc_container_create/tasks/container_create.yml
+++ b/playbooks/roles/lxc_container_create/tasks/container_create.yml
@@ -77,6 +77,7 @@
       echo '# Do not edit this file. Add new sources to /etc/apt/sources.list.d/' | tee /etc/apt/sources.list
       echo 'deb {{ lxc_container_template_main_apt_repo }} {{ lxc_container_release }} main restricted universe multiverse' | tee -a /etc/apt/sources.list
       echo 'deb {{ lxc_container_template_main_apt_repo }} {{ lxc_container_release }}-updates main restricted universe multiverse' | tee -a /etc/apt/sources.list
+      echo 'deb {{ lxc_container_template_main_apt_repo }} {{ lxc_container_release }}-backports main restricted universe multiverse' | tee -a /etc/apt/sources.list
       echo 'deb {{ lxc_container_template_security_apt_repo }} {{ lxc_container_release }}-security main restricted universe multiverse' | tee -a /etc/apt/sources.list
       while timeout 120 apt-get update && apt-get -y install python2.7; [ $? = 124 ]; do
         sleep 5
diff --git a/playbooks/roles/os_swift/defaults/main.yml b/playbooks/roles/os_swift/defaults/main.yml
index e8f133afef..7ec4328ee8 100644
--- a/playbooks/roles/os_swift/defaults/main.yml
+++ b/playbooks/roles/os_swift/defaults/main.yml
@@ -116,6 +116,7 @@ swift_pip_packages:
   - dnspython
   - ecdsa
   - keystonemiddleware
+  - pyeclib
   - pycrypto
   - python-cinderclient
   - python-keystoneclient
@@ -128,6 +129,8 @@ swift_apt_packages:
   - curl
   - gcc
   - git-core
+  - liberasurecode1
+  - liberasurecode-dev
   - libffi-dev
   - openssh-server
   - python-dev
diff --git a/playbooks/roles/repo_server/defaults/main.yml b/playbooks/roles/repo_server/defaults/main.yml
index e2c5d73892..9b84a743d0 100644
--- a/playbooks/roles/repo_server/defaults/main.yml
+++ b/playbooks/roles/repo_server/defaults/main.yml
@@ -46,6 +46,8 @@ repo_apt_packages:
   - rsync
   - sshpass
   - tmux
+  - liberasurecode1
+  - liberasurecode-dev
   - libldap2-dev
   - libsasl2-dev
   - libssl-dev
diff --git a/playbooks/vars/repo_packages/openstack_services.yml b/playbooks/vars/repo_packages/openstack_services.yml
index 5fdc2e907e..8f23c809eb 100644
--- a/playbooks/vars/repo_packages/openstack_services.yml
+++ b/playbooks/vars/repo_packages/openstack_services.yml
@@ -86,7 +86,7 @@ nova_git_dest: "/opt/nova_{{ nova_git_install_branch | replace('/', '_') }}"
 
 ## Swift service
 swift_git_repo: https://github.com/openstack/swift
-swift_git_install_branch: 2.2.2
+swift_git_install_branch: master
 swift_git_dest: "/opt/swift_{{ swift_git_install_branch | replace('/', '_') }}"