Cleanup/standardize usage of tags

The numerous tags within the role have been condensed
to two tags: designate-install and designate-config

These tags have been chosen as they are namespaced
and cover the two major functions of the role.

Documentation has been updated to inform how each tag
influences the function of the role.

Change-Id: I700b80bce2a8a761d341ca9cdc51398328966287
This commit is contained in:
Travis Truman 2016-07-13 14:24:19 -04:00
parent 8541a47aa9
commit 5be3ecff03
9 changed files with 26 additions and 103 deletions

View File

@ -5,7 +5,7 @@ OpenStack-Ansible Designate
This Ansible role installs and configures OpenStack Designate. This Ansible role installs and configures OpenStack Designate.
This role will install the following Upstart services: This role will install the following services:
* designate-api * designate-api
* designate-central * designate-central
* designate-pool-manager * designate-pool-manager
@ -50,3 +50,12 @@ Example Playbook
designate_service_password: "SuperSecretePassword3" designate_service_password: "SuperSecretePassword3"
designate_rabbitmq_password: "SuperSecretePassword4" designate_rabbitmq_password: "SuperSecretePassword4"
Tags
====
This role supports two tags: ``designate-install`` and ``designate-config``
The ``designate-install`` tag can be used to install and upgrade.
The ``designate-config`` tag can be used to maintain configuration of the
service.

View File

@ -17,14 +17,8 @@
command: "{{ designate_bin }}/designate-manage database sync" command: "{{ designate_bin }}/designate-manage database sync"
become: yes become: yes
become_user: "{{ designate_system_user_name }}" become_user: "{{ designate_system_user_name }}"
tags:
- designate-db-sync
- designate-setup
- name: Perform a Designate Pool Manager Cache sync - name: Perform a Designate Pool Manager Cache sync
command: "{{ designate_bin }}/designate-manage pool-manager-cache sync" command: "{{ designate_bin }}/designate-manage pool-manager-cache sync"
become: yes become: yes
become_user: "{{ designate_system_user_name }}" become_user: "{{ designate_system_user_name }}"
tags:
- designate-db-sync
- designate-setup

View File

@ -21,8 +21,6 @@
system_group: "{{ designate_system_group_name }}" system_group: "{{ designate_system_group_name }}"
service_home: "{{ designate_system_user_home }}" service_home: "{{ designate_system_user_home }}"
when: inventory_hostname in groups['designate_api'] when: inventory_hostname in groups['designate_api']
tags:
- designate-api-init
- include: designate_init_common.yml - include: designate_init_common.yml
vars: vars:
@ -32,8 +30,6 @@
system_group: "{{ designate_system_group_name }}" system_group: "{{ designate_system_group_name }}"
service_home: "{{ designate_system_user_home }}" service_home: "{{ designate_system_user_home }}"
when: inventory_hostname in groups['designate_central'] when: inventory_hostname in groups['designate_central']
tags:
- designate-central-init
- include: designate_init_common.yml - include: designate_init_common.yml
vars: vars:
@ -43,8 +39,6 @@
system_group: "{{ designate_system_group_name }}" system_group: "{{ designate_system_group_name }}"
service_home: "{{ designate_system_user_home }}" service_home: "{{ designate_system_user_home }}"
when: inventory_hostname in groups['designate_pool_manager'] when: inventory_hostname in groups['designate_pool_manager']
tags:
- designate-pool-manager-init
- include: designate_init_common.yml - include: designate_init_common.yml
vars: vars:
@ -54,8 +48,6 @@
system_group: "{{ designate_system_group_name }}" system_group: "{{ designate_system_group_name }}"
service_home: "{{ designate_system_user_home }}" service_home: "{{ designate_system_user_home }}"
when: inventory_hostname in groups['designate_zone_manager'] when: inventory_hostname in groups['designate_zone_manager']
tags:
- designate-zone-manager-init
- include: designate_init_common.yml - include: designate_init_common.yml
vars: vars:
@ -65,8 +57,6 @@
system_group: "{{ designate_system_group_name }}" system_group: "{{ designate_system_group_name }}"
service_home: "{{ designate_system_user_home }}" service_home: "{{ designate_system_user_home }}"
when: inventory_hostname in groups['designate_mdns'] when: inventory_hostname in groups['designate_mdns']
tags:
- designate-mdns-init
- include: designate_init_common.yml - include: designate_init_common.yml
vars: vars:
@ -76,7 +66,5 @@
system_group: "{{ designate_system_group_name }}" system_group: "{{ designate_system_group_name }}"
service_home: "{{ designate_system_user_home }}" service_home: "{{ designate_system_user_home }}"
when: inventory_hostname in groups['designate_sink'] when: inventory_hostname in groups['designate_sink']
tags:
- designate-sink-init

View File

@ -15,13 +15,9 @@
- include: designate_init_upstart.yml - include: designate_init_upstart.yml
when: pid1_name == "init" when: pid1_name == "init"
tags:
- designate-init
- include: designate_init_systemd.yml - include: designate_init_systemd.yml
when: pid1_name == "systemd" when: pid1_name == "systemd"
tags:
- designate-init
- name: Load service - name: Load service
service: service:

View File

@ -16,9 +16,6 @@
- include: designate_install_apt.yml - include: designate_install_apt.yml
when: when:
- ansible_pkg_mgr == 'apt' - ansible_pkg_mgr == 'apt'
tags:
- designate-install
- designate-apt-packages
- name: Create developer mode constraint file - name: Create developer mode constraint file
copy: copy:
@ -29,9 +26,6 @@
{% endfor %} {% endfor %}
when: when:
- designate_developer_mode | bool - designate_developer_mode | bool
tags:
- designate-install
- designate-pip-packages
- name: Clone requirements git repository - name: Clone requirements git repository
git: git:
@ -42,27 +36,18 @@
version: "{{ designate_requirements_git_install_branch }}" version: "{{ designate_requirements_git_install_branch }}"
when: when:
- designate_developer_mode | bool - designate_developer_mode | bool
tags:
- designate-install
- designate-pip-packages
- name: Add constraints to pip_install_options fact for developer mode - name: Add constraints to pip_install_options fact for developer mode
set_fact: set_fact:
pip_install_options_fact: "{{ pip_install_options|default('') }} --constraint /opt/developer-pip-constraints.txt --constraint /opt/requirements/upper-constraints.txt" pip_install_options_fact: "{{ pip_install_options|default('') }} --constraint /opt/developer-pip-constraints.txt --constraint /opt/requirements/upper-constraints.txt"
when: when:
- designate_developer_mode | bool - designate_developer_mode | bool
tags:
- designate-install
- designate-pip-packages
- name: Set pip_install_options_fact when not in developer mode - name: Set pip_install_options_fact when not in developer mode
set_fact: set_fact:
pip_install_options_fact: "{{ pip_install_options|default('') }}" pip_install_options_fact: "{{ pip_install_options|default('') }}"
when: when:
- not designate_developer_mode | bool - not designate_developer_mode | bool
tags:
- designate-install
- designate-pip-packages
- name: Install requires pip packages - name: Install requires pip packages
pip: pip:
@ -74,9 +59,6 @@
retries: 5 retries: 5
delay: 2 delay: 2
with_items: "{{ designate_requires_pip_packages }}" with_items: "{{ designate_requires_pip_packages }}"
tags:
- designate-install
- designate-pip-packages
- name: Get local venv checksum - name: Get local venv checksum
stat: stat:
@ -85,9 +67,6 @@
when: when:
- not designate_developer_mode | bool - not designate_developer_mode | bool
register: local_venv_stat register: local_venv_stat
tags:
- designate-install
- designate-pip-packages
- name: Get remote venv checksum - name: Get remote venv checksum
uri: uri:
@ -96,9 +75,6 @@
when: when:
- not designate_developer_mode | bool - not designate_developer_mode | bool
register: remote_venv_checksum register: remote_venv_checksum
tags:
- designate-install
- designate-pip-packages
# TODO: When project moves to ansible 2 we can pass this a sha256sum which will: # TODO: When project moves to ansible 2 we can pass this a sha256sum which will:
# a) allow us to remove force: yes # a) allow us to remove force: yes
@ -116,16 +92,10 @@
- not designate_developer_mode | bool - not designate_developer_mode | bool
- (local_venv_stat.stat.exists == False or - (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 }}) {{ local_venv_stat.stat.checksum is defined and local_venv_stat.stat.checksum != remote_venv_checksum.content | trim }})
tags:
- designate-install
- designate-pip-packages
- name: Set designate get_venv fact - name: Set designate get_venv fact
set_fact: set_fact:
designate_get_venv: "{{ get_venv }}" designate_get_venv: "{{ get_venv }}"
tags:
- designate-install
- designate-pip-packages
- name: Remove existing venv - name: Remove existing venv
file: file:
@ -133,9 +103,6 @@
state: absent state: absent
when: when:
- designate_get_venv | changed - designate_get_venv | changed
tags:
- designate-install
- designate-pip-packages
- name: Create designate venv dir - name: Create designate venv dir
file: file:
@ -145,9 +112,6 @@
when: when:
- not designate_developer_mode | bool - not designate_developer_mode | bool
- designate_get_venv | changed - designate_get_venv | changed
tags:
- designate-install
- designate-pip-packages
- name: Unarchive pre-built venv - name: Unarchive pre-built venv
unarchive: unarchive:
@ -159,9 +123,6 @@
- designate_get_venv | changed or designate_venv_dir | changed - designate_get_venv | changed or designate_venv_dir | changed
notify: notify:
- Restart designate services - Restart designate services
tags:
- designate-install
- designate-pip-packages
- name: Install pip packages - name: Install pip packages
pip: pip:
@ -179,9 +140,6 @@
- designate_get_venv | failed or designate_developer_mode | bool - designate_get_venv | failed or designate_developer_mode | bool
notify: notify:
- Restart designate services - Restart designate services
tags:
- designate-install
- designate-pip-packages
- name: Update virtualenv path - name: Update virtualenv path
command: > command: >
@ -189,6 +147,3 @@
when: when:
- not designate_developer_mode | bool - not designate_developer_mode | bool
- designate_get_venv | success - designate_get_venv | success
tags:
- designate-install
- designate-pip-packages

View File

@ -42,9 +42,6 @@
config_overrides: "{{ designate_rootwrap_conf_overrides }}" config_overrides: "{{ designate_rootwrap_conf_overrides }}"
config_type: "ini" config_type: "ini"
notify: Restart designate services notify: Restart designate services
tags:
- designate-config
- designate-post-install
- name: Copy designate rootwrap filter config - name: Copy designate rootwrap filter config
copy: copy:
@ -53,6 +50,3 @@
owner: "root" owner: "root"
group: "root" group: "root"
notify: Restart designate services notify: Restart designate services
tags:
- designate-config
- designate-post-install

View File

@ -18,8 +18,6 @@
name: "{{ designate_system_group_name }}" name: "{{ designate_system_group_name }}"
state: "present" state: "present"
system: "yes" system: "yes"
tags:
- designate-group
- name: Create the designate system user - name: Create the designate system user
user: user:
@ -30,8 +28,6 @@
system: "yes" system: "yes"
createhome: "yes" createhome: "yes"
home: "{{ designate_system_user_home }}" home: "{{ designate_system_user_home }}"
tags:
- designate-user
- name: Create designate dir - name: Create designate dir
file: file:
@ -47,8 +43,6 @@
- { path: "{{ designate_system_user_home }}" } - { path: "{{ designate_system_user_home }}" }
- { path: "{{ designate_system_user_home }}/.ssh", mode: "0700" } - { path: "{{ designate_system_user_home }}/.ssh", mode: "0700" }
- { path: "/var/cache/designate", mode: "0700" } - { path: "/var/cache/designate", mode: "0700" }
tags:
- designate-dirs
- name: Test for log directory or link - name: Test for log directory or link
shell: | shell: |
@ -61,9 +55,6 @@
register: log_dir register: log_dir
failed_when: false failed_when: false
changed_when: log_dir.rc != 0 changed_when: log_dir.rc != 0
tags:
- designate-dirs
- designate-logs
- name: Create designate log dir - name: Create designate log dir
file: file:
@ -73,9 +64,6 @@
group: "{{ designate_system_group_name }}" group: "{{ designate_system_group_name }}"
mode: "0755" mode: "0755"
when: log_dir.rc != 0 when: log_dir.rc != 0
tags:
- designate-dirs
- designate-logs
- name: Drop sudoers file - name: Drop sudoers file
template: template:
@ -84,6 +72,3 @@
mode: "0440" mode: "0440"
owner: "root" owner: "root"
group: "root" group: "root"
tags:
- sudoers
- designate-sudoers

View File

@ -28,9 +28,6 @@
until: add_service|success until: add_service|success
retries: 5 retries: 5
delay: 2 delay: 2
tags:
- designate-setup
- designate-service-add
- name: Ensure designate user - name: Ensure designate user
keystone: keystone:
@ -48,9 +45,6 @@
until: add_service|success until: add_service|success
retries: 5 retries: 5
delay: 10 delay: 10
tags:
- designate-setup
- designate-service-add
- name: Ensure designate user to admin role - name: Ensure designate user to admin role
keystone: keystone:
@ -68,11 +62,6 @@
until: add_service|success until: add_service|success
retries: 5 retries: 5
delay: 10 delay: 10
tags:
- designate-api-setup
- designate-service-add
- designate-setup
# Create an endpoint # Create an endpoint
- name: Ensure designate endpoint - name: Ensure designate endpoint
@ -97,6 +86,3 @@
until: add_service|success until: add_service|success
retries: 5 retries: 5
delay: 10 delay: 10
tags:
- designate-setup
- designate-service-add

View File

@ -36,17 +36,33 @@
- always - always
- include: designate_pre_install.yml - include: designate_pre_install.yml
tags:
- designate-install
- include: designate_install.yml - include: designate_install.yml
tags:
- designate-install
- include: designate_post_install.yml - include: designate_post_install.yml
tags:
- designate-install
- designate-config
- include: designate_init.yml - include: designate_init.yml
tags:
- designate-install
- include: designate_db_setup.yml - include: designate_db_setup.yml
when: > when: >
inventory_hostname == groups['designate_all'][0] inventory_hostname == groups['designate_all'][0]
tags:
- designate-install
- include: designate_service_setup.yml - include: designate_service_setup.yml
when: > when: >
inventory_hostname == groups['designate_all'][0] inventory_hostname == groups['designate_all'][0]
tags:
- designate-install
- name: Flush handlers - name: Flush handlers
meta: flush_handlers meta: flush_handlers