openstack/openstack-ansible
Code Issues Proposed changes

Allow swift_vars to not be specified for swift_hosts

Browse Source 
* Default swift_vars to an empty list when undefined
* Allows default to work as expected.
* Avoids failures based on swift_vars not existing (even though values were already defaulted)
* Using default statements fail if the "parent" var doesn't exist.

Change-Id: I27eb876a1a0110bfe5cb44150c7c2a96c4313f60
Closes-Bug: #1402594
This commit is contained in:
Andy McCrae 2014-12-15 17:19:40 +00:00
parent 198645cd2c
commit 7f595aa057
2 changed files with 22 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
rpc_deployment/roles/swift_ring_builder/templates/ring.contents.j2
View File

@ -54,23 +54,30 @@
{% 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 = hostvars[host]['swift_vars']['drives'] | default(swift.drives | 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(hostvars[host]['swift_vars']['groups'] | default(swift.groups | default(def_groups))) %}
{% 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(hostvars[host]['swift_vars']['weight'] | default(swift.weight | default(swift_default_drive_weight))) %}
{% set region = drive.region | default(hostvars[host]['swift_vars']['region'] | default(swift.region | default(swift_default_host_region))) %}
{% set zone = drive.zone | default(hostvars[host]['swift_vars']['zone'] | default(swift.zone | default(swift_default_host_zone))) %}
{% set repl_ip = drive.repl_ip | default( hostvars[host]['swift_vars']['repl_ip'] | default(def_repl_ip)) %}
{% set repl_port = drive.repl_port | default((hostvars[host]['swift_vars']['repl_port']) | default(port)) %}
{% set storage_ip = drive.storage_ip | default(hostvars[host]['swift_vars']['storage_ip'] | default(def_storage_ip)) %}
{% set storage_port = drive.storage_port | default((hostvars[host]['swift_vars']['storage_port']) | default(port)) %}
{% 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}) %}

6
rpc_deployment/roles/swift_storage_setup/tasks/main.yml
View File

@ -13,6 +13,12 @@
# See the License for the specific language governing permissions and
# limitations under the License.
# We need swift_vars to exist for the "swift_vars.drives is defined check" to work
- name: "Set swift_vars if undefined"
set_fact:
swift_vars: "{}"
when: swift_vars is not defined
- include: rsync_setup.yml
- include: swift_recon_cron.yml