openstack
/
ansible-role-openstack-operations
Code Issues Proposed changes

Merge "Switch script to shell"

This commit is contained in:
Zuul 2019-03-15 10:49:35 +00:00 committed by Gerrit Code Review
parent f3ed94413d b9c9cad6e0
commit d9049b4869
4 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
tasks/backup_mysql.yml
View File

@ -17,7 +17,7 @@
state: directory state: directory
- name: Get the database root password - name: Get the database root password
script: | shell: |
/bin/hiera -c /etc/puppet/hiera.yaml mysql::server::root_password /bin/hiera -c /etc/puppet/hiera.yaml mysql::server::root_password
when: mysql_root_password is undefined when: mysql_root_password is undefined
register: mysql_root_password_cmd_output register: mysql_root_password_cmd_output
@ -41,7 +41,7 @@
# The archive module is pretty limited. Using a script instead. # The archive module is pretty limited. Using a script instead.
- name: Archive the OpenStack databases - name: Archive the OpenStack databases
script: | shell: |
/bin/tar --ignore-failed-read --xattrs \ /bin/tar --ignore-failed-read --xattrs \
-zcf {{ backup_tmp_dir }}/mysql/openstack-backup-mysql.tar \ -zcf {{ backup_tmp_dir }}/mysql/openstack-backup-mysql.tar \
{{ backup_tmp_dir }}/mysql/*.sql {{ backup_tmp_dir }}/mysql/*.sql

2
tasks/backup_pacemaker.yml
View File

@ -20,7 +20,7 @@
command: "{{ backup_tmp_dir }}/pcs/backup_pacemaker.sh" command: "{{ backup_tmp_dir }}/pcs/backup_pacemaker.sh"
- name: Archive the Pacemaker configuration - name: Archive the Pacemaker configuration
script: | shell: |
/bin/tar --ignore-failed-read --xattrs \ /bin/tar --ignore-failed-read --xattrs \
-zcf {{ backup_tmp_dir }}/pcs/openstack-backup-pacemaker.tar \ -zcf {{ backup_tmp_dir }}/pcs/openstack-backup-pacemaker.tar \
{{ backup_tmp_dir }}/pcs/cib.xml \ {{ backup_tmp_dir }}/pcs/cib.xml \

12
tasks/restore_galera.yml
View File

@ -17,7 +17,7 @@
when: galera_container_image is undefined when: galera_container_image is undefined
- name: Get the database root password - name: Get the database root password
script: | shell: |
/bin/hiera -c /etc/puppet/hiera.yaml mysql::server::root_password /bin/hiera -c /etc/puppet/hiera.yaml mysql::server::root_password
when: mysql_root_password is undefined when: mysql_root_password is undefined
register: mysql_root_password_cmd_output register: mysql_root_password_cmd_output
@ -29,7 +29,7 @@
when: mysql_root_password is undefined when: mysql_root_password is undefined
- name: Get the database clustercheck password - name: Get the database clustercheck password
script: | shell: |
/bin/hiera -c /etc/puppet/hiera.yaml mysql_clustercheck_password /bin/hiera -c /etc/puppet/hiera.yaml mysql_clustercheck_password
when: mysql_clustercheck_password is undefined when: mysql_clustercheck_password is undefined
register: mysql_clustercheck_password_cmd_output register: mysql_clustercheck_password_cmd_output
@ -63,14 +63,14 @@
when: bootstrap_node | bool when: bootstrap_node | bool
- name: Unarchive the database archive - name: Unarchive the database archive
script: | shell: |
/bin/tar --xattrs \ /bin/tar --xattrs \
-zxf /var/tmp/openstack-backup/mysql/openstack-backup-mysql.tar \ -zxf /var/tmp/openstack-backup/mysql/openstack-backup-mysql.tar \
-C / -C /
when: bootstrap_node | bool when: bootstrap_node | bool
- name: Get the database bind host IP on each node - name: Get the database bind host IP on each node
script: | shell: |
/bin/hiera -c /etc/puppet/hiera.yaml mysql_bind_host /bin/hiera -c /etc/puppet/hiera.yaml mysql_bind_host
when: mysql_bind_host is undefined when: mysql_bind_host is undefined
register: mysql_bind_host register: mysql_bind_host
@ -151,12 +151,12 @@
host: "{{ mysql_bind_host.stdout|trim }}" host: "{{ mysql_bind_host.stdout|trim }}"
- name: Import OpenStack MySQL data - name: Import OpenStack MySQL data
script: | shell: |
/bin/mysql -u root -p{{ mysql_root_password }} < /var/tmp/openstack-backup/mysql/openstack-backup-mysql.sql /bin/mysql -u root -p{{ mysql_root_password }} < /var/tmp/openstack-backup/mysql/openstack-backup-mysql.sql
when: bootstrap_node | bool when: bootstrap_node | bool
- name: Import OpenStack MySQL grants data - name: Import OpenStack MySQL grants data
script: | shell: |
/bin/mysql -u root -p{{ mysql_root_password }} < /var/tmp/openstack-backup/mysql/openstack-backup-mysql-grants.sql /bin/mysql -u root -p{{ mysql_root_password }} < /var/tmp/openstack-backup/mysql/openstack-backup-mysql-grants.sql
when: bootstrap_node | bool when: bootstrap_node | bool

2
tasks/validate_galera.yml
View File

@ -1,5 +1,5 @@
- name: Get the database clustercheck password - name: Get the database clustercheck password
script: | shell: |
/bin/hiera -c /etc/puppet/hiera.yaml mysql_clustercheck_password /bin/hiera -c /etc/puppet/hiera.yaml mysql_clustercheck_password
when: mysql_clustercheck_password is undefined when: mysql_clustercheck_password is undefined
register: mysql_clustercheck_password_cmd_output register: mysql_clustercheck_password_cmd_output