Merge "[FFU] Ensure compatibility with ansible 2.6."
This commit is contained in:
commit
7c0764606e
|
@ -854,7 +854,9 @@ outputs:
|
|||
fast_forward_upgrade_bootstrap_role_tasks: |
|
||||
{%- for role in roles %}
|
||||
- include_tasks: {{role.name}}/fast_forward_upgrade_tasks.yaml
|
||||
when: tripleo_role_name == '{{role.name}}' and ansible_hostname == groups['{{role.name}}'][0]
|
||||
when:
|
||||
- tripleo_role_name == '{{role.name}}'
|
||||
- is_bootstrap_node|bool
|
||||
{%- endfor %}
|
||||
post_update_steps_tasks: |
|
||||
{%- for role in roles %}
|
||||
|
|
|
@ -332,13 +332,20 @@ outputs:
|
|||
- release == 'ocata'
|
||||
- is_bootstrap_node|bool
|
||||
block:
|
||||
- name: Remove whitespaces in .my.cnf
|
||||
replace:
|
||||
path: /root/.my.cnf
|
||||
regexp: '^ +'
|
||||
replace: ''
|
||||
- name: Create cell0 db
|
||||
mysql_db:
|
||||
name: nova_cell0
|
||||
state: present
|
||||
login_unix_socket: '/var/lib/mysql/mysql.sock'
|
||||
- name: Grant access to cell0 db
|
||||
mysql_user:
|
||||
name: nova
|
||||
host_all: yes
|
||||
state: present
|
||||
priv: '*.*:ALL'
|
||||
login_unix_socket: '/var/lib/mysql/mysql.sock'
|
||||
|
|
|
@ -572,13 +572,20 @@ outputs:
|
|||
- release == 'ocata'
|
||||
- is_bootstrap_node|bool
|
||||
block:
|
||||
- name: Remove whitespaces in .my.cnf
|
||||
replace:
|
||||
path: /root/.my.cnf
|
||||
regexp: '^ +'
|
||||
replace: ''
|
||||
- name: Create cell0 db
|
||||
mysql_db:
|
||||
name: nova_cell0
|
||||
state: present
|
||||
login_unix_socket: '/var/lib/mysql/mysql.sock'
|
||||
- name: Grant access to cell0 db
|
||||
mysql_user:
|
||||
name: nova
|
||||
host_all: yes
|
||||
state: present
|
||||
priv: '*.*:ALL'
|
||||
login_unix_socket: '/var/lib/mysql/mysql.sock'
|
||||
|
|
|
@ -184,9 +184,11 @@ outputs:
|
|||
mysql_db:
|
||||
name: nova_cell0
|
||||
state: present
|
||||
login_unix_socket: '/var/lib/mysql/mysql.sock'
|
||||
- name: Setup cell_v2 (grant access to the nova DB user)
|
||||
when: step|int == 4
|
||||
mysql_user:
|
||||
login_unix_socket: '/var/lib/mysql/mysql.sock'
|
||||
str_replace:
|
||||
template: "name=nova password=PASSWORD host=\"%\" priv=\"nova.*:ALL/nova_cell0.*:ALL,GRANT\" state=present"
|
||||
params:
|
||||
|
|
Loading…
Reference in New Issue