summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMartin Blanchard <martin.blanchard@codethink.co.uk>2019-02-21 13:48:14 +0000
committerMartin Blanchard <martin.blanchard@codethink.co.uk>2019-02-21 17:56:15 +0000
commitc71fb34f5054a10d32c8040f65c7c4da6f919f5f (patch)
tree05e23cf95017a825952895f967a65f4595c289d7
parent40ce6e337652632905cfcbc1cac4b4e5b8e22d93 (diff)
downloadbuildstream-mablanch/823-action-cache-instance-name.tar.gz
doc: Update configuration examples with 'instance-name'mablanch/823-action-cache-instance-name
-rw-r--r--doc/source/format_project.rst1
-rw-r--r--doc/source/using_config.rst10
2 files changed, 7 insertions, 4 deletions
diff --git a/doc/source/format_project.rst b/doc/source/format_project.rst
index f4dea333a..529816176 100644
--- a/doc/source/format_project.rst
+++ b/doc/source/format_project.rst
@@ -243,6 +243,7 @@ using the `remote-execution` option:
instance-name: development-emea-1
action-cache-service:
url: http://bar.action.com:50052
+ instance-name: development-emea-1
storage-service specifies a remote CAS store and the parameters are the
same as those used to specify an :ref:`artifact server <artifacts>`.
diff --git a/doc/source/using_config.rst b/doc/source/using_config.rst
index 71ca64a4a..a7ee4dca9 100644
--- a/doc/source/using_config.rst
+++ b/doc/source/using_config.rst
@@ -122,13 +122,14 @@ configuration will be used as fallback.
url: http://execution.fallback.example.com:50051
instance-name: main
storage-service:
- url: https://storage.fallback.example.com:11002/
+ url: https://storage.fallback.example.com:11002
server-cert: /keys/server.crt
client-cert: /keys/client.crt
client-key: /keys/client.key
instance-name: main
action-cache-service:
- url: http://action.flalback.example.com:50052
+ url: http://cache.flalback.example.com:50052
+ instance-name: main
2. Project override:
@@ -141,13 +142,14 @@ configuration will be used as fallback.
url: http://execution.some_project.example.com:50051
instance-name: main
storage-service:
- url: https://storage.some_project.example.com:11002/
+ url: https://storage.some_project.example.com:11002
server-cert: /some_project_keys/server.crt
client-cert: /some_project_keys/client.crt
client-key: /some_project_keys/client.key
instance-name: main
action-cache-service:
- url: http://action.some_project.example.com:50052
+ url: http://cache.some_project.example.com:50052
+ instance-name: main
Strict build plan