aboutsummaryrefslogtreecommitdiffstats
path: root/deployment
diff options
context:
space:
mode:
authorsubhash kumar singh <subhash.kumar.singh@huawei.com>2018-04-18 06:10:17 +0000
committerGerrit Code Review <gerrit@onap.org>2018-04-18 06:10:17 +0000
commit3fd14ba470bee167f01e2c29be02607085220044 (patch)
tree3249775cf929d982151dd48a9d51ec92c8caf10a /deployment
parenteda59089e0d05bac852093c24db6dc34e4c0c89d (diff)
parent60de9607d95ed3c0733e2dac436cc39da1d13289 (diff)
Merge changes Ib986931f,I3abfe1a5,I2df477bb,Iae51b3c6,Id22e629a, ...
* changes: Update OCLIP commands details Update the architecture document with cache Remove unused images in docs Add onap cmd alias in CLI docker Set CLI version to 2.0.0 Set logging level to INFO by default Add onap cmd alias to oclip Disable debug while starting cli in ALL mode
Diffstat (limited to 'deployment')
-rw-r--r--deployment/docker/src/main/docker/Dockerfile2
-rw-r--r--deployment/docker/src/main/docker/docker-compose.yaml2
-rw-r--r--deployment/zip/installer/install.sh3
-rw-r--r--deployment/zip/src/main/release/conf/log4j.properties2
-rw-r--r--deployment/zip/src/main/release/conf/open-cli.properties2
5 files changed, 6 insertions, 5 deletions
diff --git a/deployment/docker/src/main/docker/Dockerfile b/deployment/docker/src/main/docker/Dockerfile
index 074bb164..d6bd9389 100644
--- a/deployment/docker/src/main/docker/Dockerfile
+++ b/deployment/docker/src/main/docker/Dockerfile
@@ -29,8 +29,6 @@ RUN apt-get update && apt-get install -y lighttpd git curl pandoc vim && \
cp $OPEN_CLI_HOME/http/web/*.* /var/www-data/servers/open-cli/ && \
cp $OPEN_CLI_HOME/http/lighttpd/10-proxy.conf /etc/lighttpd/conf-enabled/ && \
cp $OPEN_CLI_HOME/installer/cli-*.zip /var/www-data/servers/open-cli/oclip.zip
-
-
EXPOSE 80
EXPOSE 8080
diff --git a/deployment/docker/src/main/docker/docker-compose.yaml b/deployment/docker/src/main/docker/docker-compose.yaml
index 9ca3cf49..944c2d71 100644
--- a/deployment/docker/src/main/docker/docker-compose.yaml
+++ b/deployment/docker/src/main/docker/docker-compose.yaml
@@ -30,7 +30,7 @@ services:
image: onap/cli
environment:
OPEN_CLI_MODE: 'daemon'
- OPEN_CLI_DEBUG: "true"
+ OPEN_CLI_DEBUG: "false"
ports:
- 30260:80
- 30261:8080
diff --git a/deployment/zip/installer/install.sh b/deployment/zip/installer/install.sh
index ae702271..4503c371 100644
--- a/deployment/zip/installer/install.sh
+++ b/deployment/zip/installer/install.sh
@@ -28,8 +28,11 @@ chmod +x ./bin/oclip.sh
#Make oclip available in path
ln -sf ./bin/oclip.sh /usr/bin/oclip
+ln -sf ./bin/oclip.sh /usr/bin/onap
#Print the version
oclip -v
+onap -v
+
cd - \ No newline at end of file
diff --git a/deployment/zip/src/main/release/conf/log4j.properties b/deployment/zip/src/main/release/conf/log4j.properties
index f117ef6e..a0324a9b 100644
--- a/deployment/zip/src/main/release/conf/log4j.properties
+++ b/deployment/zip/src/main/release/conf/log4j.properties
@@ -1,4 +1,4 @@
-log4j.rootLogger=ERROR, file
+log4j.rootLogger=INFO, file
# Redirect log messages to a log file, support file rolling.
log4j.appender.file=org.apache.log4j.RollingFileAppender
diff --git a/deployment/zip/src/main/release/conf/open-cli.properties b/deployment/zip/src/main/release/conf/open-cli.properties
index 9b5bceeb..2d68edf8 100644
--- a/deployment/zip/src/main/release/conf/open-cli.properties
+++ b/deployment/zip/src/main/release/conf/open-cli.properties
@@ -1,5 +1,5 @@
cli.product_name=open-cli
-cli.version=1.0
+cli.version=2.0.0
cli.discover_always=false