Bring consistency to tags
Some tags were not applied on the highest level and forced duplication. We apply here our practices to have role_name-(config|install) [1]. [1]: http://docs.openstack.org/developer/openstack-ansible/developer-docs/contribute.html#ansible-style-guide Change-Id: I1cfb335307bc63e6c962c8bdbcb420b03c10f531
This commit is contained in:
parent
4615ef44cf
commit
7e2db5362d
@ -23,9 +23,9 @@ Example Playbook
|
|||||||
Tags
|
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
|
The ``swift-config`` tag can be used to maintain configuration of the
|
||||||
service.
|
service, and do runtime operations.
|
||||||
|
@ -71,7 +71,6 @@
|
|||||||
- inventory_hostname in groups['swift_hosts']
|
- inventory_hostname in groups['swift_hosts']
|
||||||
- swift_do_setup | bool
|
- swift_do_setup | bool
|
||||||
tags:
|
tags:
|
||||||
- swift-install
|
|
||||||
- swift-config
|
- swift-config
|
||||||
|
|
||||||
- include: swift_proxy_hosts.yml
|
- include: swift_proxy_hosts.yml
|
||||||
@ -80,11 +79,10 @@
|
|||||||
- swift_do_setup | bool
|
- swift_do_setup | bool
|
||||||
tags:
|
tags:
|
||||||
- swift-config
|
- swift-config
|
||||||
- swift-install
|
|
||||||
|
|
||||||
- include: swift_init_common.yml
|
- include: swift_init_common.yml
|
||||||
tags:
|
tags:
|
||||||
- swift-install
|
- swift-config
|
||||||
|
|
||||||
- include: swift_service_setup.yml
|
- include: swift_service_setup.yml
|
||||||
when:
|
when:
|
||||||
@ -92,7 +90,7 @@
|
|||||||
- '"keystoneauth" in swift_middleware_list'
|
- '"keystoneauth" in swift_middleware_list'
|
||||||
- swift_do_setup | bool
|
- swift_do_setup | bool
|
||||||
tags:
|
tags:
|
||||||
- swift-install
|
- swift-config
|
||||||
|
|
||||||
- include: swift_key_setup.yml
|
- include: swift_key_setup.yml
|
||||||
static: no
|
static: no
|
||||||
@ -104,8 +102,8 @@
|
|||||||
static: no
|
static: no
|
||||||
when: swift_do_sync | bool
|
when: swift_do_sync | bool
|
||||||
tags:
|
tags:
|
||||||
- swift-install
|
|
||||||
- swift-config
|
- swift-config
|
||||||
|
- swift-rings
|
||||||
|
|
||||||
- name: Flush handlers
|
- name: Flush handlers
|
||||||
meta: flush_handlers
|
meta: flush_handlers
|
||||||
@ -116,4 +114,4 @@
|
|||||||
- swift_do_sync | bool
|
- swift_do_sync | bool
|
||||||
- not swift_do_setup | bool
|
- not swift_do_setup | bool
|
||||||
tags:
|
tags:
|
||||||
- always
|
- swift-config
|
||||||
|
@ -46,8 +46,6 @@
|
|||||||
config_overrides: "{{ swift_proxy_server_conf_overrides }}"
|
config_overrides: "{{ swift_proxy_server_conf_overrides }}"
|
||||||
config_type: "ini"
|
config_type: "ini"
|
||||||
notify: Restart swift services
|
notify: Restart swift services
|
||||||
tags:
|
|
||||||
- swift-config
|
|
||||||
|
|
||||||
# If we've specified a container-sync realm use container-sync-realms.conf
|
# If we've specified a container-sync realm use container-sync-realms.conf
|
||||||
- name: "Swift container-sync configuration"
|
- name: "Swift container-sync configuration"
|
||||||
@ -62,5 +60,3 @@
|
|||||||
when: >
|
when: >
|
||||||
swift_container_sync_realms is defined
|
swift_container_sync_realms is defined
|
||||||
notify: Restart swift services
|
notify: Restart swift services
|
||||||
tags:
|
|
||||||
- swift-config
|
|
||||||
|
@ -20,6 +20,8 @@
|
|||||||
owner: "{{ swift_system_user_name }}"
|
owner: "{{ swift_system_user_name }}"
|
||||||
group: "{{ swift_system_group_name }}"
|
group: "{{ swift_system_group_name }}"
|
||||||
mode: "0700"
|
mode: "0700"
|
||||||
|
tags:
|
||||||
|
- swift-install
|
||||||
|
|
||||||
- name: "Build ring-contents files"
|
- name: "Build ring-contents files"
|
||||||
template:
|
template:
|
||||||
|
@ -36,6 +36,8 @@
|
|||||||
owner: "{{ swift_system_user_name }}"
|
owner: "{{ swift_system_user_name }}"
|
||||||
group: "{{ swift_system_group_name }}"
|
group: "{{ swift_system_group_name }}"
|
||||||
mode: "0700"
|
mode: "0700"
|
||||||
|
tags:
|
||||||
|
- swift-install
|
||||||
|
|
||||||
- name: "Ensure contents file matches ring after ring sync for account/container"
|
- 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 %}"
|
command: "/etc/swift/scripts/swift_rings_check.py -f /etc/swift/scripts/{{ item[0] }}.contents{% if item[1] %} -r {{ item[1] }} {% endif %}"
|
||||||
|
Loading…
x
Reference in New Issue
Block a user