Skip to content

Commit 47ca31c

Browse files
vitabaksvitabaks
committed
Merge branch 'update-variable-names' into 'master'
chore(ui): update ansible snippet variable names (https://gitlab.com/postgres-ai/platform/-/issues/257) See merge request postgres-ai/database-lab!818
2 parents 9e3385b + dd49c37 commit 47ca31c

File tree

3 files changed

+30
-30
lines changed

3 files changed

+30
-30
lines changed

Diff for: ‎ui/packages/platform/src/api/configs/launchDeploy.ts

+7-7
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
import { simpleInstallRequest } from 'helpers/simpleInstallRequest'
22
import { initialState } from 'components/DbLabInstanceForm/reducer'
3-
import { DEBUG_API_SERVER } from 'components/DbLabInstanceForm/utils'
3+
import { DEBUG_API_SERVER, sePackageTag } from 'components/DbLabInstanceForm/utils'
44

55
const API_SERVER = process.env.REACT_APP_API_SERVER
66

@@ -41,25 +41,25 @@ export const launchDeploy = async ({
4141
image: cloudImage,
4242
location: state.location.native_code,
4343
},
44-
image: 'postgresai/dle-se-ansible:v1.0-rc.8',
44+
image: `postgresai/dle-se-ansible:${sePackageTag}`,
4545
extraVars: [
4646
`provision=${state.provider}`,
4747
`server_name=${state.name}`,
48-
`dle_platform_project_name=${state.name}`,
48+
`platform_project_name=${state.name}`,
4949
`server_type=${state.instanceType.native_name}`,
5050
`server_image=${cloudImage}`,
5151
`server_location=${state.location.native_code}`,
5252
`volume_size=${state.storage}`,
53-
`dle_version=${state.tag}`,
53+
`dblab_engine_version=${state.tag}`,
5454
`zpool_datasets_number=${state.snapshots}`,
55-
`dle_verification_token=${state.verificationToken}`,
56-
`dle_platform_org_key=${orgKey}`,
55+
`dblab_engine_verification_token=${state.verificationToken}`,
56+
`platform_org_key=${orgKey}`,
5757
...(state.publicKeys
5858
? // eslint-disable-next-line no-useless-escape
5959
[`ssh_public_keys=\"${state.publicKeys}\"`]
6060
: []),
6161
...(API_SERVER === DEBUG_API_SERVER
62-
? [`dle_platform_url=https://v2.postgres.ai/api/general`]
62+
? [`platform_url=https://v2.postgres.ai/api/general`]
6363
: []),
6464
],
6565
extraEnvs: formatExtraEnvs(extraEnvs),

Diff for: ‎ui/packages/platform/src/components/DbLabInstanceForm/utils/index.tsx

+11-11
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ export const DEBUG_API_SERVER = 'https://v2.postgres.ai/api/general'
77

88
export const availableTags = ['3.4.0', '4.0.0-alpha.6']
99

10-
export const sePackageTag = 'v1.0-rc.8'
10+
export const sePackageTag = 'v1.0-rc.9'
1111

1212
export const dockerRunCommand = (provider: string) => {
1313
/* eslint-disable no-template-curly-in-string */
@@ -48,13 +48,13 @@ export const getPlaybookCommand = (
4848
server_image='${cloudImages?.native_os_image}' \\\r
4949
server_location='${state.location.native_code}' \\\r
5050
volume_size='${state.storage}' \\\r
51-
dle_verification_token='${state.verificationToken}' \\\r
52-
dle_version='${state.tag}' \\\r
51+
dblab_engine_verification_token='${state.verificationToken}' \\\r
52+
dblab_engine_version='${state.tag}' \\\r
5353
${ state.snapshots > 1 ? `zpool_datasets_number='${state.snapshots}' \\\r` : `` }
54-
${ orgKey ? `dle_platform_org_key='${orgKey}' \\\r` : `` }
55-
${ API_SERVER === DEBUG_API_SERVER ? `dle_platform_url='${DEBUG_API_SERVER}' \\\r` : `` }
54+
${ orgKey ? `platform_org_key='${orgKey}' \\\r` : `` }
55+
${ API_SERVER === DEBUG_API_SERVER ? `platform_url='${DEBUG_API_SERVER}' \\\r` : `` }
5656
${state.publicKeys ? `ssh_public_keys='${state.publicKeys}' \\\r` : ``}
57-
dle_platform_project_name='${state.name}'"`
57+
platform_project_name='${state.name}'"`
5858

5959
export const getPlaybookCommandWithoutDocker = (
6060
state: typeof initialState,
@@ -68,19 +68,19 @@ export const getPlaybookCommandWithoutDocker = (
6868
server_image='${cloudImages?.native_os_image}' \\\r
6969
server_location='${state.location.native_code}' \\\r
7070
volume_size='${state.storage}' \\\r
71-
dle_verification_token='${state.verificationToken}' \\\r
72-
dle_version='${state.tag}' \\\r
71+
dblab_engine_verification_token='${state.verificationToken}' \\\r
72+
dblab_engine_version='${state.tag}' \\\r
7373
${
7474
state.snapshots > 1 ? `zpool_datasets_number='${state.snapshots}' \\\r` : ``
7575
}
76-
${orgKey ? `dle_platform_org_key='${orgKey}' \\\r` : ``}
76+
${orgKey ? `platform_org_key='${orgKey}' \\\r` : ``}
7777
${
7878
API_SERVER === DEBUG_API_SERVER
79-
? `dle_platform_url='${DEBUG_API_SERVER}' \\\r`
79+
? `platform_url='${DEBUG_API_SERVER}' \\\r`
8080
: ``
8181
}
8282
${state.publicKeys ? `ssh_public_keys='${state.publicKeys}' \\\r` : ``}
83-
dle_platform_project_name='${state.name}'"`
83+
platform_project_name='${state.name}'"`
8484

8585
export const getGcpAccountContents = () =>
8686
`export GCP_SERVICE_ACCOUNT_CONTENTS='{

Diff for: ‎ui/packages/platform/src/components/DbLabInstanceInstallForm/utils/index.ts

+12-12
Original file line numberDiff line numberDiff line change
@@ -12,31 +12,31 @@ export const getPlaybookCommand = (
1212
--env ANSIBLE_SSH_ARGS="-F none" \\\r
1313
postgresai/dle-se-ansible:${sePackageTag} \\\r
1414
ansible-playbook deploy_dle.yml --extra-vars \\\r
15-
"dle_host='user@server-ip-address' \\\r
16-
dle_platform_project_name='${state.name}' \\\r
17-
dle_version='${state.tag}' \\\r
18-
${ orgKey ? `dle_platform_org_key='${orgKey}' \\\r` : `` }
19-
${ API_SERVER === DEBUG_API_SERVER ? `dle_platform_url='${DEBUG_API_SERVER}' \\\r` : `` }
15+
"dblab_engine_host='user@server-ip-address' \\\r
16+
platform_project_name='${state.name}' \\\r
17+
dblab_engine_version='${state.tag}' \\\r
18+
${ orgKey ? `platform_org_key='${orgKey}' \\\r` : `` }
19+
${ API_SERVER === DEBUG_API_SERVER ? `platform_url='${DEBUG_API_SERVER}' \\\r` : `` }
2020
${ state.publicKeys ? `ssh_public_keys='${state.publicKeys}' \\\r` : `` }
21-
dle_verification_token='${state.verificationToken}'"
21+
dblab_engine_verification_token='${state.verificationToken}'"
2222
`
2323

2424
export const getAnsiblePlaybookCommand = (
2525
state: typeof initialState,
2626
orgKey: string,
2727
) =>
2828
`ansible-playbook deploy_dle.yml --extra-vars \\\r
29-
"dle_host='user@server-ip-address' \\\r
30-
dle_platform_project_name='${state.name}' \\\r
31-
dle_version='${state.tag}' \\\r
32-
${orgKey ? `dle_platform_org_key='${orgKey}' \\\r` : ``}
29+
"dblab_engine_host='user@server-ip-address' \\\r
30+
platform_project_name='${state.name}' \\\r
31+
dblab_engine_version='${state.tag}' \\\r
32+
${orgKey ? `platform_org_key='${orgKey}' \\\r` : ``}
3333
${
3434
API_SERVER === DEBUG_API_SERVER
35-
? `dle_platform_url='${DEBUG_API_SERVER}' \\\r`
35+
? `platform_url='${DEBUG_API_SERVER}' \\\r`
3636
: ``
3737
}
3838
${state.publicKeys ? `ssh_public_keys='${state.publicKeys}' \\\r` : ``}
39-
dle_verification_token='${state.verificationToken}'"
39+
dblab_engine_verification_token='${state.verificationToken}'"
4040
`
4141

4242
export const getAnsibleInstallationCommand = () =>

0 commit comments

Comments
 (0)