From dab3f653a973223dfcddc3d1b506266d7b83a6e1 Mon Sep 17 00:00:00 2001 From: "chenshuai@huawei.com" Date: Thu, 28 Jul 2016 04:46:04 -0400 Subject: add swift and moon in Compass JIRA: COMPASS-443 Change-Id: Id0ca0c9fc1961bc07f28fa0da670fb632aa6fee6 Signed-off-by: chenshuai@huawei.com --- .../roles/moon-post/tasks/main.yml | 18 +++++++ .../roles/moon-post/tasks/moon-compute.yml | 17 ++++++ .../roles/moon-post/tasks/moon-controller.yml | 61 ++++++++++++++++++++++ 3 files changed, 96 insertions(+) create mode 100644 deploy/adapters/ansible/openstack_mitaka_xenial/roles/moon-post/tasks/main.yml create mode 100644 deploy/adapters/ansible/openstack_mitaka_xenial/roles/moon-post/tasks/moon-compute.yml create mode 100644 deploy/adapters/ansible/openstack_mitaka_xenial/roles/moon-post/tasks/moon-controller.yml (limited to 'deploy/adapters/ansible/openstack_mitaka_xenial/roles/moon-post/tasks') diff --git a/deploy/adapters/ansible/openstack_mitaka_xenial/roles/moon-post/tasks/main.yml b/deploy/adapters/ansible/openstack_mitaka_xenial/roles/moon-post/tasks/main.yml new file mode 100644 index 00000000..d0809ef0 --- /dev/null +++ b/deploy/adapters/ansible/openstack_mitaka_xenial/roles/moon-post/tasks/main.yml @@ -0,0 +1,18 @@ +############################################################################## +# Copyright (c) 2016 HUAWEI TECHNOLOGIES CO.,LTD and others. +# +# All rights reserved. This program and the accompanying materials +# are made available under the terms of the Apache License, Version 2.0 +# which accompanies this distribution, and is available at +# http://www.apache.org/licenses/LICENSE-2.0 +############################################################################## +--- +- include_vars: "{{ ansible_os_family }}.yml" + +- include: moon-controller.yml + when: inventory_hostname in groups['controller'] + +- include: moon-compute.yml + when: inventory_hostname in groups['compute'] + + diff --git a/deploy/adapters/ansible/openstack_mitaka_xenial/roles/moon-post/tasks/moon-compute.yml b/deploy/adapters/ansible/openstack_mitaka_xenial/roles/moon-post/tasks/moon-compute.yml new file mode 100644 index 00000000..c5fcf1a7 --- /dev/null +++ b/deploy/adapters/ansible/openstack_mitaka_xenial/roles/moon-post/tasks/moon-compute.yml @@ -0,0 +1,17 @@ +############################################################################## +# Copyright (c) 2016 HUAWEI TECHNOLOGIES CO.,LTD and others. +# +# All rights reserved. This program and the accompanying materials +# are made available under the terms of the Apache License, Version 2.0 +# which accompanies this distribution, and is available at +# http://www.apache.org/licenses/LICENSE-2.0 +############################################################################## +--- +- name: restart nova task + service: name={{ item }} state=restarted enabled=yes + with_items: + - nova-compute + +- name: restart swift task + shell: swift-init all start + ignore_errors: True diff --git a/deploy/adapters/ansible/openstack_mitaka_xenial/roles/moon-post/tasks/moon-controller.yml b/deploy/adapters/ansible/openstack_mitaka_xenial/roles/moon-post/tasks/moon-controller.yml new file mode 100644 index 00000000..bff6397e --- /dev/null +++ b/deploy/adapters/ansible/openstack_mitaka_xenial/roles/moon-post/tasks/moon-controller.yml @@ -0,0 +1,61 @@ +############################################################################## +# Copyright (c) 2016 HUAWEI TECHNOLOGIES CO.,LTD and others. +# +# All rights reserved. This program and the accompanying materials +# are made available under the terms of the Apache License, Version 2.0 +# which accompanies this distribution, and is available at +# http://www.apache.org/licenses/LICENSE-2.0 +############################################################################## +--- +# moon log +- name: moon log + shell: > + sudo adduser swift moonlog; + sudo adduser nova moonlog; + +# nova api paste +#- name: nova api paste 1 +# shell: sudo cp /etc/nova/api-paste.ini /etc/nova/api-paste.ini.bak2 +# +#- name: nova api paste 2 +# shell: sudo sed "/^keystone = / s/keystonecontext/keystonecontext moon/" /etc/nova/api-paste.ini > /tmp/api-paste.ini +# +#- name: nova api paste 3 +# shell: sudo cp /tmp/api-paste.ini /etc/nova/api-paste.ini +# +#- name: nova api paste 4 +# shell: echo -e "\n[filter:moon]\npaste.filter_factory = keystonemiddleware.moon_agent:filter_factory\nauthz_login=admin\nauthz_password=password\nlogfile=/var/log/moon/keystonemiddleware.log\n" | sudo tee -a /etc/nova/api-paste.ini + +- name: update api-paste.ini + template: src=api-paste.ini dest=/etc/nova/api-paste.ini backup=yes + +# restart nova +- name: restart nova + service: name={{ item }} state=restarted enabled=yes + with_items: + - nova-api + - nova-cert + - nova-conductor + - nova-consoleauth + - nova-scheduler + +## swift proxy server +#- name: swift proxy server 1 +# shell: sudo cp /etc/swift/proxy-server.conf /etc/swift/proxy-server.conf.bak2 +# +#- name: swift proxy server 2 +# shell: sudo sed "/^pipeline = / s/proxy-server/moon proxy-server/" /etc/swift/proxy-server.conf > /tmp/proxy-server.conf +# +#- name: swift proxy server 3 +# shell: sudo cp /tmp/proxy-server.conf /etc/swift/proxy-server.conf +# +#- name: swift proxy server 4 +# shell: echo -e "\n[filter:moon]\npaste.filter_factory = keystonemiddleware.moon_agent:filter_factory\nauthz_login=admin\nauthz_password=password\nlogfile=/var/log/moon/keystonemiddleware.log\n" | sudo tee -a /etc/swift/proxy-server.conf + +# restart swift +- name: restart swift + service: name={{ item }} state=restarted enabled=yes + with_items: + - swift-proxy + - memcached + -- cgit 1.2.3-korg