diff --git a/defaults/main.yml b/defaults/main.yml index a0b56759..32b794c2 100644 --- a/defaults/main.yml +++ b/defaults/main.yml @@ -88,6 +88,13 @@ swift_object_port: "6000" swift_container_port: "6001" swift_account_port: "6002" +# Default swift ring settings: +swift_default_replication_number: 3 +swift_default_min_part_hours: 1 +swift_default_host_zone: 0 +swift_default_host_region: 1 +swift_default_drive_weight: 100 + ## Swift service defaults swift_service_name: swift swift_service_user_name: swift @@ -205,6 +212,19 @@ swift_account_max_rsync_connections: "{{ swift_max_rsync_connections }}" swift_container_max_rsync_connections: "{{ swift_max_rsync_connections }}" swift_object_max_rsync_connections: "{{ swift_max_rsync_connections }}" +# Set the managed regions as a list of swift regions to manage +# Use for global clusters, default when not set is all regions. +# swift_managed_regions: +# - 1 +# - 2 + +# swift_do_setup and swift_do_sync control which parts of the swift +# role get run. You should never need to adjust these, they are set +# within the swift-setup and swift-sync roles to ensure only the +# appropriate tasks within the os-swift role are run. +swift_do_setup: True +swift_do_sync: True + # swift packages that must be installed before anything else swift_requires_pip_packages: - virtualenv diff --git a/tasks/main.yml b/tasks/main.yml index 5f072eac..b04bcde4 100644 --- a/tasks/main.yml +++ b/tasks/main.yml @@ -14,25 +14,74 @@ # limitations under the License. - include: swift_pre_install.yml + when: + - swift_do_setup | bool + tags: + - swift-setup - include: swift_install.yml + when: + - swift_do_setup | bool + tags: + - swift-setup - include: swift_post_install.yml + when: + - swift_do_setup | bool + tags: + - swift-setup - include: swift_storage_hosts.yml - when: > - inventory_hostname in groups['swift_hosts'] + when: + - inventory_hostname in groups['swift_hosts'] + - swift_do_setup | bool tags: - swift-storage-hosts + - swift-setup - include: swift_proxy_hosts.yml - when: > - inventory_hostname in groups['swift_proxy'] + when: + - inventory_hostname in groups['swift_proxy'] + - swift_do_setup | bool tags: - swift-storage-hosts + - swift-setup - include: swift_service_setup.yml when: - inventory_hostname == groups['swift_all'][0] - '"keystoneauth" in swift_middleware_list' + - swift_do_setup | bool + tags: + - swift-setup - name: Flush handlers meta: flush_handlers + tags: + - swift-setup + +- include: swift_command_check.yml + when: + - swift_do_sync | bool + tags: + - swift-sync + +- include: swift_key_setup.yml + when: + - swift_do_sync | bool + tags: + - swift-key + - swift-key-distribute + - swift-sync + +- include: swift_rings.yml + when: + - swift_do_sync | bool + tags: + - swift-rings + - swift-sync + +- include: swift_sync_post_install.yml + when: + - swift_do_sync | bool + tags: + - swift-sync-post-install + - swift-sync diff --git a/tasks/swift_command_check.yml b/tasks/swift_command_check.yml new file mode 100644 index 00000000..56ac4bb4 --- /dev/null +++ b/tasks/swift_command_check.yml @@ -0,0 +1,30 @@ +--- +# Copyright 2015, Rackspace US, Inc. +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. + +- name: Get swift command path + command: which swift + register: swift_command_path + when: + - not swift_venv_enabled | bool + tags: + - swift-command-bin + +- name: Set swift command path + set_fact: + swift_bin: "{{ swift_command_path.stdout | dirname }}" + when: + - not swift_venv_enabled | bool + tags: + - swift-command-bin diff --git a/tasks/swift_key_distribute.yml b/tasks/swift_key_distribute.yml new file mode 100644 index 00000000..8c79a195 --- /dev/null +++ b/tasks/swift_key_distribute.yml @@ -0,0 +1,24 @@ +--- +# Copyright 2014, Rackspace US, Inc. +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. + +- name: Create authorized keys file from host vars + authorized_key: + user: "{{ swift_system_user_name }}" + key: "{{ hostvars[item]['swift_pubkey'] | b64decode }}" + with_items: groups['swift_all'] + groups['swift_remote_all'] + tags: + - swift-key + - swift-key-create + - swift-key-distribute diff --git a/tasks/swift_key_populate.yml b/tasks/swift_key_populate.yml new file mode 100644 index 00000000..2c02b703 --- /dev/null +++ b/tasks/swift_key_populate.yml @@ -0,0 +1,30 @@ +--- +# Copyright 2014, Rackspace US, Inc. +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. + +- name: Get public key contents and store as var + slurp: + 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 diff --git a/tasks/swift_key_setup.yml b/tasks/swift_key_setup.yml new file mode 100644 index 00000000..bfd10060 --- /dev/null +++ b/tasks/swift_key_setup.yml @@ -0,0 +1,25 @@ +--- +# Copyright 2014, Rackspace US, Inc. +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# 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 diff --git a/tasks/swift_rings.yml b/tasks/swift_rings.yml new file mode 100644 index 00000000..3d25b02b --- /dev/null +++ b/tasks/swift_rings.yml @@ -0,0 +1,32 @@ +--- +# Copyright 2014, Rackspace US, Inc. +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. + +- include: swift_rings_md5sum.yml + +- include: swift_rings_check.yml + when: > + inventory_hostname == groups['swift_hosts'][0] + +- include: swift_rings_build.yml + when: > + inventory_hostname == groups['swift_hosts'][0] + +- include: swift_rings_distribute.yml + +- include: swift_rings_md5sum.yml + +- include: swift_rings_post_distribution_check.yml + when: > + inventory_hostname == groups['swift_hosts'][0] diff --git a/tasks/swift_rings_build.yml b/tasks/swift_rings_build.yml new file mode 100644 index 00000000..7f3d9932 --- /dev/null +++ b/tasks/swift_rings_build.yml @@ -0,0 +1,104 @@ +--- +# Copyright 2014, Rackspace US, Inc. +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. + +- name: "Copy the swift_rings.py file" + template: + src: swift_rings.py.j2 + dest: "/etc/swift/scripts/swift_rings.py" + owner: "{{ swift_system_user_name }}" + group: "{{ swift_system_group_name }}" + mode: "0700" + tags: + - swift-rings + - swift-rings-scripts + +- name: "Build ring-contents files" + template: + src: ring.contents.j2 + dest: "/etc/swift/scripts/{{ item.type }}.contents" + owner: "{{ swift_system_user_name }}" + group: "{{ swift_system_group_name }}" + 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: + src: ring.contents.j2 + dest: "/etc/swift/scripts/object-{{ item[0].policy.index }}.contents" + owner: "{{ swift_system_user_name }}" + group: "{{ swift_system_group_name }}" + 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 }}.contents" + with_items: + - account + - container + when: swift_managed_regions is not defined + become: yes + become_user: "{{ swift_system_user_name }}" + args: + chdir: /etc/swift/ring_build_files/ + tags: + - swift-rings + - swift-rings-build + +- name: "build rings for account/container from contents files" + command: "/etc/swift/scripts/swift_rings.py -f /etc/swift/scripts/{{ item[0] }}.contents -r {{ item[1] }}" + with_nested: + - [ 'account', 'container' ] + - swift_managed_regions | default([]) + become: yes + 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.policy.index }}.contents" + with_items: + - "{{ swift.storage_policies }}" + when: swift_managed_regions is not defined + become: yes + 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 -r {{ item[1] }}" + with_nested: + - "{{ swift.storage_policies }}" + - swift_managed_regions | default([]) + become: yes + become_user: "{{ swift_system_user_name }}" + args: + chdir: /etc/swift/ring_build_files/ + tags: + - swift-rings + - swift-rings-build diff --git a/tasks/swift_rings_check.yml b/tasks/swift_rings_check.yml new file mode 100644 index 00000000..c2d8270a --- /dev/null +++ b/tasks/swift_rings_check.yml @@ -0,0 +1,43 @@ +--- +# Copyright 2014, Rackspace US, Inc. +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. + +- name: Get md5sum of local builder files + 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. +- name: Verify md5sum of builder files + fail: + msg: > + "The builder files on the remote host {{ item }}:{{ hostvars[item]['builder_md5sum'] }} + do not match {{ inventory_hostname }}:{{ md5sum.stdout }} + and are not empty on the remote host" + when: > + ("{{ hostvars[item]['builder_md5sum'] }}" != "{{ empty_md5sum.stdout }}") and + ("{{ hostvars[item]['builder_md5sum'] }}" != "{{ md5sum.stdout }}") + with_items: groups['swift_all'] + groups['swift_remote_all'] + tags: + - swift-ring-check diff --git a/tasks/swift_rings_distribute.yml b/tasks/swift_rings_distribute.yml new file mode 100644 index 00000000..c1ae6eac --- /dev/null +++ b/tasks/swift_rings_distribute.yml @@ -0,0 +1,38 @@ +--- +# Copyright 2014, Rackspace US, Inc. +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. + +- name: "Get swift rings" + synchronize: + src: "/etc/swift/ring_build_files/" + mode: push + dest: "/etc/swift/" + set_remote_user: False + delegate_to: "{{ groups['swift_hosts'][0] }}" + become: yes + become_user: "{{ swift_system_user_name }}" + tags: + - swift-get-rings + +- name: "Get swift rings for backup in ring_build_files directory" + synchronize: + src: "/etc/swift/ring_build_files/" + mode: push + dest: "/etc/swift/ring_build_files/" + set_remote_user: False + delegate_to: "{{ groups['swift_hosts'][0] }}" + become: yes + become_user: "{{ swift_system_user_name }}" + tags: + - swift-get-rings diff --git a/tasks/swift_rings_md5sum.yml b/tasks/swift_rings_md5sum.yml new file mode 100644 index 00000000..10ac699e --- /dev/null +++ b/tasks/swift_rings_md5sum.yml @@ -0,0 +1,27 @@ +--- +# Copyright 2014, Rackspace US, Inc. +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. + +- name: Get md5sum of builder files + 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 diff --git a/tasks/swift_rings_post_distribution_check.yml b/tasks/swift_rings_post_distribution_check.yml new file mode 100644 index 00000000..8aeeb96b --- /dev/null +++ b/tasks/swift_rings_post_distribution_check.yml @@ -0,0 +1,97 @@ +--- +# Copyright 2014, Rackspace US, Inc. +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. + +- name: Get md5sum of local builder files + 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 +- name: Verify md5sum of builder files + fail: + msg: > + "The builder files on the remote host {{ item }}:{{ hostvars[item]['builder_md5sum'] }} + 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: + src: swift_rings_check.py.j2 + dest: "/etc/swift/scripts/swift_rings_check.py" + 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 }}.contents" + with_items: + - account + - container + when: swift_managed_regions is not defined + become: yes + 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 account/container" + command: "/etc/swift/scripts/swift_rings_check.py -f /etc/swift/scripts/{{ item[0] }}.contents -r {{ item[1] }}" + with_nested: + - [ 'account', 'container' ] + - swift_managed_regions | default([]) + become: yes + 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.policy.index }}.contents" + with_items: + - "{{ swift.storage_policies }}" + when: swift_managed_regions is not defined + become: yes + 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 -r {{ item[1] }}" + with_nested: + - "{{ swift.storage_policies }}" + - swift_managed_regions | default([]) + become: yes + become_user: "{{ swift_system_user_name }}" + args: + chdir: /etc/swift/ring_build_files/ + tags: + - swift-rings + - swift-rings-check diff --git a/tasks/swift_service_setup.yml b/tasks/swift_service_setup.yml index 34e91357..0e540df7 100644 --- a/tasks/swift_service_setup.yml +++ b/tasks/swift_service_setup.yml @@ -30,7 +30,6 @@ tags: - swift-api-setup - swift-service-add - - swift-setup # Create an admin user - name: Ensure swift user @@ -50,7 +49,6 @@ tags: - swift-api-setup - swift-service-add - - swift-setup # Add a role to the user - name: Ensure swift user to admin role @@ -70,7 +68,6 @@ tags: - swift-api-setup - swift-service-add - - swift-setup - name: Ensure swiftoperator role keystone: @@ -86,7 +83,6 @@ tags: - swift-api-setup - swift-service-add - - swift-setup - name: "Create keystone user for swift-dispersion" keystone: @@ -105,7 +101,6 @@ tags: - swift-api-setup - swift-service-add - - swift-setup - name: "Create keystone role for ResellerAdmin" keystone: @@ -157,7 +152,6 @@ tags: - swift-api-setup - swift-service-add - - swift-setup # Create an endpoint - name: Ensure swift endpoint @@ -183,4 +177,3 @@ tags: - swift-api-setup - swift-service-add - - swift-setup diff --git a/tasks/swift_sync_post_install.yml b/tasks/swift_sync_post_install.yml new file mode 100644 index 00000000..5b626ef9 --- /dev/null +++ b/tasks/swift_sync_post_install.yml @@ -0,0 +1,33 @@ +--- +# Copyright 2014, Rackspace US, Inc. +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. + +- name: "Ensure services are started" + service: + name: "{{ item }}" + state: "started" + pattern: "{{ item }}" + with_items: + - "{{ swift_account_program_names }}" + - "{{ swift_container_program_names }}" + - "{{ swift_object_program_names }}" + when: inventory_hostname in groups['swift_hosts'] + +- name: "Ensure services are started" + service: + name: "{{ item }}" + state: "started" + pattern: "{{ item }}" + with_items: swift_proxy_program_names + when: inventory_hostname in groups['swift_proxy'] diff --git a/templates/ring.contents.j2 b/templates/ring.contents.j2 new file mode 100644 index 00000000..835fd0f2 --- /dev/null +++ b/templates/ring.contents.j2 @@ -0,0 +1,100 @@ +{### Check if this is an object storage policy #} +{% if item[1] is defined %} +{% set port = item[1]['port'] %} +{% set type = item[1]['type'] %} +{% set item = item[0]['policy'] %} +{### If the index is 0 then it needs to be object without index #} +{% if item.index == 0 %} +{% set builder_file = type %} +{% else %} +{% set builder_file = type + '-' + item.index|string %} +{% endif %} +{% set name = item.name %} +{### Otherwise this should be account or container rings #} +{### Make the port/type/item/builder_file/name vals uniform across rings #} +{% elif item.port is defined %} +{% set port = item.port %} +{% set type = item.type %} +{% set item = item.item %} +{% set builder_file = type %} +{% set name = type %} +{% endif %} +{### Lets get the min_part_hours, part_power and repl_number vals #} +{% set min_part_hours = item.min_part_hours | default(swift.min_part_hours | default(swift_default_min_part_hours)) %} +{% set part_power = item.part_power | default(swift.part_power) %} +{% if (item.policy_type is defined) and (item.policy_type == "erasure_coding") %} +{% set repl_number = item.ec_num_data_fragments + item.ec_num_parity_fragments %} +{% else %} +{% set repl_number = item.repl_number | default(swift.repl_number | default(swift_default_replication_number)) %} +{% endif %} +{### Create the builder dict #} +{% set builder = {} %} +{### This is a hacky way of updating the builder dict #} +{% set _update = builder.update({'min_part_hours':min_part_hours}) %} +{% set _update = builder.update({'repl_number':repl_number}) %} +{% set _update = builder.update({'part_power':part_power}) %} +{% set _update = builder.update({'builder_file':builder_file}) %} +{### Now we need to add the drives #} +{### Create an update the builder dict to have drives as an empty list #} +{% set _update = builder.update({'drives':[]}) %} +{### Lets get the default groups for drives and find the default storage_policy #} +{% set def_groups = [ 'account', 'container' ] %} +{% for policy in swift.storage_policies %} +{% if policy.policy.default is defined and policy.policy.default == True %} +{% set _update = def_groups.append(policy.policy.name) %} +{% endif %} +{% endfor %} +{### Loop through the swift_hosts #} +{% for host in groups['swift_hosts'] %} +{### Set the default storage_ip #} +{% set def_storage_ip = hostvars[host]['ansible_ssh_host'] %} +{% if swift.storage_network is defined %} +{% set storage_bridge = 'ansible_' + swift.storage_network|replace('-', '_') %} +{% set def_storage_ip = hostvars[host][storage_bridge]['ipv4']['address'] | default(hostvars[host]['ansible_ssh_host']) %} +{% endif %} +{### Set the default replication_ip #} +{% set def_repl_ip = def_storage_ip %} +{% if swift.replication_network is defined %} +{% set repl_bridge = 'ansible_' + swift.replication_network|replace('-', '_') %} +{% set def_repl_ip = hostvars[host][repl_bridge]['ipv4']['address'] | default(def_storage_ip) %} +{% endif %} +{### Default swift_vars to an empty dict if not defined #} +{### swift_vars needs to exist for swift_vars[setting] checks to wrok #} +{% if hostvars[host]['swift_vars'] is defined %} +{% set swift_vars = hostvars[host]['swift_vars'] %} +{% else %} +{% set swift_vars = {} %} +{% endif %} +{### Get the drives use swift global as default #} +{% set drives = swift_vars.drives | default(swift.drives | default([])) %} +{### Loop through the drives #} +{% for drive in drives %} +{### Check if groups is defined per host or drive #} +{% set groups = drive.groups | default(swift_vars.groups | default(swift.groups | default(def_groups))) %} +{### Only build the device if it is part of the group we're building the ring for #} +{% if name in groups %} +{### Build an empty device which we'll update with the appropriate details #} +{% set device = {} %} +{% set weight = drive.weight | default(swift_vars.weight | default(swift.weight | default(swift_default_drive_weight))) %} +{% set region = drive.region | default(swift_vars.region | default(swift.region | default(swift_default_host_region))) %} +{% set zone = drive.zone | default(swift_vars.zone | default(swift.zone | default(swift_default_host_zone))) %} +{% set repl_ip = drive.repl_ip | default(swift_vars.repl_ip | default(def_repl_ip)) %} +{% set repl_port = drive.repl_port | default(swift_vars.repl_port | default(port)) %} +{% set storage_ip = drive.storage_ip | default(swift_vars.storage_ip | default(def_storage_ip)) %} +{% set storage_port = drive.storage_port | default(swift_vars.storage_port | default(port)) %} +{### Update the device with the appropriate values #} +{% set _update = device.update({'device':drive.name}) %} +{% set _update = device.update({'weight': weight}) %} +{% set _update = device.update({'region': region}) %} +{% set _update = device.update({'zone': zone}) %} +{% set _update = device.update({'repl_ip': repl_ip}) %} +{% set _update = device.update({'repl_port': repl_port|int}) %} +{% set _update = device.update({'ip': storage_ip}) %} +{% set _update = device.update({'port': storage_port|int}) %} +{### Append the device to the drives list of the builder dict #} +{% set _update = builder.drives.append(device) %} +{% endif %} +{% endfor %} +{% endfor %} +{### Output the builder file #} +{{ builder | to_nice_json }} diff --git a/templates/swift_rings.py.j2 b/templates/swift_rings.py.j2 new file mode 100644 index 00000000..30a9922b --- /dev/null +++ b/templates/swift_rings.py.j2 @@ -0,0 +1,256 @@ +#!{{ swift_venv_enabled | bool | ternary(swift_venv_bin + "/", "/usr/bin/env ") }}python +# Copyright 2014, Rackspace US, Inc. +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. + +from __future__ import print_function +from optparse import OptionParser +from os.path import exists + +from swift.cli.ringbuilder import main as rb_main + +import json +import pickle +import sys +import threading + + +USAGE = "usage: %prog -f -r " + +DEVICE_KEY = "%(ip)s:%(port)d/%(device)s" + + +class RingValidationError(Exception): + pass + + +def create_buildfile(build_file, part_power, repl, min_part_hours, + update=False, data=None, validate=False): + if update: + # build file exists, so lets just update the existing build file + if not data: + data = get_build_file_data(build_file) + if data is None: + data = {} + + if repl != data.get('replicas') and not validate: + run_and_wait(rb_main, ["swift-ring-builder", build_file, + "set_replicas", repl]) + if min_part_hours != data.get('min_part_hours') and not validate: + run_and_wait(rb_main, ["swift-ring-builder", build_file, + "set_min_part_hours", min_part_hours]) + if part_power != data.get('part_power'): + raise RingValidationError('Part power cannot be changed! ' + 'you must rebuild the ring if you need ' + 'to change it.\nRing part power: %s ' + 'Inventory part power: %s' + % (data.get('part_power'), part_power)) + + elif not validate: + run_and_wait(rb_main, ["swift-ring-builder", build_file, "create", + part_power, repl, min_part_hours]) + + +def change_host_weight(build_file, host_search_str, weight): + run_and_wait(rb_main, ["swift-ring-builder", build_file, "set_weight", + host_search_str, str(weight)]) + + +def remove_host_from_ring(build_file, host): + run_and_wait(rb_main, ["swift-ring-builder", build_file, "remove", + host]) + + +def update_host_in_ring(build_file, new_host, old_host, validate=False): + if new_host.get('zone', 0) != old_host['zone']: + devstr = DEVICE_KEY % new_host + raise RingValidationError('Cannot update zone on %s, this can only be ' + 'done when the drive is added' % devstr) + if new_host.get('region', 1) != old_host['region']: + devstr = DEVICE_KEY % new_host + raise RingValidationError('Cannot update region on %s, this can only ' + 'be done when the drive is added' % devstr) + + try: + r_ip = new_host.get('repl_ip', new_host['ip']) + r_port = new_host.get('repl_port', new_host['port']) + weight = new_host.get('weight') + + old_r_ip = old_host['replication_ip'] + old_r_port = old_host['replication_port'] + + if r_ip != old_r_ip or r_port != old_r_port: + host_d = {'r_ip': r_ip, 'r_port': r_port} + host_d.update(new_host) + host_str = ( + "%(ip)s:%(port)dR%(r_ip)s:%(r_port)d/%(device)s" % host_d + ) + if not validate: + run_and_wait(rb_main, ["swift-ring-builder", build_file, + "set_info", DEVICE_KEY % new_host, + host_str]) + except Exception as ex: + raise RingValidationError(ex) + + if weight != old_host['weight'] and not validate: + change_host_weight(build_file, DEVICE_KEY % new_host, weight) + + +def add_host_to_ring(build_file, host, validate=False): + host_str = "" + try: + if host.get('region') is not None: + host_str += 'r%(region)d' % host + host_str += "z%d" % (host.get('zone')) + host_str += "-%(ip)s:%(port)d" % host + if host.get('repl_ip'): + r_ip = host['repl_ip'] + r_port = host.get('repl_port', host['port']) + host_str += "R%s:%d" % (r_ip, r_port) + elif host.get('repl_port'): + r_ip = host.get('repl_ip', host['ip']) + r_port = host['repl_port'] + host_str += "R%s:%d" % (r_ip, r_port) + host_str += "/%(device)s" % host + weight = host.get('weight') + except Exception as ex: + raise RingValidationError(ex) + if not validate: + run_and_wait(rb_main, ["swift-ring-builder", build_file, 'add', + host_str, str(weight)]) + + +def run_and_wait(func, *args): + t = threading.Thread(target=func, args=args) + t.start() + return t.join() + + +def get_build_file_data(build_file): + build_file_data = None + if exists(build_file): + try: + with open(build_file) as bf_stream: + build_file_data = pickle.load(bf_stream) + except Exception as ex: + print("Error: failed to load build file '%s': %s" % (build_file, + ex)) + build_file_data = None + return build_file_data + + +def build_ring(build_name, repl, min_part_hours, part_power, hosts, + region=None, validate=False): + # Create the build file + build_file = "%s.builder" % build_name + build_file_data = get_build_file_data(build_file) + + update = build_file_data is not None + create_buildfile( + build_file, + part_power, + repl, + min_part_hours, + update, + data=build_file_data, + validate=validate + ) + + old_hosts = {} + if update: + for i, dev in enumerate(build_file_data['devs']): + if dev is not None: + if region is None or int(region) == int(dev['region']): + old_hosts[DEVICE_KEY % dev] = i + for host in hosts: + host_key = DEVICE_KEY % host + if region is None or int(region) == int(host['region']): + if host_key in old_hosts: + old_host = build_file_data['devs'][old_hosts[host_key]] + update_host_in_ring(build_file, host, old_host, + validate=validate) + old_hosts.pop(host_key) + else: + add_host_to_ring(build_file, host, validate=validate) + + if old_hosts and not validate: + # There are still old hosts, these hosts must've been removed + for host in old_hosts: + remove_host_from_ring(build_file, host) + + # Rebalance ring + if not validate: + if not hosts: + run_and_wait( + rb_main, ["swift-ring-builder", build_file, "write_ring"] + ) + else: + run_and_wait( + rb_main, ["swift-ring-builder", build_file, "rebalance"] + ) + + +def main(setup, region): + # load the json file + try: + with open(setup) as json_stream: + _contents_file = json.load(json_stream) + except Exception as ex: + print("Failed to load json string %s" % ex) + return 1 + + hosts = _contents_file['drives'] + kargs = {'validate': True, 'hosts': hosts, 'region': region} + ring_call = [ + _contents_file['builder_file'], + _contents_file['repl_number'], + _contents_file['min_part_hours'], + _contents_file['part_power'] + ] + + try: + build_ring(*ring_call, **kargs) + except RingValidationError as ex: + print(ex) + return 2 + + # If the validation passes lets go ahead and build the rings. + kargs.pop('validate') + build_ring(*ring_call, **kargs) + + +if __name__ == "__main__": + parser = OptionParser(USAGE) + parser.add_option( + "-f", + "--file", + dest="setup", + help="Specify the swift ring contents file.", + metavar="FILE" + ) + parser.add_option( + "-r", + "--region", + help="Specify the region to manage for the ring file.", + dest="region", + type='int', + metavar="REGION" + ) + + options, _args = parser.parse_args(sys.argv[1:]) + if options.setup and not exists(options.setup): + print("Swift ring contents file not found or doesn't exist") + parser.print_help() + sys.exit(1) + + sys.exit(main(options.setup, options.region)) diff --git a/templates/swift_rings_check.py.j2 b/templates/swift_rings_check.py.j2 new file mode 100644 index 00000000..50ced583 --- /dev/null +++ b/templates/swift_rings_check.py.j2 @@ -0,0 +1,174 @@ +#!{{ swift_venv_enabled | bool | ternary(swift_venv_bin + "/", "/usr/bin/env ") }}python +# Copyright 2014, Rackspace US, Inc. +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. + +from __future__ import print_function +from optparse import OptionParser +from os.path import exists + +import json +import pickle +import sys + +USAGE = "usage: %prog -f -r " + +DEVICE_KEY = "%(ip)s:%(port)d/%(device)s" + + +class RingComparisonError(Exception): + pass + + +def get_build_file_data(build_file): + build_file_data = None + if exists(build_file): + try: + with open(build_file) as bf_stream: + build_file_data = pickle.load(bf_stream) + except Exception as ex: + print("Error: failed to load build file '%s': %s" % (build_file, + ex)) + build_file_data = None + return build_file_data + + +def check_ring_settings(build_file, part_power, repl, min_part_hours, + data=None): + # Check if the build file is emptuy + if data is None: + raise RingComparisonError('Build file %s is empty or does ' + 'not exist.' % build_file) + # Check if replica count matches for contents and ring file + if repl != data.get('replicas'): + raise RingComparisonError('Replica count does not match') + # Check min_part_hours matches for contents and ring file + if min_part_hours != data.get('min_part_hours'): + raise RingComparisonError('min_part_hours does not match') + # Check part_power matches for contents and ring file + if part_power != data.get('part_power'): + raise RingComparisonError('part_power does not match') + + +def check_host_settings(content_host, ring_host): + devstr = DEVICE_KEY % content_host + if content_host.get('zone', 0) != ring_host['zone']: + raise RingComparisonError('Zone on device %s differs to the ring.' + % devstr) + if content_host.get('region', 1) != ring_host['region']: + raise RingComparisonError('Region on device %s differs to the ring.' + % devstr) + + content_repl_ip = content_host.get('repl_ip', content_host['ip']) + content_repl_port = content_host.get('repl_port', content_host['port']) + content_weight = content_host.get('weight') + ring_repl_ip = ring_host['replication_ip'] + ring_repl_port = ring_host['replication_port'] + ring_weight = ring_host['weight'] + if content_repl_ip != ring_repl_ip: + raise RingComparisonError('Replication IP for device %s differs ' + 'to the ring.' % devstr) + if content_repl_port != ring_repl_port: + raise RingComparisonError('Replication Port for device %s differs ' + 'to the ring.' % devstr) + if content_weight != ring_weight: + raise RingComparisonError('Device weight for device %s differs to the ' + 'ring.' % devstr) + + +def check_ring(build_name, repl, min_part_hours, part_power, content_hosts, + region=None): + build_file = "%s.builder" % build_name + build_file_data = get_build_file_data(build_file) + check_ring_settings( + build_file, + part_power, + repl, + min_part_hours, + data=build_file_data + ) + + ring_hosts = {} + for i, dev in enumerate(build_file_data['devs']): + if dev is not None: + if region is None or int(region) == int(dev['region']): + ring_hosts[DEVICE_KEY % dev] = i + for content_host in content_hosts: + host_key = DEVICE_KEY % content_host + if region is None or int(region) == int(content_host['region']): + if host_key in ring_hosts: + ring_host = build_file_data['devs'][ring_hosts[host_key]] + check_host_settings(content_host, ring_host) + ring_hosts.pop(host_key) + else: + raise RingComparisonError('Device %s is not in the ring.' + % host_key) + + if ring_hosts: + for ring_host in ring_hosts: + if build_file_data['devs'][ring_hosts[ring_host]]['weight'] != 0: + raise RingComparisonError('There are devices in the ring that' + ' are not in the inventory/contents' + ' file.') + + +def main(setup, region): + # load the json file + try: + with open(setup) as json_stream: + _contents_file = json.load(json_stream) + except Exception as ex: + print("Failed to load json string %s" % ex) + return 1 + + content_hosts = _contents_file['drives'] + kargs = {'content_hosts': content_hosts, 'region': region} + ring_call = [ + _contents_file['builder_file'], + _contents_file['repl_number'], + _contents_file['min_part_hours'], + _contents_file['part_power'] + ] + + try: + check_ring(*ring_call, **kargs) + print('SUCCESS: Ring is consistent with contents file') + except RingComparisonError as ex: + print(ex) + return 2 + +if __name__ == "__main__": + parser = OptionParser(USAGE) + parser.add_option( + "-f", + "--file", + dest="setup", + help="Specify the swift ring contents file.", + metavar="FILE" + ) + parser.add_option( + "-r", + "--region", + help="Specify the region to manage for the ring file.", + dest="region", + type='int', + metavar="REGION" + ) + + options, _args = parser.parse_args(sys.argv[1:]) + if options.setup and not exists(options.setup): + print("Swift ring contents file not found or doesn't exist") + parser.print_help() + sys.exit(1) + + sys.exit(main(options.setup, options.region)) diff --git a/tests/ansible-role-requirements.yml b/tests/ansible-role-requirements.yml index ca539d00..ff63a68f 100644 --- a/tests/ansible-role-requirements.yml +++ b/tests/ansible-role-requirements.yml @@ -50,7 +50,3 @@ src: https://git.openstack.org/openstack/openstack-ansible-os_keystone scm: git version: master -- name: os_swift_sync - src: https://git.openstack.org/openstack/openstack-ansible-os_swift_sync - scm: git - version: master diff --git a/tests/test.yml b/tests/test.yml index 3c2170a2..b7f4061d 100644 --- a/tests/test.yml +++ b/tests/test.yml @@ -296,7 +296,6 @@ gather_facts: true roles: - role: "{{ rolename | basename }}" - - role: "os_swift_sync" vars: swift: storage_network: eth0 diff --git a/tox.ini b/tox.ini index 949d9d51..d742e415 100644 --- a/tox.ini +++ b/tox.ini @@ -64,6 +64,9 @@ commands = # unable to detect undefined names # H303 No wildcard (*) import. ignore=F403,H303 +# The max-line-length is being set at a greater width in order to accommodate +# jinja templating in python files, especially in the shebang. +max-line-length = 120 [testenv:bashate]