diff --git a/commercial/2019.1.3/docker-compose.yml b/commercial/2019.1.3/docker-compose.yml
index 970d4bbc..c7500c19 100644
--- a/commercial/2019.1.3/docker-compose.yml
+++ b/commercial/2019.1.3/docker-compose.yml
@@ -5,11 +5,12 @@ services:
hostname: puppet.test
environment:
- CERTNAME=puppet.test
+ - PUPPETSERVER_PORT=8140
+ - PUPPETSERVER_LOG_LEVEL=info
- PUPPETDB_HOSTNAME=puppetdb.test
- PE_CONSOLE_SERVICES_HOSTNAME=pe-console-services.test
- PE_ORCHESTRATION_SERVICES_HOSTNAME=pe-orchestration-services.test
# puppet::enterprise class parameters written to hiera.yaml
- - PUPPETSERVER_PORT=8140
- POSTGRES_HOSTNAME=postgres.test
- PUPPETDB_SSL_PORT=8081
- PE_ORCHESTRATION_SERVICES_PORT=8143
@@ -37,9 +38,14 @@ services:
hostname: pe-orchestration-services.test
environment:
- CERTNAME=pe-orchestration-services.test
+ - PCP_BROKER_PORT=8142
+ - PE_ORCHESTRATION_SERVICES_PORT=8143
- PUPPETSERVER_HOSTNAME=puppet.test
+ - PUPPETSERVER_PORT=8140
- PUPPETDB_HOSTNAME=puppetdb.test
+ - PUPPETDB_SSL_PORT=8081
- POSTGRES_HOSTNAME=postgres.test
+ - POSTGRES_PORT=5432
- PE_BOLT_SERVER_HOSTNAME=pe-bolt-server.test
- PE_CONSOLE_SERVICES_HOSTNAME=pe-console-services.test
- PUPPERWARE_ADMIN_PASSWORD=pupperware
@@ -61,6 +67,7 @@ services:
hostname: pe-console-services.test
environment:
- CERTNAME=pe-console-services.test
+ - PE_CONSOLE_SERVICES_LOG_LEVEL=info
- PUPPETSERVER_HOSTNAME=puppet.test
- PUPPETSERVER_CERTNAME=puppet.test
- PUPPETSERVER_PORT=8140
@@ -71,6 +78,7 @@ services:
- POSTGRES_PORT=5432
- PE_ORCHESTRATION_SERVICES_HOSTNAME=pe-orchestration-services.test
- PE_ORCHESTRATION_SERVICES_CERTNAME=pe-orchestration-services.test
+ - PE_ORCHESTRATION_SERVICES_PORT=8143
volumes:
- console-services:/opt/puppetlabs/server/data/console-services
restart: always
@@ -97,6 +105,7 @@ services:
environment:
- CERTNAME=pe-bolt-server.test
- PUPPETSERVER_HOSTNAME=puppet.test
+ - PUPPETSERVER_PORT=8140
- PE_BOLT_SERVER_LOGLEVEL=${PE_BOLT_SERVER_LOGLEVEL:-info}
- WHITELIST_HOSTNAME.0=pe-bolt-server.test
- WHITELIST_HOSTNAME.1=pe-orchestration-services.test
@@ -111,8 +120,11 @@ services:
hostname: puppetdb.test
environment:
- CERTNAME=puppetdb.test
+ - PUPPETDB_SSL_PORT=8081
+ - PUPPETDB_LOG_LEVEL=info
- USE_PUPPETSERVER=true
- PUPPETSERVER_HOSTNAME=puppet.test
+ - PUPPETSERVER_PORT=8140
- PUPPETDB_POSTGRES_HOSTNAME=postgres.test
- PUPPETDB_POSTGRES_PORT=5432
- PUPPETDB_PASSWORD=puppetdb
@@ -138,9 +150,11 @@ services:
image: ${DOCKER_REGISTRY_PATH}pe-postgres:pe-2019.1.3
hostname: postgres.test
environment:
+ - PGPORT=5432
- CERTNAME=postgres.test
- POSTGRES_PASSWORD=puppetdb
- PUPPETSERVER_HOSTNAME=puppet.test
+ - PUPPETSERVER_PORT=8140
- PUPPETDB_CERTNAME=puppetdb.test
- PE_CONSOLE_SERVICES_CERTNAME=pe-console-services.test
- PE_ORCHESTRATION_SERVICES_CERTNAME=pe-orchestration-services.test
diff --git a/commercial/README.md b/commercial/README.md
index 61b22878..464696b5 100644
--- a/commercial/README.md
+++ b/commercial/README.md
@@ -107,8 +107,10 @@ The following values, many of which are already overriden in the `docker-compose
|----------------------------------------|---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|
| **CERTNAME** | The DNS name used on the masters SSL certificate
`pe-puppetserver` |
| **DNS_ALT_NAMES** | Additional DNS names to add to the masters SSL certificate |
+| **PUPPETSERVER_PORT** | The listening port of the puppet master
`8140` |
+| **PUPPETSERVER_LOG_LEVEL** | The logging level to use for this service
`info` |
| **PUPPETDB_HOSTNAME** | The DNS hostname of the puppetdb service
`puppetdb` |
-| **PUPPETDB_SSL_PORT** | The port for the puppetdb service
Also written to Hiera data to be consumed by `puppet::enterprise` class
`8081` |
+| **PUPPETDB_SSL_PORT** | The SSL port for the puppetdb service
Also written to Hiera data to be consumed by `puppet::enterprise` class
`8081` |
| **POSTGRES_HOSTNAME** | The DNS hostname of the postgres service
Also written to Hiera data to be consumed by `puppet::enterprise` class
`postgres` |
| **PE_CONSOLE_SERVICES_HOSTNAME** | The DNS hostname of the pe-console-services service
`pe-console-services` |
| **PE_ORCHESTRATION_SERVICES_HOSTNAME** | The DNS hostname of the pe-orchestration-services service
`pe-orchestration-services` |
@@ -122,9 +124,14 @@ The following values, many of which are already overriden in the `docker-compose
|-----------------------------------------|------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|
| **CERTNAME** | The DNS name used on this services SSL certificate
`pe-orchestration-services` |
| **DNS_ALT_NAMES** | Additional DNS names to add to the services SSL certificate (Dockers `hostname` and FQDN are already included)
`${HOSTNAME},$(hostname -s),$(hostname -f),${DNS_ALT_NAMES}` |
+| **PCP_BROKER_PORT** | The listening port for the pcp-broker service
`8142` |
+| **PE_ORCHESTRATION_SERVICES_PORT** | The listening port for the pe-orchestration-services service
`8143` |
| **PUPPETSERVER_HOSTNAME** | The DNS hostname of the puppet master
`puppet` |
+| **PUPPETSERVER_PORT** | The port of the puppet master
`8140` |
| **PUPPETDB_HOSTNAME** | The DNS hostname of the puppetdb service
`puppetdb` |
+| **PUPPETDB_SSL_PORT** | The SSL port of the puppetdb
`8081` |
| **POSTGRES_HOSTNAME** | The DNS hostname of the postgres service
`postgres` |
+| **POSTGRES_PORT** | The port for postgres
`5432` |
| **PE_BOLT_SERVER_HOSTNAME** | The DNS hostname of the pe-bolt-server service
`pe-bolt-server` |
| **PE_CONSOLE_SERVICES_HOSTNAME** | The DNS hostname of the pe-console-services service
`pe-console-services` |
| **PUPPERWARE_ADMIN_PASSWORD** | Log into the PE console using the username `admin` and this password value, once all containers are healthy
`pupperware` |
@@ -140,14 +147,15 @@ The following values, many of which are already overriden in the `docker-compose
| **DNS_ALT_NAMES** | Additional DNS names to add to the services SSL certificate (Dockers `hostname` and FQDN are already included)
`${HOSTNAME},$(hostname -s),$(hostname -f),${DNS_ALT_NAMES}` |
| **PUPPETSERVER_HOSTNAME** | The DNS hostname of the puppet master
`puppet` |
| **PUPPETSERVER_CERTNAME** | The primary DNS name on the puppet master certificate
`pe-puppetserver` |
-| **PUPPETSERVER_PORT** | The listening port of the puppet master
`8140` |
+| **PUPPETSERVER_PORT** | The port of the puppet master
`8140` |
| **PUPPETDB_HOSTNAME** | The DNS hostname of the puppetdb service
`puppetdb` |
| **PUPPETDB_CERTNAME** | The primary DNS name on the puppetdb certificate
`pe-puppetdb` |
-| **PUPPETDB_SSL_PORT** | The listening port for puppetdb
`8081` |
+| **PUPPETDB_SSL_PORT** | The SSL port for puppetdb
`8081` |
| **POSTGRES_HOSTNAME** | The DNS hostname of the postgres service
`postgres` |
-| **POSTGRES_PORT** | The listening port for postgres
`5432` |
+| **POSTGRES_PORT** | The port for postgres
`5432` |
| **PE_ORCHESTRATION_SERVICES_HOSTNAME** | The DNS hostname of the pe-orchestration-services service
`pe-orchestration-services` |
| **PE_ORCHESTRATION_SERVICES_CERTNAME** | The primary DNS name on the pe-orchestration-services certificate
`pe-orchestration-services` |
+| **PE_ORCHESTRATION_SERVICES_PORT** | The port for the pe-orchestration-services service
`8143` |
| **PE_CONSOLE_SERVICES_LOG_LEVEL** | The logging level to use for this service
`info` |
| **PE_CONSOLE_SERVICES_JAVA_ARGS** | Arguments passed directly to the JVM when starting the service
`-Xmx192m` |
@@ -158,6 +166,7 @@ The following values, many of which are already overriden in the `docker-compose
| **CERTNAME** | The DNS name used on this services SSL certificate
`pe-bolt-server` |
| **DNS_ALT_NAMES** | Additional DNS names to add to the services SSL certificate (Dockers `hostname` and FQDN are already included)
`${HOSTNAME},$(hostname -s),$(hostname -f),${DNS_ALT_NAMES}` |
| **PUPPETSERVER_HOSTNAME** | The DNS hostname of the puppet master
`puppet` |
+| **PUPPETSERVER_PORT** | The port of the puppet master
`8140` |
| **PE_BOLT_SERVER_LOGLEVEL** | The logging level to use for this service
`info` |
| **WHITELIST_HOSTNAME.0** | The DNS hostnamesof all services allowed to connect to this service
`pe-orchestration-services` |
| **WHITELIST_HOSTNAME.1** | Additional services may be added as **WHITELIST_HOSTNAME.#** starting with `2` for `#`, etc
`pe-bolt-server` |
@@ -168,10 +177,13 @@ The following values, many of which are already overriden in the `docker-compose
|-----------------------------------------|------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|
| **CERTNAME** | The DNS name used on this services SSL certificate
`pe-puppetdb` |
| **DNS_ALT_NAMES** | Additional DNS names to add to the services SSL certificate (Dockers `hostname` and FQDN are already included)
`${HOSTNAME},$(hostname -s),$(hostname -f),${DNS_ALT_NAMES}` |
+| **PUPPETDB_SSL_PORT** | The listening SSL port for puppetdb
`8081` |
+| **PUPPETDB_LOGLEVEL** | The logging level to use for this service
`info` |
| **USE_PUPPETSERVER** | Should always be set to `true`
`true` |
| **PUPPETSERVER_HOSTNAME** | The DNS hostname of the puppet master
`puppet` |
+| **PUPPETSERVER_PORT** | The port of the puppet master
`8140` |
| **PUPPETDB_POSTGRES_HOSTNAME** | The DNS hostname of the postgres service
`postgres` |
-| **PUPPETDB_POSTGRES_PORT** | The listening port for postgres
`5432` |
+| **PUPPETDB_POSTGRES_PORT** | The port for postgres
`5432` |
| **PUPPETDB_POSTGRES_DATABASE** | The name of the puppetdb database in postgres
`puppetdb` |
| **PUPPETDB_USER** | The puppetdb database user
`puppetdb` |
| **PUPPETDB_PASSWORD** | The puppetdb database password
`puppetdb` |
@@ -186,11 +198,13 @@ The following values, many of which are already overriden in the `docker-compose
| Name | Usage / Default |
|-----------------------------------------|--------------------------------------------------------------------------------------------------------|
| **CERTNAME** | The DNS name used on this services SSL certificate
`postgres` |
-| **PGPORT** | The listening port for postgres
`5432`
+| **DNS_ALT_NAMES** | Additional DNS names to add to the services SSL certificate |
+| **PGPORT** | The listening port for postgres
`5432` |
| **POSTGRES_DB** | The name of the puppetdb database in postgres
`puppetdb` |
| **POSTGRES_USER** | The puppetdb database user
`puppetdb` |
| **POSTGRES_PASSWORD** | The puppetdb database password
`puppetdb` |
| **PUPPETSERVER_HOSTNAME** | The DNS hostname of the puppet master
`puppet` |
+| **PUPPETSERVER_PORT** | The port of the puppet master
`8140` |
| **PUPPETDB_CERTNAME** | The primary DNS name on the puppetdb certificate
`pe-puppetdb` |
| **PE_CONSOLE_SERVICES_CERTNAME** | The primary DNS name of the pe-console-services certificate
`pe-console-services` |
| **PE_ORCHESTRATION_SERVICES_CERTNAME** | The primary DNS name on the pe-orchestration-services certificate
`pe-orchestration-services` |
diff --git a/commercial/docker-compose.yml b/commercial/docker-compose.yml
index 6bb5ded4..cb12ae2e 100644
--- a/commercial/docker-compose.yml
+++ b/commercial/docker-compose.yml
@@ -5,11 +5,12 @@ services:
hostname: puppet.test
environment:
- CERTNAME=puppet.test
+ - PUPPETSERVER_PORT=8140
+ - PUPPETSERVER_LOG_LEVEL=info
- PUPPETDB_HOSTNAME=puppetdb.test
- PE_CONSOLE_SERVICES_HOSTNAME=pe-console-services.test
- PE_ORCHESTRATION_SERVICES_HOSTNAME=pe-orchestration-services.test
# puppet::enterprise class parameters written to hiera.yaml
- - PUPPETSERVER_PORT=8140
- POSTGRES_HOSTNAME=postgres.test
- PUPPETDB_SSL_PORT=8081
- PE_ORCHESTRATION_SERVICES_PORT=8143
@@ -37,9 +38,14 @@ services:
hostname: pe-orchestration-services.test
environment:
- CERTNAME=pe-orchestration-services.test
+ - PCP_BROKER_PORT=8142
+ - PE_ORCHESTRATION_SERVICES_PORT=8143
- PUPPETSERVER_HOSTNAME=puppet.test
+ - PUPPETSERVER_PORT=8140
- PUPPETDB_HOSTNAME=puppetdb.test
+ - PUPPETDB_SSL_PORT=8081
- POSTGRES_HOSTNAME=postgres.test
+ - POSTGRES_PORT=5432
- PE_BOLT_SERVER_HOSTNAME=pe-bolt-server.test
- PE_CONSOLE_SERVICES_HOSTNAME=pe-console-services.test
- PUPPERWARE_ADMIN_PASSWORD=pupperware
@@ -61,6 +67,7 @@ services:
hostname: pe-console-services.test
environment:
- CERTNAME=pe-console-services.test
+ - PE_CONSOLE_SERVICES_LOG_LEVEL=info
- PUPPETSERVER_HOSTNAME=puppet.test
- PUPPETSERVER_CERTNAME=puppet.test
- PUPPETSERVER_PORT=8140
@@ -71,6 +78,7 @@ services:
- POSTGRES_PORT=5432
- PE_ORCHESTRATION_SERVICES_HOSTNAME=pe-orchestration-services.test
- PE_ORCHESTRATION_SERVICES_CERTNAME=pe-orchestration-services.test
+ - PE_ORCHESTRATION_SERVICES_PORT=8143
volumes:
- console-services:/opt/puppetlabs/server/data/console-services
restart: always
@@ -97,6 +105,7 @@ services:
environment:
- CERTNAME=pe-bolt-server.test
- PUPPETSERVER_HOSTNAME=puppet.test
+ - PUPPETSERVER_PORT=8140
- PE_BOLT_SERVER_LOGLEVEL=${PE_BOLT_SERVER_LOGLEVEL:-info}
- WHITELIST_HOSTNAME.0=pe-bolt-server.test
- WHITELIST_HOSTNAME.1=pe-orchestration-services.test
@@ -111,8 +120,11 @@ services:
hostname: puppetdb.test
environment:
- CERTNAME=puppetdb.test
+ - PUPPETDB_SSL_PORT=8081
+ - PUPPETDB_LOG_LEVEL=info
- USE_PUPPETSERVER=true
- PUPPETSERVER_HOSTNAME=puppet.test
+ - PUPPETSERVER_PORT=8140
- PUPPETDB_POSTGRES_HOSTNAME=postgres.test
- PUPPETDB_POSTGRES_PORT=5432
- PUPPETDB_PASSWORD=puppetdb
@@ -138,9 +150,11 @@ services:
image: artifactory.delivery.puppetlabs.net/pe-and-platform/pe-postgres
hostname: postgres.test
environment:
+ - PGPORT=5432
- CERTNAME=postgres.test
- POSTGRES_PASSWORD=puppetdb
- PUPPETSERVER_HOSTNAME=puppet.test
+ - PUPPETSERVER_PORT=8140
- PUPPETDB_CERTNAME=puppetdb.test
- PE_CONSOLE_SERVICES_CERTNAME=pe-console-services.test
- PE_ORCHESTRATION_SERVICES_CERTNAME=pe-orchestration-services.test