Infra
/
eole-risotto
5
0
Fork 0
Code Issues 3 Pull Requests Releases Wiki Activity

Merge branch 'master' into dist/eole/2.7.1/master

This commit is contained in:
Benjamin Bohard 2020-07-03 09:22:18 +02:00
parent 34bd8c648c 7cc19606c1
commit 73ec33377c
3 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
db/gen/create_tables.sql
View File

@ -97,6 +97,9 @@ CREATE TABLE Applicationservice (
ApplicationserviceName VARCHAR(255) NOT NULL, ApplicationserviceName VARCHAR(255) NOT NULL,
ApplicationserviceDescription VARCHAR(255) NOT NULL, ApplicationserviceDescription VARCHAR(255) NOT NULL,
ApplicationserviceReleaseId INTEGER NOT NULL, ApplicationserviceReleaseId INTEGER NOT NULL,
ApplicationserviceLVIS VARCHAR(255) NOT NULL,
ApplicationserviceLVIP VARCHAR(255) NOT NULL,
ApplicationserviceLVMP VARCHAR(255) NOT NULL,
OS JSON, OS JSON,
UNIQUE (ApplicationserviceName, ApplicationserviceReleaseId) UNIQUE (ApplicationserviceName, ApplicationserviceReleaseId)
); );

2
tmpl/risotto.yml
View File

@ -11,7 +11,7 @@ dbhost: %%getVar('risotto_db_address')
dbport: 5432 dbport: 5432
dbtype: postgres dbtype: postgres
dbname: %%dbname dbname: %%dbname
template: 'postgres' template: 'template0'
sqlscripts: ['/usr/share/eole/db/eole-risotto/gen/create_tables.sql'] sqlscripts: ['/usr/share/eole/db/eole-risotto/gen/create_tables.sql']
pwd_files: pwd_files:
- {'file': '/etc/risotto/risotto.conf', 'pattern': 'RISOTTO_DB_PASSWORD='} - {'file': '/etc/risotto/risotto.conf', 'pattern': 'RISOTTO_DB_PASSWORD='}

2
tmpl/tiramisu.yml
View File

@ -11,7 +11,7 @@ dbhost: %%getVar('risotto_db_address')
dbport: 5432 dbport: 5432
dbtype: postgres dbtype: postgres
dbname: %%getVar('risotto_tiramisu_dbname') dbname: %%getVar('risotto_tiramisu_dbname')
template: 'postgres' template: 'template0'
pwd_files: pwd_files:
- {'file': '/etc/risotto/risotto.conf', 'pattern': 'TIRAMISU_DB_PASSWORD='} - {'file': '/etc/risotto/risotto.conf', 'pattern': 'TIRAMISU_DB_PASSWORD='}