aboutsummaryrefslogtreecommitdiffstats
path: root/deploy/adapters/ansible/openstack_mitaka_xenial/roles/swift
diff options
context:
space:
mode:
authorchenshuai@huawei.com <chenshuai@huawei.com>2016-08-01 05:07:48 -0400
committerchenshuai@huawei.com <chenshuai@huawei.com>2016-08-01 11:14:58 -0400
commit20f85a4541d9091dd123d94c8f94c6f90947bd31 (patch)
tree5b1bbb01c9be6b2a65b4ff82a003b9b514b81d6b /deploy/adapters/ansible/openstack_mitaka_xenial/roles/swift
parent922471630508ca190e7fd0530c7e67c8f49a6530 (diff)
modify moon
JIRA: COMPASS-451 Change-Id: I8b229ef6104d84e00ae2cf73b488edc779b73cf1 Signed-off-by: chenshuai@huawei.com <chenshuai@huawei.com>
Diffstat (limited to 'deploy/adapters/ansible/openstack_mitaka_xenial/roles/swift')
-rw-r--r--deploy/adapters/ansible/openstack_mitaka_xenial/roles/swift/tasks/swift-compute1.yml9
-rw-r--r--deploy/adapters/ansible/openstack_mitaka_xenial/roles/swift/templates/proxy-server.conf9
2 files changed, 7 insertions, 11 deletions
diff --git a/deploy/adapters/ansible/openstack_mitaka_xenial/roles/swift/tasks/swift-compute1.yml b/deploy/adapters/ansible/openstack_mitaka_xenial/roles/swift/tasks/swift-compute1.yml
index 68e34d0e..e6e4e6aa 100644
--- a/deploy/adapters/ansible/openstack_mitaka_xenial/roles/swift/tasks/swift-compute1.yml
+++ b/deploy/adapters/ansible/openstack_mitaka_xenial/roles/swift/tasks/swift-compute1.yml
@@ -64,11 +64,14 @@
chown -R root:swift /var/cache/swift;
chmod -R 775 /var/cache/swift;
-- name: copy swift lib
- copy: src=swift-lib.tar.gz dest=/tmp/swift-lib.tar.gz
+#- name: copy swift lib
+# copy: src=swift-lib.tar.gz dest=/tmp/swift-lib.tar.gz
- name: upload swift lib
- unarchive: src=swift-lib.tar.gz dest=/usr/lib/
+ unarchive: src=swift-lib.tar.gz dest=/tmp/
+
+- name: copy swift lib
+ shell: command: su -s /bin/sh -c "cp /tmp/swift-lib/* /usr/lib/"
#- name: untar swift lib
# shell: >
diff --git a/deploy/adapters/ansible/openstack_mitaka_xenial/roles/swift/templates/proxy-server.conf b/deploy/adapters/ansible/openstack_mitaka_xenial/roles/swift/templates/proxy-server.conf
index db2ee145..b76796cf 100644
--- a/deploy/adapters/ansible/openstack_mitaka_xenial/roles/swift/templates/proxy-server.conf
+++ b/deploy/adapters/ansible/openstack_mitaka_xenial/roles/swift/templates/proxy-server.conf
@@ -85,7 +85,7 @@ user = swift
# This sample pipeline uses tempauth and is used for SAIO dev work and
# testing. See below for a pipeline using keystone.
#pipeline = catch_errors gatekeeper healthcheck proxy-logging cache container_sync bulk tempurl ratelimit tempauth container-quotas account-quotas slo dlo versioned_writes proxy-logging proxy-server
-pipeline = catch_errors gatekeeper healthcheck proxy-logging cache container_sync bulk ratelimit authtoken keystoneauth container-quotas account-quotas slo dlo versioned_writes proxy-logging moon proxy-server
+pipeline = catch_errors gatekeeper healthcheck proxy-logging cache container_sync bulk ratelimit authtoken keystoneauth container-quotas account-quotas slo dlo versioned_writes proxy-logging proxy-server
# The following pipeline shows keystone integration. Comment out the one
# above and uncomment this one. Additional steps for integrating keystone are
@@ -762,10 +762,3 @@ use = egg:swift#versioned_writes
# in the container configuration file, which will be eventually
# deprecated. See documentation for more details.
# allow_versioned_writes = false
-
-
-[filter:moon]
-paste.filter_factory = keystonemiddleware.moon_agent:filter_factory
-authz_login=admin
-authz_password=password
-logfile=/var/log/moon/keystonemiddleware.log