From 5be3ecff031452593e3b7423016f6b699fd148f8 Mon Sep 17 00:00:00 2001 From: Travis Truman Date: Wed, 13 Jul 2016 14:24:19 -0400 Subject: [PATCH] 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 --- README.rst | 11 +++++++- tasks/designate_db_setup.yml | 6 ----- tasks/designate_init.yml | 12 --------- tasks/designate_init_common.yml | 4 --- tasks/designate_install.yml | 45 ------------------------------- tasks/designate_post_install.yml | 6 ----- tasks/designate_pre_install.yml | 15 ----------- tasks/designate_service_setup.yml | 14 ---------- tasks/main.yml | 16 +++++++++++ 9 files changed, 26 insertions(+), 103 deletions(-) diff --git a/README.rst b/README.rst index a632047..0e62bf6 100644 --- a/README.rst +++ b/README.rst @@ -5,7 +5,7 @@ OpenStack-Ansible 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-central * designate-pool-manager @@ -50,3 +50,12 @@ Example Playbook designate_service_password: "SuperSecretePassword3" 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. diff --git a/tasks/designate_db_setup.yml b/tasks/designate_db_setup.yml index e646a2f..d4e0e61 100644 --- a/tasks/designate_db_setup.yml +++ b/tasks/designate_db_setup.yml @@ -17,14 +17,8 @@ command: "{{ designate_bin }}/designate-manage database sync" become: yes become_user: "{{ designate_system_user_name }}" - tags: - - designate-db-sync - - designate-setup - name: Perform a Designate Pool Manager Cache sync command: "{{ designate_bin }}/designate-manage pool-manager-cache sync" become: yes become_user: "{{ designate_system_user_name }}" - tags: - - designate-db-sync - - designate-setup diff --git a/tasks/designate_init.yml b/tasks/designate_init.yml index 6aff94e..3ce3aff 100644 --- a/tasks/designate_init.yml +++ b/tasks/designate_init.yml @@ -21,8 +21,6 @@ system_group: "{{ designate_system_group_name }}" service_home: "{{ designate_system_user_home }}" when: inventory_hostname in groups['designate_api'] - tags: - - designate-api-init - include: designate_init_common.yml vars: @@ -32,8 +30,6 @@ system_group: "{{ designate_system_group_name }}" service_home: "{{ designate_system_user_home }}" when: inventory_hostname in groups['designate_central'] - tags: - - designate-central-init - include: designate_init_common.yml vars: @@ -43,8 +39,6 @@ system_group: "{{ designate_system_group_name }}" service_home: "{{ designate_system_user_home }}" when: inventory_hostname in groups['designate_pool_manager'] - tags: - - designate-pool-manager-init - include: designate_init_common.yml vars: @@ -54,8 +48,6 @@ system_group: "{{ designate_system_group_name }}" service_home: "{{ designate_system_user_home }}" when: inventory_hostname in groups['designate_zone_manager'] - tags: - - designate-zone-manager-init - include: designate_init_common.yml vars: @@ -65,8 +57,6 @@ system_group: "{{ designate_system_group_name }}" service_home: "{{ designate_system_user_home }}" when: inventory_hostname in groups['designate_mdns'] - tags: - - designate-mdns-init - include: designate_init_common.yml vars: @@ -76,7 +66,5 @@ system_group: "{{ designate_system_group_name }}" service_home: "{{ designate_system_user_home }}" when: inventory_hostname in groups['designate_sink'] - tags: - - designate-sink-init diff --git a/tasks/designate_init_common.yml b/tasks/designate_init_common.yml index 7885bba..f5ddee6 100644 --- a/tasks/designate_init_common.yml +++ b/tasks/designate_init_common.yml @@ -15,13 +15,9 @@ - include: designate_init_upstart.yml when: pid1_name == "init" - tags: - - designate-init - include: designate_init_systemd.yml when: pid1_name == "systemd" - tags: - - designate-init - name: Load service service: diff --git a/tasks/designate_install.yml b/tasks/designate_install.yml index 6a67e62..fadc03e 100644 --- a/tasks/designate_install.yml +++ b/tasks/designate_install.yml @@ -16,9 +16,6 @@ - include: designate_install_apt.yml when: - ansible_pkg_mgr == 'apt' - tags: - - designate-install - - designate-apt-packages - name: Create developer mode constraint file copy: @@ -29,9 +26,6 @@ {% endfor %} when: - designate_developer_mode | bool - tags: - - designate-install - - designate-pip-packages - name: Clone requirements git repository git: @@ -42,27 +36,18 @@ version: "{{ designate_requirements_git_install_branch }}" when: - designate_developer_mode | bool - tags: - - designate-install - - designate-pip-packages - name: Add constraints to pip_install_options fact for developer mode set_fact: pip_install_options_fact: "{{ pip_install_options|default('') }} --constraint /opt/developer-pip-constraints.txt --constraint /opt/requirements/upper-constraints.txt" when: - designate_developer_mode | bool - tags: - - designate-install - - designate-pip-packages - name: Set pip_install_options_fact when not in developer mode set_fact: pip_install_options_fact: "{{ pip_install_options|default('') }}" when: - not designate_developer_mode | bool - tags: - - designate-install - - designate-pip-packages - name: Install requires pip packages pip: @@ -74,9 +59,6 @@ retries: 5 delay: 2 with_items: "{{ designate_requires_pip_packages }}" - tags: - - designate-install - - designate-pip-packages - name: Get local venv checksum stat: @@ -85,9 +67,6 @@ when: - not designate_developer_mode | bool register: local_venv_stat - tags: - - designate-install - - designate-pip-packages - name: Get remote venv checksum uri: @@ -96,9 +75,6 @@ when: - not designate_developer_mode | bool 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: # a) allow us to remove force: yes @@ -116,16 +92,10 @@ - not designate_developer_mode | bool - (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 }}) - tags: - - designate-install - - designate-pip-packages - name: Set designate get_venv fact set_fact: designate_get_venv: "{{ get_venv }}" - tags: - - designate-install - - designate-pip-packages - name: Remove existing venv file: @@ -133,9 +103,6 @@ state: absent when: - designate_get_venv | changed - tags: - - designate-install - - designate-pip-packages - name: Create designate venv dir file: @@ -145,9 +112,6 @@ when: - not designate_developer_mode | bool - designate_get_venv | changed - tags: - - designate-install - - designate-pip-packages - name: Unarchive pre-built venv unarchive: @@ -159,9 +123,6 @@ - designate_get_venv | changed or designate_venv_dir | changed notify: - Restart designate services - tags: - - designate-install - - designate-pip-packages - name: Install pip packages pip: @@ -179,9 +140,6 @@ - designate_get_venv | failed or designate_developer_mode | bool notify: - Restart designate services - tags: - - designate-install - - designate-pip-packages - name: Update virtualenv path command: > @@ -189,6 +147,3 @@ when: - not designate_developer_mode | bool - designate_get_venv | success - tags: - - designate-install - - designate-pip-packages \ No newline at end of file diff --git a/tasks/designate_post_install.yml b/tasks/designate_post_install.yml index 45413b3..e3b3e8e 100644 --- a/tasks/designate_post_install.yml +++ b/tasks/designate_post_install.yml @@ -42,9 +42,6 @@ config_overrides: "{{ designate_rootwrap_conf_overrides }}" config_type: "ini" notify: Restart designate services - tags: - - designate-config - - designate-post-install - name: Copy designate rootwrap filter config copy: @@ -53,6 +50,3 @@ owner: "root" group: "root" notify: Restart designate services - tags: - - designate-config - - designate-post-install diff --git a/tasks/designate_pre_install.yml b/tasks/designate_pre_install.yml index b697cf5..b6ff591 100644 --- a/tasks/designate_pre_install.yml +++ b/tasks/designate_pre_install.yml @@ -18,8 +18,6 @@ name: "{{ designate_system_group_name }}" state: "present" system: "yes" - tags: - - designate-group - name: Create the designate system user user: @@ -30,8 +28,6 @@ system: "yes" createhome: "yes" home: "{{ designate_system_user_home }}" - tags: - - designate-user - name: Create designate dir file: @@ -47,8 +43,6 @@ - { path: "{{ designate_system_user_home }}" } - { path: "{{ designate_system_user_home }}/.ssh", mode: "0700" } - { path: "/var/cache/designate", mode: "0700" } - tags: - - designate-dirs - name: Test for log directory or link shell: | @@ -61,9 +55,6 @@ register: log_dir failed_when: false changed_when: log_dir.rc != 0 - tags: - - designate-dirs - - designate-logs - name: Create designate log dir file: @@ -73,9 +64,6 @@ group: "{{ designate_system_group_name }}" mode: "0755" when: log_dir.rc != 0 - tags: - - designate-dirs - - designate-logs - name: Drop sudoers file template: @@ -84,6 +72,3 @@ mode: "0440" owner: "root" group: "root" - tags: - - sudoers - - designate-sudoers diff --git a/tasks/designate_service_setup.yml b/tasks/designate_service_setup.yml index 0539941..d3d8849 100644 --- a/tasks/designate_service_setup.yml +++ b/tasks/designate_service_setup.yml @@ -28,9 +28,6 @@ until: add_service|success retries: 5 delay: 2 - tags: - - designate-setup - - designate-service-add - name: Ensure designate user keystone: @@ -48,9 +45,6 @@ until: add_service|success retries: 5 delay: 10 - tags: - - designate-setup - - designate-service-add - name: Ensure designate user to admin role keystone: @@ -68,11 +62,6 @@ until: add_service|success retries: 5 delay: 10 - tags: - - designate-api-setup - - designate-service-add - - designate-setup - # Create an endpoint - name: Ensure designate endpoint @@ -97,6 +86,3 @@ until: add_service|success retries: 5 delay: 10 - tags: - - designate-setup - - designate-service-add diff --git a/tasks/main.yml b/tasks/main.yml index 16872ee..15f5806 100644 --- a/tasks/main.yml +++ b/tasks/main.yml @@ -36,17 +36,33 @@ - always - include: designate_pre_install.yml + tags: + - designate-install + - include: designate_install.yml + tags: + - designate-install + - include: designate_post_install.yml + tags: + - designate-install + - designate-config + - include: designate_init.yml + tags: + - designate-install - include: designate_db_setup.yml when: > inventory_hostname == groups['designate_all'][0] + tags: + - designate-install - include: designate_service_setup.yml when: > inventory_hostname == groups['designate_all'][0] + tags: + - designate-install - name: Flush handlers meta: flush_handlers