openstack/openstack-ansible-os_swift
Code Issues Proposed changes

Merge "Cleanup/standardize usage of tags"

Browse Source
This commit is contained in:
Jenkins 2016-08-17 05:25:14 +00:00 committed by Gerrit Code Review
commit 346381794b
20 changed files with 22 additions and 226 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
README.rst
View File

@ -8,4 +8,4 @@ Documentation for the project can be found at:
http://docs.openstack.org/developer/openstack-ansible-os_swift
The project home is at:
http://launchpad.net/openstack-ansible
http://launchpad.net/openstack-ansible

7
tasks/install-apt.yml
View File

@ -20,15 +20,11 @@
stat:
path: /var/cache/apt
register: apt_cache_stat
tags:
- swift-apt-packages
- name: Update apt if needed
apt:
update_cache: yes
when: "ansible_date_time.epoch|float - apt_cache_stat.stat.mtime > {{cache_timeout}}"
tags:
- swift-apt-packages
- name: Install apt packages
apt:
@ -39,6 +35,3 @@
retries: 5
delay: 2
with_items: "{{ swift_apt_packages }}"
tags:
- swift-install
- swift-apt-packages

34
tasks/main.yml
View File

@ -42,19 +42,21 @@
- swift_do_setup | bool
- inventory_hostname in groups['swift_all']
tags:
- swift-setup
- swift-install
- include: swift_install.yml
when:
- swift_do_setup | bool
- inventory_hostname in groups['swift_all']
tags:
- swift-setup
- swift-install
- include: swift_post_install.yml
when:
- swift_do_setup | bool
- inventory_hostname in groups['swift_all']
tags:
- swift-setup
- swift-config
# We need swift_vars to exist for the "swift_vars.drives is defined check" to work
- name: "Set swift_vars if undefined"
@ -62,24 +64,23 @@
swift_vars: "{}"
when: swift_vars is not defined
tags:
- swift-storage-hosts
- swift-setup
- always
- include: swift_storage_hosts.yml
when:
- inventory_hostname in groups['swift_hosts']
- swift_do_setup | bool
tags:
- swift-storage-hosts
- swift-setup
- swift-install
- swift-config
- include: swift_proxy_hosts.yml
when:
- inventory_hostname in groups['swift_proxy']
- swift_do_setup | bool
tags:
- swift-proxy-hosts
- swift-setup
- swift-config
- swift-install
- include: swift_service_setup.yml
when:
@ -87,31 +88,26 @@
- '"keystoneauth" in swift_middleware_list'
- swift_do_setup | bool
tags:
- swift-setup
- swift-install
- name: Flush handlers
meta: flush_handlers
tags:
- swift-setup
- include: swift_key_setup.yml
when:
- swift_do_sync | bool
tags:
- swift-key
- swift-key-distribute
- swift-sync
- swift-config
- include: swift_rings.yml
when:
- swift_do_sync | bool
tags:
- swift-rings
- swift-sync
- swift-install
- swift-config
- include: swift_sync_post_install.yml
when:
- swift_do_sync | bool
tags:
- swift-sync-post-install
- swift-sync
- always

8
tasks/swift_init_common.yml
View File

@ -15,15 +15,9 @@
- include: swift_init_upstart.yml
when: pid1_name == "init"
tags:
- upstart-init
- swift-init
- include: swift_init_systemd.yml
when: pid1_name == "systemd"
tags:
- systemd-init
- swift-init
- name: Load service
service:
@ -31,5 +25,3 @@
enabled: "yes"
state: restarted
when: init_script|changed
tags:
- swift-init

15
tasks/swift_init_systemd.yml
View File

@ -20,9 +20,6 @@
owner: "{{ system_user }}"
group: "{{ system_group }}"
mode: "02755"
tags:
- systemd-init
- swift-init
- name: Create TEMP lock dir
file:
@ -31,9 +28,6 @@
owner: "{{ system_user }}"
group: "{{ system_group }}"
mode: "02755"
tags:
- systemd-init
- swift-init
- name: Create tempfile.d entry
template:
@ -42,9 +36,6 @@
mode: "0644"
owner: "root"
group: "root"
tags:
- systemd-init
- swift-init
- name: Place the systemd init script
template:
@ -54,13 +45,7 @@
owner: "root"
group: "root"
register: init_script
tags:
- systemd-init
- swift-init
- name: Reload the systemd daemon
command: "systemctl daemon-reload"
when: init_script | changed
tags:
- systemd-init
- swift-init

6
tasks/swift_init_upstart.yml
View File

@ -21,14 +21,8 @@
owner: "root"
group: "root"
register: init_script
tags:
- upstart-init
- swift-init
- name: Reload init scripts
shell: |
initctl reload-configuration
when: init_script|changed
tags:
- upstart-init
- swift-init

48
tasks/swift_install.yml
View File

@ -16,8 +16,6 @@
- include: install-apt.yml
when:
- ansible_pkg_mgr == 'apt'
tags:
- install-apt
- name: Create developer mode constraint file
copy:
@ -28,9 +26,6 @@
{% endfor %}
when:
- swift_developer_mode | bool
tags:
- swift-install
- swift-pip-packages
- name: Clone requirements git repository
git:
@ -41,27 +36,18 @@
version: "{{ swift_requirements_git_install_branch }}"
when:
- swift_developer_mode | bool
tags:
- swift-install
- swift-pip-packages
- name: Add constraints to pip_install_options fact for developer mode
set_fact:
pip_install_options_fact: "{{ pip_install_options|default('') }} --constraint /opt/developer-pip-constraints.txt --constraint /opt/requirements/upper-constraints.txt"
when:
- swift_developer_mode | bool
tags:
- swift-install
- swift-pip-packages
- name: Set pip_install_options_fact when not in developer mode
set_fact:
pip_install_options_fact: "{{ pip_install_options|default('') }}"
when:
- not swift_developer_mode | bool
tags:
- swift-install
- swift-pip-packages
- name: Install requires pip packages
pip:
@ -72,9 +58,6 @@
until: install_packages|success
retries: 5
delay: 2
tags:
- swift-install
- swift-pip-packages
- name: Get local venv checksum
stat:
@ -84,9 +67,6 @@
- not swift_pypy_enabled | bool
- not swift_developer_mode | bool
register: local_venv_stat
tags:
- swift-install
- swift-pip-packages
- name: Get remote venv checksum
uri:
@ -96,9 +76,6 @@
- not swift_pypy_enabled | bool
- not swift_developer_mode | bool
register: remote_venv_checksum
tags:
- swift-install
- swift-pip-packages
# TODO: When project moves to ansible 2 we can pass this a sha256sum which will:
# a) allow us to remove force: yes
@ -117,16 +94,10 @@
- not swift_developer_mode | bool
- (local_venv_stat.stat.exists == False or
{{ local_venv_stat.stat.checksum is defined and local_venv_stat.stat.checksum != remote_venv_checksum.content | trim }})
tags:
- swift-install
- swift-pip-packages
- name: Set swift get_venv fact
set_fact:
swift_get_venv: "{{ get_venv }}"
tags:
- swift-install
- swift-pip-packages
- name: Remove existing venv
file:
@ -135,18 +106,12 @@
when:
- not swift_pypy_enabled | bool
- swift_get_venv | changed
tags:
- swift-install
- swift-pip-packages
- name: Create swift venv dir
file:
path: "{{ swift_bin | dirname }}"
state: directory
register: swift_venv_dir
tags:
- swift-install
- swift-pip-packages
- name: Unarchive pre-built venv
unarchive:
@ -162,9 +127,6 @@
- Restart swift container services
- Restart swift object services
- Restart swift proxy services
tags:
- swift-install
- swift-pip-packages
- name: Install pip packages
pip:
@ -185,9 +147,6 @@
- Restart swift container services
- Restart swift object services
- Restart swift proxy services
tags:
- swift-install
- swift-pip-packages
- name: Update virtualenv path
command: >
@ -196,13 +155,6 @@
- not swift_pypy_enabled | bool
- not swift_developer_mode | bool
- swift_get_venv | success
tags:
- swift-install
- swift-pip-packages
- include: swift_pypy_setup.yml
when: swift_pypy_enabled | bool
tags:
- swift-install
- swift-pip-packages
- swift-pypy

4
tasks/swift_key_distribute.yml
View File

@ -21,7 +21,3 @@
when:
- hostvars[item] is defined
- hostvars[item]['swift_pubkey'] is defined
tags:
- swift-key
- swift-key-create
- swift-key-distribute

6
tasks/swift_key_populate.yml
View File

@ -18,13 +18,7 @@
src: "{{ swift_system_home_folder }}/.ssh/id_rsa.pub"
register: swift_pub
changed_when: false
tags:
- swift-key
- swift-key-create
- name: Register a fact for the swift pub key
set_fact:
swift_pubkey: "{{ swift_pub.content }}"
tags:
- swift-key
- swift-key-create

7
tasks/swift_key_setup.yml
View File

@ -14,12 +14,5 @@
# limitations under the License.
- include: swift_key_populate.yml
tags:
- swift-key
- swift-key-create
- include: swift_key_distribute.yml
tags:
- swift-key
- swift-key-create
- swift-key-distribute

7
tasks/swift_post_install.yml
View File

@ -40,9 +40,6 @@
- Restart swift container services
- Restart swift object services
- Restart swift proxy services
tags:
- swift-config
- swift-post-install
- name: Copy swift config
template:
@ -56,7 +53,3 @@
- Restart swift object services
- Restart swift proxy services
- Restart rsyslog
tags:
- swift-config
- swift-post-install

23
tasks/swift_pre_install.yml
View File

@ -18,8 +18,6 @@
name: "{{ swift_system_group_name }}"
state: "present"
system: "yes"
tags:
- swift-group
- name: Remove old key file(s) if found
file:
@ -30,9 +28,6 @@
- "{{ swift_system_home_folder }}/.ssh/id_rsa"
- "{{ swift_system_home_folder }}/.ssh/id_rsa.pub"
when: swift_recreate_keys | bool
tags:
- swift-key
- swift-key-create
- name: Create the swift system user
user:
@ -44,10 +39,6 @@
createhome: "yes"
home: "{{ swift_system_home_folder }}"
generate_ssh_key: "yes"
tags:
- swift-user
- swift-key
- swift-key-create
- name: Create swift dir
file:
@ -70,8 +61,6 @@
- { path: "/var/cache/swift" }
- { path: "{{ swift_system_home_folder }}" }
- { path: "/etc/rsync.d", owner: "root", group: "root" }
tags:
- swift-dirs
- name: Test for log directory or link
shell: |
@ -84,9 +73,6 @@
register: log_dir
failed_when: false
changed_when: log_dir.rc != 0
tags:
- swift-dirs
- swift-logs
- name: Create swift log dir
file:
@ -96,9 +82,6 @@
group: "{{ swift_syslog_group_name }}"
mode: "0755"
when: log_dir.rc != 0
tags:
- swift-dirs
- swift-logs
- name: Configure mlocate for cron.daily
template:
@ -107,8 +90,6 @@
mode: "0755"
owner: "root"
group: "root"
tags:
- swift-crond
- name: Configure soft file limits
lineinfile:
@ -117,8 +98,6 @@
state: "present"
line: "{{ swift_system_user_name }}\tsoft\tnofile\t\t{{ swift_soft_open_file_limits }}"
insertbefore: "^# End of file"
tags:
- swift-config
- name: Configure hard file limits
lineinfile:
@ -127,5 +106,3 @@
state: "present"
line: "{{ swift_system_user_name }}\thard\tnofile\t\t{{ swift_hard_open_file_limits }}"
insertbefore: "^# End of file"
tags:
- swift-config

6
tasks/swift_proxy_hosts.yml
View File

@ -21,6 +21,8 @@
system_user: "{{ swift_system_user_name }}"
system_group: "{{ swift_system_group_name }}"
service_home: "{{ swift_system_home_folder }}"
tags:
- swift-install
- name: swift proxy server configuration
config_template:
@ -32,6 +34,8 @@
config_overrides: "{{ swift_proxy_server_conf_overrides }}"
config_type: "ini"
notify: Restart swift proxy services
tags:
- swift-config
# If we've specified a container-sync realm use container-sync-realms.conf
- name: "Swift container-sync configuration"
@ -46,3 +50,5 @@
when: >
swift_container_sync_realms is defined
notify: Restart swift proxy services
tags:
- swift-config

15
tasks/swift_rings_build.yml
View File

@ -20,9 +20,6 @@
owner: "{{ swift_system_user_name }}"
group: "{{ swift_system_group_name }}"
mode: "0700"
tags:
- swift-rings
- swift-rings-scripts
- name: "Build ring-contents files"
template:
@ -33,9 +30,6 @@
with_items:
- { item: "{{ swift.account | default({}) }}", port: "{{ swift_account_port }}", type: "account" }
- { item: "{{ swift.container | default({}) }}", port: "{{ swift_container_port}}", type: "container" }
tags:
- swift-rings
- swift-rings-contents
- name: "Build ring-contents files for storage policies"
template:
@ -46,9 +40,6 @@
with_nested:
- "{{ swift.storage_policies }}"
- [{ type: 'object', port: "{{ swift_object_port }}" }]
tags:
- swift-rings
- swift-rings-contents
- name: "build rings for account/container from contents files"
command: "/etc/swift/scripts/swift_rings.py -f /etc/swift/scripts/{{ item[0] }}.contents{% if item[1] %} -r {{ item[1] }}{% endif %}{{ (swift_pretend_min_part_hours_passed | bool) | ternary(' -p', '')}}"
@ -59,9 +50,6 @@
become_user: "{{ swift_system_user_name }}"
args:
chdir: /etc/swift/ring_build_files/
tags:
- swift-rings
- swift-rings-build
- name: "build rings for storage policies from contents files"
command: "/etc/swift/scripts/swift_rings.py -f /etc/swift/scripts/object-{{ item[0].policy.index }}.contents{% if item[1] %} -r {{ item[1] }}{% endif %}{{ (swift_pretend_min_part_hours_passed | bool) | ternary(' -p', '')}}"
@ -72,6 +60,3 @@
become_user: "{{ swift_system_user_name }}"
args:
chdir: /etc/swift/ring_build_files/
tags:
- swift-rings
- swift-rings-build

6
tasks/swift_rings_check.yml
View File

@ -17,15 +17,11 @@
shell: |
cat /etc/swift/ring_build_files/*.builder 2>/dev/null | md5sum | cut -d " " -f1
register: md5sum
tags:
- swift-ring-check
- name: Get empty md5sum
shell: |
echo -n | md5sum | cut -d " " -f1
register: empty_md5sum
tags:
- swift-ring-check
# Fail if the remote hosts builder files is not empty AND
# does not match the md5sum of the local host.
@ -41,5 +37,3 @@
- hostvars[item]['builder_md5sum'] != empty_md5sum.stdout
- hostvars[item]['builder_md5sum'] != md5sum.stdout
with_items: "{{ groups['swift_all'] + groups['swift_remote_all'] }}"
tags:
- swift-ring-check

6
tasks/swift_rings_distribute.yml
View File

@ -24,9 +24,6 @@
/etc/swift/
become: yes
become_user: "{{ swift_system_user_name }}"
tags:
- swift-get-rings
- skip_ansible_lint
- name: "Get swift rings for backup in ring_build_files directory"
command: |
@ -35,6 +32,3 @@
/etc/swift/ring_build_files/
become: yes
become_user: "{{ swift_system_user_name }}"
tags:
- swift-get-rings
- skip_ansible_lint

4
tasks/swift_rings_md5sum.yml
View File

@ -17,11 +17,7 @@
shell: |
cat /etc/swift/*.builder 2>/dev/null | md5sum | cut -d " " -f1
register: md5sum
tags:
- swift-md5sum
- name: Register a fact for the md5sum
set_fact:
builder_md5sum: "{{ md5sum.stdout }}"
tags:
- swift-md5sum

13
tasks/swift_rings_post_distribution_check.yml
View File

@ -17,8 +17,6 @@
shell: |
cat /etc/swift/ring_build_files/*.builder 2>/dev/null | md5sum | cut -d " " -f1
register: md5sum
tags:
- swift-ring-check
# Fail if the remote hosts builder files don't match
# As this is post sync all should match and not be empty
@ -29,8 +27,6 @@
do not match {{ inventory_hostname }}:{{ md5sum.stdout }}"
when: hostvars[item]['builder_md5sum'] != md5sum.stdout
with_items: "{{ groups['swift_all'] + groups['swift_remote_all'] }}"
tags:
- swift-ring-check
- name: "Copy the swift_rings_check.py file"
template:
@ -39,9 +35,6 @@
owner: "{{ swift_system_user_name }}"
group: "{{ swift_system_group_name }}"
mode: "0700"
tags:
- swift-rings
- swift-rings-scripts
- name: "Ensure contents file matches ring after ring sync for account/container"
command: "/etc/swift/scripts/swift_rings_check.py -f /etc/swift/scripts/{{ item[0] }}.contents{% if item[1] %} -r {{ item[1] }} {% endif %}"
@ -52,9 +45,6 @@
become_user: "{{ swift_system_user_name }}"
args:
chdir: /etc/swift/ring_build_files/
tags:
- swift-rings
- swift-rings-check
- name: "Ensure contents file matches ring after ring sync for storage policies"
command: "/etc/swift/scripts/swift_rings_check.py -f /etc/swift/scripts/object-{{ item[0].policy.index }}.contents{% if item[1] %} -r {{ item[1] }} {% endif %}"
@ -65,6 +55,3 @@
become_user: "{{ swift_system_user_name }}"
args:
chdir: /etc/swift/ring_build_files/
tags:
- swift-rings
- swift-rings-check

27
tasks/swift_service_setup.yml
View File

@ -29,9 +29,6 @@
until: add_service|success
retries: 5
delay: 2
tags:
- swift-api-setup
- swift-service-add
# Create an admin user
- name: Ensure swift user
@ -50,9 +47,6 @@
until: add_service|success
retries: 5
delay: 10
tags:
- swift-api-setup
- swift-service-add
# Add a role to the user
- name: Ensure swift user to admin role
@ -71,9 +65,6 @@
until: add_service|success
retries: 5
delay: 10
tags:
- swift-api-setup
- swift-service-add
- name: Ensure swiftoperator role
keystone:
@ -88,9 +79,6 @@
until: add_service|success
retries: 5
delay: 10
tags:
- swift-api-setup
- swift-service-add
- name: "Create keystone user for swift-dispersion"
keystone:
@ -108,9 +96,6 @@
until: add_service|success
retries: 5
delay: 10
tags:
- swift-api-setup
- swift-service-add
- name: "Create keystone role for ResellerAdmin"
keystone:
@ -126,9 +111,6 @@
retries: 5
delay: 10
when: swift_ceilometer_enabled | bool
tags:
- swift-ceilometer-setup
- swift-ceilometer-role
- name: "Add ResellerAdmin role to the service tenant and ceilometer user"
keystone:
@ -146,9 +128,6 @@
retries: 5
delay: 10
when: swift_ceilometer_enabled | bool
tags:
- swift-ceilometer-setup
- swift-ceilometer-role
- name: "Add swiftoperator role to swift-dispersion user"
keystone:
@ -165,9 +144,6 @@
until: add_service|success
retries: 5
delay: 10
tags:
- swift-api-setup
- swift-service-add
# Create an endpoint
- name: Ensure swift endpoint
@ -192,6 +168,3 @@
until: add_service|success
retries: 5
delay: 10
tags:
- swift-api-setup
- swift-service-add

4
tasks/swift_storage_hosts_object.yml
View File

@ -141,8 +141,6 @@
mode: "0644"
config_overrides: "{{ swift_drive_audit_conf_overrides }}"
config_type: "ini"
tags:
- swift-drive-audit
- name: Create drive-audit cron job
cron:
@ -151,5 +149,3 @@
minute: 15
cron_file: swift-drive-audit
user: root
tags:
- swift-drive-audit