aboutsummaryrefslogtreecommitdiffstats
path: root/deploy/adapters/ansible/openstack_mitaka_xenial/roles/swift
diff options
context:
space:
mode:
authorJustin chi <chigang@huawei.com>2016-10-16 04:24:46 +0000
committerGerrit Code Review <gerrit@opnfv.org>2016-10-16 04:24:46 +0000
commit4c5892d191475c852ef78396b98749c98df2c3e3 (patch)
tree3902a83076086522770c89b378940ba6d236fb97 /deploy/adapters/ansible/openstack_mitaka_xenial/roles/swift
parentc85cae06ce80e7090b707974a50ab32de4aec28b (diff)
parent590c421a0ca417820cc2316a08184e116b3e6a74 (diff)
Merge "Move all the tar packages in compass4nfv repo to deploy ISO"
Diffstat (limited to 'deploy/adapters/ansible/openstack_mitaka_xenial/roles/swift')
-rw-r--r--deploy/adapters/ansible/openstack_mitaka_xenial/roles/swift/files/swift-lib.tar.gzbin499553 -> 0 bytes
-rw-r--r--deploy/adapters/ansible/openstack_mitaka_xenial/roles/swift/tasks/swift.yml14
-rw-r--r--deploy/adapters/ansible/openstack_mitaka_xenial/roles/swift/vars/main.yml3
3 files changed, 15 insertions, 2 deletions
diff --git a/deploy/adapters/ansible/openstack_mitaka_xenial/roles/swift/files/swift-lib.tar.gz b/deploy/adapters/ansible/openstack_mitaka_xenial/roles/swift/files/swift-lib.tar.gz
deleted file mode 100644
index fdbb38fd..00000000
--- a/deploy/adapters/ansible/openstack_mitaka_xenial/roles/swift/files/swift-lib.tar.gz
+++ /dev/null
Binary files differ
diff --git a/deploy/adapters/ansible/openstack_mitaka_xenial/roles/swift/tasks/swift.yml b/deploy/adapters/ansible/openstack_mitaka_xenial/roles/swift/tasks/swift.yml
index 4e2651a7..10a513f0 100644
--- a/deploy/adapters/ansible/openstack_mitaka_xenial/roles/swift/tasks/swift.yml
+++ b/deploy/adapters/ansible/openstack_mitaka_xenial/roles/swift/tasks/swift.yml
@@ -9,6 +9,10 @@
---
- include_vars: "{{ ansible_os_family }}.yml"
+- name: get image http server
+ shell: awk -F'=' '/compass_server/ {print $2}' /etc/compass.conf
+ register: http_server
+
- include: swift-controller1.yml
when: inventory_hostname in groups['controller']
@@ -42,8 +46,14 @@
- rsync
when: inventory_hostname in groups['compute']
-- name: upload swift lib
- unarchive: src=swift-lib.tar.gz dest=/tmp/
+#- name: upload swift lib
+# unarchive: src=swift-lib.tar.gz dest=/tmp/
+
+- name: download swift lib package
+ get_url: url="http://{{ http_server.stdout_lines[0] }}/packages/moon/{{ swift_lib }}" dest=/tmp/
+
+- name: unarchive swift lib
+ command: su -s /bin/sh -c "tar xvf /tmp/{{ swift_lib }} -C /tmp/"
- name: copy swift lib
command: su -s /bin/sh -c "cp /tmp/swift-lib/* /usr/lib/"
diff --git a/deploy/adapters/ansible/openstack_mitaka_xenial/roles/swift/vars/main.yml b/deploy/adapters/ansible/openstack_mitaka_xenial/roles/swift/vars/main.yml
index 540068da..dc009551 100644
--- a/deploy/adapters/ansible/openstack_mitaka_xenial/roles/swift/vars/main.yml
+++ b/deploy/adapters/ansible/openstack_mitaka_xenial/roles/swift/vars/main.yml
@@ -7,6 +7,9 @@
# http://www.apache.org/licenses/LICENSE-2.0
##############################################################################
---
+
+swift_lib: swift-lib.tar.gz
+
packages_noarch: []
services_noarch: []