Merge branch 'master' into dist/eole/2.7.1/master
This commit is contained in:
commit
73ec33377c
|
@ -97,6 +97,9 @@ CREATE TABLE Applicationservice (
|
|||
ApplicationserviceName VARCHAR(255) NOT NULL,
|
||||
ApplicationserviceDescription VARCHAR(255) NOT NULL,
|
||||
ApplicationserviceReleaseId INTEGER NOT NULL,
|
||||
ApplicationserviceLVIS VARCHAR(255) NOT NULL,
|
||||
ApplicationserviceLVIP VARCHAR(255) NOT NULL,
|
||||
ApplicationserviceLVMP VARCHAR(255) NOT NULL,
|
||||
OS JSON,
|
||||
UNIQUE (ApplicationserviceName, ApplicationserviceReleaseId)
|
||||
);
|
||||
|
|
|
@ -11,7 +11,7 @@ dbhost: %%getVar('risotto_db_address')
|
|||
dbport: 5432
|
||||
dbtype: postgres
|
||||
dbname: %%dbname
|
||||
template: 'postgres'
|
||||
template: 'template0'
|
||||
sqlscripts: ['/usr/share/eole/db/eole-risotto/gen/create_tables.sql']
|
||||
pwd_files:
|
||||
- {'file': '/etc/risotto/risotto.conf', 'pattern': 'RISOTTO_DB_PASSWORD='}
|
||||
|
|
|
@ -11,7 +11,7 @@ dbhost: %%getVar('risotto_db_address')
|
|||
dbport: 5432
|
||||
dbtype: postgres
|
||||
dbname: %%getVar('risotto_tiramisu_dbname')
|
||||
template: 'postgres'
|
||||
template: 'template0'
|
||||
pwd_files:
|
||||
- {'file': '/etc/risotto/risotto.conf', 'pattern': 'TIRAMISU_DB_PASSWORD='}
|
||||
|
||||
|
|
Loading…
Reference in New Issue