Skip to content

Commit 1f7fb5a

Browse files
authored
Add eval option to neo4j.acceptLicenseAgreement (#1605) (#1612)
Cherry-picked from #1605
1 parent 0f32ad9 commit 1f7fb5a

File tree

5 files changed

+16
-14
lines changed

5 files changed

+16
-14
lines changed

modules/ROOT/pages/kubernetes/configuration.adoc

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -129,8 +129,9 @@ Once you change the password in Neo4j, the password stored in _Kubernetes Secret
129129

130130
=== `neo4j.edition` and `neo4j.acceptLicenseAgreement`
131131

132-
By default, the Helm chart installs Neo4j Community Edition.
133-
If you want to install Neo4j Enterprise Edition, set the configuration parameters `edition: "enterprise"` and acknowledge license compliance by setting `neo4j.acceptLicenseAgreement` to `"yes"`.
132+
By default, the Helm chart installs Neo4j Community Edition. +
133+
If you want to install Neo4j Enterprise Edition, set the configuration parameters `edition: "enterprise"` and acknowledge license compliance by setting `neo4j.acceptLicenseAgreement` to `"yes"` if you have a valid license or to `"eval"` if you want to accept the link:https://neo4j.com/terms/enterprise_us/[Neo4j evaluation license]. +
134+
For more information on how to obtain a valid license for Neo4j Enterprise Edition, see https://neo4j.com/licensing/ and link:https://neo4j.com/terms/licensing/, or use the form https://neo4j.com/contact-us[Contact Neo4j].
134135

135136
=== `volumes.data`
136137

modules/ROOT/pages/kubernetes/quickstart-cluster/create-value-file.adoc

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -57,9 +57,9 @@ You cannot use `neo4j` as the initial password as this is the default password.
5757
====
5858

5959
`neo4j.edition` and `neo4j.acceptLicenseAgreement`::
60-
By default, the Helm chart installs Neo4j Community Edition.
61-
If you want to install Neo4j Enterprise Edition, set the configuration parameters `edition: "enterprise"` and acknowledge license compliance by setting `neo4j.acceptLicenseAgreement` to `"yes"`.
62-
For more information on how to obtain a valid license for Neo4j Enterprise Edition, see https://neo4j.com/licensing/ or use the form https://neo4j.com/contact-us[Contact Neo4j].
60+
By default, the Helm chart installs Neo4j Community Edition. +
61+
If you want to install Neo4j Enterprise Edition, set the configuration parameters `edition: "enterprise"` and acknowledge license compliance by setting `neo4j.acceptLicenseAgreement` to `"yes"` if you have a valid license or to `"eval"` if you want to accept the link:link:https://neo4j.com/terms/enterprise_us/[Neo4j evaluation license]. +
62+
For more information on how to obtain a valid license for Neo4j Enterprise Edition, see https://neo4j.com/licensing/ and link:https://neo4j.com/terms/licensing/, or use the form https://neo4j.com/contact-us[Contact Neo4j].
6363

6464
`volumes.data`::
6565
The `volumes.data` parameter maps the `data` volume mount of each cluster member to the persistent volume for that member.

modules/ROOT/pages/kubernetes/quickstart-cluster/prerequisites.adoc

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -9,15 +9,15 @@ Before you can deploy a Neo4j cluster on Kubernetes, you need to:
99
== General prerequisites
1010

1111
* xref:kubernetes/helm-charts-setup.adoc[Configure the Neo4j Helm chart repository].
12-
* Obtain a valid license for Neo4j Enterprise Edition.
13-
For more information, see https://neo4j.com/licensing/ or use the form https://neo4j.com/contact-us[Contact Neo4j].
12+
* Obtain a valid license if you want to install Neo4j Enterprise Edition or set the configuration parameters `edition: "enterprise"` to `"eval"` if you want to accept the link:https://neo4j.com/terms/enterprise_us/[Neo4j evaluation license]. +
13+
For more information on how to obtain a commercial license, see https://neo4j.com/licensing/ and link:https://neo4j.com/terms/licensing/, or use the form https://neo4j.com/contact-us[Contact Neo4j].
1414
* Install the Kubernetes client command-line tool `kubectl` (https://kubernetes.io/docs/tasks/tools/).
1515
* Set up a Kubernetes cluster with sufficient CPU and memory for your Neo4j deployment.
1616
+
1717
[NOTE]
1818
====
1919
This guide works with minimum CPU and memory allocated per Neo4j instance.
20-
However, the Neo4j system requirements largely depend on the use of the software.
20+
However, the Neo4j system requirements largely depend on the use of the software.
2121
Therefore, for running Neo4j in development or production environments, please refer to xref:installation/requirements.adoc[].
2222
====
2323
+
@@ -33,7 +33,7 @@ Select the tab as per your Kubernetes environment and complete all prerequisites
3333
[.include-with-gke]
3434
======
3535
. Install the `gcloud` command-line interface (CLI) (https://cloud.google.com/sdk/docs/install).
36-
. All the shell commands in this guide assume that the GCP Project, compute zone, and region to use, have been set using the
36+
. All the shell commands in this guide assume that the GCP Project, compute zone, and region to use, have been set using the
3737
`CLOUDSDK_CORE_PROJECT`, `CLOUDSDK_COMPUTE_ZONE`, and `CLOUDSDK_COMPUTE_REGION` environment variables, for example:
3838
+
3939
[source, shell]

modules/ROOT/pages/kubernetes/quickstart-standalone/create-value-file.adoc

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -37,8 +37,9 @@ You cannot use `neo4j` as the initial password as this is the default password.
3737
====
3838

3939
`neo4j.edition` and `neo4j.acceptLicenseAgreement`::
40-
By default, the standalone Helm chart installs Neo4j Community Edition.
41-
If you want to install Neo4j Enterprise Edition, set the configuration parameters `edition: "enterprise"` and acknowledge license compliance by setting `neo4j.acceptLicenseAgreement` to `"yes"`.
40+
By default, the standalone Helm chart installs Neo4j Community Edition. +
41+
If you want to install Neo4j Enterprise Edition, set the configuration parameters `edition: "enterprise"` and acknowledge license compliance by setting `neo4j.acceptLicenseAgreement` to `"yes"` if you have a valid license or to `"eval"` if you want to accept the link:https://neo4j.com/terms/enterprise_us/[Neo4j evaluation license]. +
42+
For more information on how to obtain a valid license for Neo4j Enterprise Edition, see https://neo4j.com/licensing/ and link:https://neo4j.com/terms/licensing/, or use the form https://neo4j.com/contact-us[Contact Neo4j].
4243

4344
`volumes.data`::
4445
The `volumes.data` parameter maps the `data` volume mount of your Neo4j to the persistent volume that you have for that instance.

modules/ROOT/pages/kubernetes/quickstart-standalone/prerequisites.adoc

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,9 +8,9 @@ Before you can deploy a Neo4j standalone instance on Kubernetes, you need to:
88
== General prerequisites
99

1010
* xref:kubernetes/helm-charts-setup.adoc[Configure the Neo4j Helm chart repository].
11-
* Obtain a valid license if you want to install Neo4j Enterprise Edition.
12-
The Neo4j Community Edition (default for the standalone chart) does not require a license.
13-
For more information, see https://neo4j.com/licensing/ or use the form https://neo4j.com/contact-us[Contact Neo4j].
11+
* Obtain a valid license if you want to install Neo4j Enterprise Edition or set the configuration parameters `edition: "enterprise"` to `"eval"` if you want to accept the link:https://neo4j.com/terms/enterprise_us/[Neo4j evaluation license].
12+
The Neo4j Community Edition (default for the standalone chart) does not require a license. +
13+
For more information on how to obtain a commercial license, see https://neo4j.com/licensing/ and link:https://neo4j.com/terms/licensing/, or use the form https://neo4j.com/contact-us[Contact Neo4j].
1414
* Install the Kubernetes client command-line tool `kubectl` (https://kubernetes.io/docs/tasks/tools/).
1515
* Set up a Kubernetes cluster with sufficient CPU and memory for your Neo4j deployment.
1616
+

0 commit comments

Comments
 (0)