Merge "Bring consistency to tags" into stable/newton

This commit is contained in:
Jenkins 2017-01-18 13:48:26 +00:00 committed by Gerrit Code Review
commit ed0743bece
3 changed files with 16 additions and 5 deletions

View File

@ -113,8 +113,6 @@
dest: "/usr/sbin/policy-rc.d"
mode: "0755"
backup: yes
tags:
- galera-config
#TODO(evrardjp): Replace the next 2 tasks by a standard apt with cache
#when https://github.com/ansible/ansible-modules-core/pull/1517 is merged
@ -178,4 +176,4 @@
path: "/usr/sbin/policy-rc.d"
state: absent
tags:
- galera-config
- galera_server-config

View File

@ -25,8 +25,6 @@
- { src: "/usr/lib64/galera", path: "/usr/lib/galera", state: "link", force: true }
- { src: "/etc/mysql/conf.d", path: "/etc/my.cnf.d", state: "link", force: true }
- { src: "/etc/mysql/my.cnf", path: "/etc/my.cnf", state: "link", force: true }
tags:
- galera-config
- name: Add galera gpg-keys
rpm_key:
@ -131,6 +129,7 @@
name: "mysql"
enabled: "yes"
tags:
- galera_server-config
- galera-enable
# NOTE(cloudnull): This is an idempotent shell task is it will only run once
@ -157,5 +156,6 @@
args:
creates: /etc/mysql/rhel_configured
tags:
- galera_server-config
- galera-rhel-config
- skip_ansible_lint

View File

@ -36,11 +36,22 @@
- always
- include: galera_upgrade_check.yml
tags: galera_server-upgrade
- include: galera_cluster_state.yml
tags: galera_server-config
- include: galera_pre_install.yml
tags: galera_server-install
- include: galera_install.yml
tags: galera_server-install
- include: galera_post_install.yml
tags: galera_server-config
- include: galera_bootstrap.yml
tags: galera_server-config
- name: Flush handlers
meta: flush_handlers
@ -49,6 +60,8 @@
vars:
num_retries: 10
wait_delay: 3
tags: galera_server-config
- include: galera_setup.yml
when: inventory_hostname == galera_server_bootstrap_node
tags: galera_server-config