This is an automated email from the ASF dual-hosted git repository.
chetanm pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/openwhisk.git
The following commit(s) were added to refs/heads/master by this push:
new 7f8d3fe Remove configureOSSpecificOpts and move to standalone.conf
(#4578)
7f8d3fe is described below
commit 7f8d3fe68ae9528c5dc7a79165165ad914ce0856
Author: yihuaf <fang.yihua.e...@gmail.com>
AuthorDate: Thu Aug 8 21:19:23 2019 -0700
Remove configureOSSpecificOpts and move to standalone.conf (#4578)
The setSysOps override the standalone.conf since standalone.conf is
evaluated first. This makes it tricky to configure them via custom config
files. Moving these options from code into
standalone.conf, so a custom config files can potentially override them.
---
core/standalone/src/main/resources/standalone.conf | 9 +++++++++
.../apache/openwhisk/standalone/StandaloneOpenWhisk.scala | 14 --------------
2 files changed, 9 insertions(+), 14 deletions(-)
diff --git a/core/standalone/src/main/resources/standalone.conf
b/core/standalone/src/main/resources/standalone.conf
index c735677..b10b093 100644
--- a/core/standalone/src/main/resources/standalone.conf
+++ b/core/standalone/src/main/resources/standalone.conf
@@ -32,6 +32,10 @@ whisk {
ArtifactStoreProvider =
"org.apache.openwhisk.core.database.memory.MemoryArtifactStoreProvider"
MessagingProvider =
"org.apache.openwhisk.connector.lean.LeanMessagingProvider"
LoadBalancerProvider =
"org.apache.openwhisk.core.loadBalancer.LeanBalancer"
+ # Use cli based log store for all setups as its more stable to use
+ # and does not require root user access
+ LogStoreProvider =
"org.apache.openwhisk.core.containerpool.docker.DockerCliLogStoreProvider"
+ ContainerFactoryProvider =
"org.apache.openwhisk.core.containerpool.docker.StandaloneDockerContainerFactoryProvider"
}
info {
@@ -67,6 +71,11 @@ whisk {
#If enabled then pull would also be attempted for standard OpenWhisk
images under`openwhisk` prefix
pull-standard-images: true
}
+
+ container-factory {
+ # Disable runc by default to keep things stable
+ use-runc: false
+ }
}
swagger-ui {
file-system : false
diff --git
a/core/standalone/src/main/scala/org/apache/openwhisk/standalone/StandaloneOpenWhisk.scala
b/core/standalone/src/main/scala/org/apache/openwhisk/standalone/StandaloneOpenWhisk.scala
index ff0de51..ccaf22f 100644
---
a/core/standalone/src/main/scala/org/apache/openwhisk/standalone/StandaloneOpenWhisk.scala
+++
b/core/standalone/src/main/scala/org/apache/openwhisk/standalone/StandaloneOpenWhisk.scala
@@ -123,7 +123,6 @@ object StandaloneOpenWhisk extends SLF4JLogging {
def initialize(conf: Conf): Unit = {
configureBuildInfo()
configureServerPort(conf)
- configureOSSpecificOpts()
initConfigLocation(conf)
configureRuntimeManifest(conf)
loadWhiskConfig()
@@ -196,19 +195,6 @@ object StandaloneOpenWhisk extends SLF4JLogging {
}
}
- private def configureOSSpecificOpts(): Unit = {
- setSysProp(
- "whisk.spi.ContainerFactoryProvider",
-
"org.apache.openwhisk.core.containerpool.docker.StandaloneDockerContainerFactoryProvider")
-
- //Disable runc by default to keep things stable
- setSysProp("whisk.docker.container-factory.use-runc", "False")
-
- //Use cli based log store for all setups as its more stable to use
- // and does not require root user access
- setSysProp("whisk.spi.LogStoreProvider",
"org.apache.openwhisk.core.containerpool.docker.DockerCliLogStoreProvider")
- }
-
private def localHostName = {
//For connecting back to controller on container host following name needs
to be used
// on Windows and Mac
