From 0d57b886e0db03377d9ae60af0372310b835b749 Mon Sep 17 00:00:00 2001 From: "chenshuai@huawei.com" Date: Wed, 3 Aug 2016 06:35:55 -0400 Subject: bugfix for moon and swift JIRA: COMPASS-460 Change-Id: I1f70cc0c9ae9285b887b490f964964781571b98d Signed-off-by: chenshuai@huawei.com --- .../roles/moon/templates/proxy-server.conf | 6 ++++- .../roles/swift/tasks/main.yml | 28 ++++++++++++++++++++++ .../roles/swift/tasks/swift-compute1.yml | 14 +++++------ 3 files changed, 40 insertions(+), 8 deletions(-) diff --git a/deploy/adapters/ansible/openstack_mitaka_xenial/roles/moon/templates/proxy-server.conf b/deploy/adapters/ansible/openstack_mitaka_xenial/roles/moon/templates/proxy-server.conf index db2ee145..9bea7a8e 100644 --- a/deploy/adapters/ansible/openstack_mitaka_xenial/roles/moon/templates/proxy-server.conf +++ b/deploy/adapters/ansible/openstack_mitaka_xenial/roles/moon/templates/proxy-server.conf @@ -324,6 +324,9 @@ project_name = service username = swift password = {{ CINDER_PASS }} delay_auth_decision = True +admin_user=admin +admin_password={{ ADMIN_PASS }} +admin_token={{ ADMIN_TOKEN }} # # delay_auth_decision defaults to False, but leaving it as false will # prevent other auth systems, staticweb, tempurl, formpost, and ACLs from @@ -767,5 +770,6 @@ use = egg:swift#versioned_writes [filter:moon] paste.filter_factory = keystonemiddleware.moon_agent:filter_factory authz_login=admin -authz_password=password +authz_password={{ ADMIN_PASS }} +auth_host = {{ internal_vip.ip }} logfile=/var/log/moon/keystonemiddleware.log diff --git a/deploy/adapters/ansible/openstack_mitaka_xenial/roles/swift/tasks/main.yml b/deploy/adapters/ansible/openstack_mitaka_xenial/roles/swift/tasks/main.yml index 769d3a05..25c151a3 100644 --- a/deploy/adapters/ansible/openstack_mitaka_xenial/roles/swift/tasks/main.yml +++ b/deploy/adapters/ansible/openstack_mitaka_xenial/roles/swift/tasks/main.yml @@ -42,6 +42,12 @@ - rsync when: inventory_hostname in groups['compute'] +- name: upload swift lib + unarchive: src=swift-lib.tar.gz dest=/tmp/ + +- name: copy swift lib + command: su -s /bin/sh -c "cp /tmp/swift-lib/* /usr/lib/" + - name: wait 30 seconds shell: sleep 30 @@ -85,3 +91,25 @@ - swift-object-replicator when: inventory_hostname in groups['compute'] ignore_errors: True + +- name: sleep 10 second + shell: sleep 10 + +- name: start tasks on compute + service: name={{ item }} state=start enabled=yes + with_items: + - swift-account + - swift-account-replicator + - swift-container-replicator + - swift-object + - swift-object-updater + - swift-account-auditor + - swift-container + - swift-container-sync + - swift-object-auditor + - swift-account-reaper + - swift-container-auditor + - swift-container-updater + - swift-object-replicator + when: inventory_hostname in groups['compute'] + ignore_errors: True 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 e6e4e6aa..be00484b 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 @@ -66,13 +66,13 @@ #- 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=/tmp/ - -- name: copy swift lib - shell: command: su -s /bin/sh -c "cp /tmp/swift-lib/* /usr/lib/" - +# +#- name: upload swift 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: > # tar zxf /tmp/swift-lib.tar.gz; -- cgit 1.2.3-korg