Skip to content
GitLab
Explorer
Connexion
Navigation principale
Rechercher ou aller à…
Projet
docker_odoo
Gestion
Activité
Membres
Labels
Programmation
Tickets
Tableaux des tickets
Jalons
Code
Requêtes de fusion
Dépôt
Branches
Validations
Étiquettes
Graphe du dépôt
Comparer les révisions
Analyse
Données d'analyse des chaînes de valeur
Analyse des contributeurs
Données d'analyse du dépôt
Aide
Aide
Support
Documentation de GitLab
Comparer les forfaits GitLab
Forum de la communauté GitLab
Contribuer à GitLab
Donner votre avis
Raccourcis clavier
?
Extraits de code
Groupes
Projets
Afficher davantage de fils d'Ariane
Le Filament
Ansible Roles
docker_odoo
Validations
671876b2
Valider
671876b2
rédigé
Il y a 8 mois
par
Théo - Le Filament
Parcourir les fichiers
Options
Téléchargements
Correctifs
Plain Diff
change: better handling of backup accounts
parent
098af97b
Aucune branche associée trouvée
Aucune étiquette associée trouvée
Aucune requête de fusion associée trouvée
Modifications
3
Afficher les modifications d'espaces
En ligne
Côte à côte
Affichage de
3 fichiers modifiés
tasks/main.yml
+8
-5
8 ajouts, 5 suppressions
tasks/main.yml
templates/backup.yaml.j2
+2
-2
2 ajouts, 2 suppressions
templates/backup.yaml.j2
templates/restore-odootest.yaml.j2
+2
-2
2 ajouts, 2 suppressions
templates/restore-odootest.yaml.j2
avec
12 ajouts
et
9 suppressions
tasks/main.yml
+
8
−
5
Voir le fichier @
671876b2
...
@@ -390,6 +390,7 @@
...
@@ -390,6 +390,7 @@
# Allow role vars to work with `item` variable.
# Allow role vars to work with `item` variable.
item
:
"
{{
item_account_instance.1
}}"
item
:
"
{{
item_account_instance.1
}}"
template_backup_account
:
"
{{
item_account_instance.0
}}"
template_backup_account
:
"
{{
item_account_instance.0
}}"
template_backup_credentials
:
"
{{
swift_odoo_credentials[template_backup_account.key]
}}"
template_odoo_instance
:
"
{{
odoo_instance
}}"
template_odoo_instance
:
"
{{
odoo_instance
}}"
template_database_name
:
"
{{
template_odoo_instance.value.db
}}"
template_database_name
:
"
{{
template_odoo_instance.value.db
}}"
template_odoo_source_instance
:
"
{{
{'key':
template_odoo_instance.value.prod_instance
|
default(template_odoo_instance.key
),
'value':
odoo_instances[template_odoo_instance.value.prod_instance
|
default(template_odoo_instance.key
)]}
}}"
template_odoo_source_instance
:
"
{{
{'key':
template_odoo_instance.value.prod_instance
|
default(template_odoo_instance.key
),
'value':
odoo_instances[template_odoo_instance.value.prod_instance
|
default(template_odoo_instance.key
)]}
}}"
...
@@ -399,7 +400,7 @@
...
@@ -399,7 +400,7 @@
owner
:
"
root"
owner
:
"
root"
group
:
"
root"
group
:
"
root"
mode
:
"
0400"
mode
:
"
0400"
loop
:
"
{{
swift_accounts
|
dict2items
|
product(odoo_instances
|
dict2items)
}}"
loop
:
"
{{
swift_
odoo_
accounts
|
dict2items
|
product(odoo_instances
|
dict2items)
}}"
loop_control
:
loop_control
:
label
:
"
account
{{
template_backup_account.key
}}
on
{{
template_odoo_instance.key
}}"
label
:
"
account
{{
template_backup_account.key
}}
on
{{
template_odoo_instance.key
}}"
loop_var
:
item_account_instance
loop_var
:
item_account_instance
...
@@ -420,14 +421,16 @@
...
@@ -420,14 +421,16 @@
# Allow role vars to work with `item` variable.
# Allow role vars to work with `item` variable.
item
:
"
{{
item_account_instance.1
}}"
item
:
"
{{
item_account_instance.1
}}"
template_backup_account
:
"
{{
item_account_instance.0
}}"
template_backup_account
:
"
{{
item_account_instance.0
}}"
template_backup_credentials
:
"
{{
swift_odoo_credentials[template_backup_account.key]
}}"
template_odoo_instance
:
"
{{
odoo_instance
}}"
template_odoo_instance
:
"
{{
odoo_instance
}}"
template_odoo_instance_setup
:
"
{{
odoo_instance_setup
}}"
ansible.builtin.template
:
ansible.builtin.template
:
src
:
"
backup.yaml.j2"
src
:
"
backup.yaml.j2"
dest
:
"
/home/docker/backups/backup-{{
template_odoo_instance.key
}}{{
template_backup_account.key
}}.yaml"
dest
:
"
/home/docker/backups/backup-{{
template_odoo_instance.key
}}{{
template_backup_account.key
}}.yaml"
owner
:
"
root"
owner
:
"
root"
group
:
"
root"
group
:
"
root"
mode
:
"
0400"
mode
:
"
0400"
loop
:
"
{{
swift_accounts
|
dict2items
|
product(odoo_instances
|
dict2items)
}}"
loop
:
"
{{
swift_
odoo_
accounts
|
dict2items
|
product(odoo_instances
|
dict2items)
}}"
loop_control
:
loop_control
:
label
:
"
account
{{
template_backup_account.key
}}
on
{{
template_odoo_instance.key
}}"
label
:
"
account
{{
template_backup_account.key
}}
on
{{
template_odoo_instance.key
}}"
loop_var
:
item_account_instance
loop_var
:
item_account_instance
...
@@ -447,10 +450,10 @@
...
@@ -447,10 +450,10 @@
template_odoo_instance
:
"
{{
odoo_instance
}}"
template_odoo_instance
:
"
{{
odoo_instance
}}"
ansible.builtin.cron
:
ansible.builtin.cron
:
name
:
"
backup
{{
template_odoo_instance.key
}}{{
template_backup_account.key
}}"
name
:
"
backup
{{
template_odoo_instance.key
}}{{
template_backup_account.key
}}"
minute
:
"
{{
'%H'
|
strftime((('1970-01-01
'
+
backup_time_start)
|
to_datetime).timestamp()
+
(swift_accounts
|
length
-
template_backup_account.key)
*
((backup_time_slot_duration
|
community.general.to_seconds
-
swift_accounts
|
length
*
backup_time_max_duration
|
community.general.to_seconds)
/
(swift_accounts
|
length
-
1)
+
backup_time_max_duration
|
community.general.to_seconds)
|
int)
}}"
minute
:
"
{{
'%H'
|
strftime((('1970-01-01
'
+
backup_time_start)
|
to_datetime).timestamp()
+
(swift_
odoo_
accounts
|
length
-
template_backup_account.key)
*
((backup_time_slot_duration
|
community.general.to_seconds
-
swift_
odoo_
accounts
|
length
*
backup_time_max_duration
|
community.general.to_seconds)
/
(swift_
odoo_
accounts
|
length
-
1)
+
backup_time_max_duration
|
community.general.to_seconds)
|
int)
}}"
hour
:
"
{{
'%H'
|
strftime((('1970-01-01
'
+
backup_time_start)
|
to_datetime).timestamp()
+
(swift_accounts
|
length
-
template_backup_account.key)
*
((backup_time_slot_duration
|
community.general.to_seconds
-
swift_accounts
|
length
*
backup_time_max_duration
|
community.general.to_seconds)
/
(swift_accounts
|
length
-
1)
+
backup_time_max_duration
|
community.general.to_seconds)
|
int)
}}"
hour
:
"
{{
'%H'
|
strftime((('1970-01-01
'
+
backup_time_start)
|
to_datetime).timestamp()
+
(swift_
odoo_
accounts
|
length
-
template_backup_account.key)
*
((backup_time_slot_duration
|
community.general.to_seconds
-
swift_
odoo_
accounts
|
length
*
backup_time_max_duration
|
community.general.to_seconds)
/
(swift_
odoo_
accounts
|
length
-
1)
+
backup_time_max_duration
|
community.general.to_seconds)
|
int)
}}"
job
:
"
/usr/bin/docker
compose
-f
/home/docker/backups/backup-{{
template_odoo_instance.key
}}{{
template_backup_account.key
}}.yaml
run
--rm
backup_odoo"
job
:
"
/usr/bin/docker
compose
-f
/home/docker/backups/backup-{{
template_odoo_instance.key
}}{{
template_backup_account.key
}}.yaml
run
--rm
backup_odoo"
loop
:
"
{{
swift_accounts
|
dict2items
|
product(odoo_instances
|
dict2items)
}}"
loop
:
"
{{
swift_
odoo_
accounts
|
dict2items
|
product(odoo_instances
|
dict2items)
}}"
loop_control
:
loop_control
:
label
:
"
account
{{
template_backup_account.key
}}
on
{{
template_odoo_instance.key
}}"
label
:
"
account
{{
template_backup_account.key
}}
on
{{
template_odoo_instance.key
}}"
loop_var
:
item_account_instance
loop_var
:
item_account_instance
...
...
Ce diff est replié.
Cliquez pour l'agrandir.
templates/backup.yaml.j2
+
2
−
2
Voir le fichier @
671876b2
...
@@ -10,8 +10,8 @@ services:
...
@@ -10,8 +10,8 @@ services:
PGUSER: "{{ template_odoo_instance.value.db_user }}"
PGUSER: "{{ template_odoo_instance.value.db_user }}"
PGPASSWORD: "{{ template_odoo_instance.value.db_pass }}"
PGPASSWORD: "{{ template_odoo_instance.value.db_pass }}"
PASSPHRASE: "{{ template_odoo_instance.value.odoo_backup_pass | default(template_odoo_instance.value.master_pass) }}"
PASSPHRASE: "{{ template_odoo_instance.value.odoo_backup_pass | default(template_odoo_instance.value.master_pass) }}"
SWIFT_USERNAME: "{{ template_backup_
account.value
.username }}"
SWIFT_USERNAME: "{{ template_backup_
credentials
.username }}"
SWIFT_PASSWORD: "{{ template_backup_
account.value
.password }}"
SWIFT_PASSWORD: "{{ template_backup_
credentials
.password }}"
SWIFT_AUTHURL: "{{ template_backup_account.value.authurl }}"
SWIFT_AUTHURL: "{{ template_backup_account.value.authurl }}"
SWIFT_AUTHVERSION: {{ template_backup_account.value.authversion }}
SWIFT_AUTHVERSION: {{ template_backup_account.value.authversion }}
SWIFT_TENANTNAME: "{{ template_backup_account.value.tenantname }}"
SWIFT_TENANTNAME: "{{ template_backup_account.value.tenantname }}"
...
...
Ce diff est replié.
Cliquez pour l'agrandir.
templates/restore-odootest.yaml.j2
+
2
−
2
Voir le fichier @
671876b2
...
@@ -13,8 +13,8 @@ services:
...
@@ -13,8 +13,8 @@ services:
- ./pre_restore-{{ template_odoo_instance.key }}.sql:/tmp/pre-restore.sql:ro
- ./pre_restore-{{ template_odoo_instance.key }}.sql:/tmp/pre-restore.sql:ro
environment:
environment:
PGDATABASE: "{{ template_database_name }}"
PGDATABASE: "{{ template_database_name }}"
SWIFT_USERNAME: "{{ template_backup_
account.value
.username }}"
SWIFT_USERNAME: "{{ template_backup_
credentials
.username }}"
SWIFT_PASSWORD: "{{ template_backup_
account.value
.password }}"
SWIFT_PASSWORD: "{{ template_backup_
credentials
.password }}"
SWIFT_AUTHURL: "{{ template_backup_account.value.authurl }}"
SWIFT_AUTHURL: "{{ template_backup_account.value.authurl }}"
SWIFT_AUTHVERSION: {{ template_backup_account.value.authversion }}
SWIFT_AUTHVERSION: {{ template_backup_account.value.authversion }}
SWIFT_TENANTNAME: "{{ template_backup_account.value.tenantname }}"
SWIFT_TENANTNAME: "{{ template_backup_account.value.tenantname }}"
...
...
Ce diff est replié.
Cliquez pour l'agrandir.
Aperçu
0%
Chargement en cours
Veuillez réessayer
ou
joindre un nouveau fichier
.
Annuler
You are about to add
0
people
to the discussion. Proceed with caution.
Terminez d'abord l'édition de ce message.
Enregistrer le commentaire
Annuler
Veuillez vous
inscrire
ou vous
se connecter
pour commenter