Merge "Bring consistency to tags"

doc/source/index.rst

@@ -23,9 +23,9 @@ Example Playbook
 Tags
 ^^^^
 
-This role supports two tags: ``swift-install`` and ``swift-config``
+This role supports two tags: ``swift-install`` and ``swift-config``.
 
-The ``swift-install`` tag can be used to install and upgrade.
+The ``swift-install`` tag can be used to install the software.
 
 The ``swift-config`` tag can be used to maintain configuration of the
-service.
+service, and do runtime operations.

tasks/main.yml

@@ -71,7 +71,6 @@
     - inventory_hostname in groups['swift_hosts']
     - swift_do_setup | bool
   tags:
-    - swift-install
     - swift-config
 
 - include: swift_proxy_hosts.yml
@@ -80,11 +79,10 @@
     - swift_do_setup | bool
   tags:
     - swift-config
-    - swift-install
 
 - include: swift_init_common.yml
   tags:
-    - swift-install
+    - swift-config
 
 - include: swift_service_setup.yml
   when:
@@ -92,7 +90,7 @@
     - '"keystoneauth" in swift_middleware_list'
     - swift_do_setup | bool
   tags:
-    - swift-install
+    - swift-config
 
 - include: swift_key_setup.yml
   static: no
@@ -104,8 +102,8 @@
   static: no
   when: swift_do_sync | bool
   tags:
-    - swift-install
     - swift-config
+    - swift-rings
 
 - name: Flush handlers
   meta: flush_handlers
@@ -116,4 +114,4 @@
    - swift_do_sync | bool
    - not swift_do_setup | bool
   tags:
-    - always
+    - swift-config

tasks/swift_proxy_hosts.yml

@@ -46,8 +46,6 @@
     config_overrides: "{{ swift_proxy_server_conf_overrides }}"
     config_type: "ini"
   notify: Restart swift services
-  tags:
-    - swift-config
 
 # If we've specified a container-sync realm use container-sync-realms.conf
 - name: "Swift container-sync configuration"
@@ -62,5 +60,3 @@
   when: >
     swift_container_sync_realms is defined
   notify: Restart swift services
-  tags:
-    - swift-config

tasks/swift_rings_build.yml

@@ -20,6 +20,8 @@
     owner: "{{ swift_system_user_name }}"
     group: "{{ swift_system_group_name }}"
     mode: "0700"
+  tags:
+    - swift-install
 
 - name: "Build ring-contents files"
   template:

tasks/swift_rings_post_distribution_check.yml

@@ -36,6 +36,8 @@
     owner: "{{ swift_system_user_name }}"
     group: "{{ swift_system_group_name }}"
     mode: "0700"
+  tags:
+    - swift-install
 
 - 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 %}"