diff options
| -rw-r--r-- | admportal/views/user/list.ejs | 2 | ||||
| -rwxr-xr-x | installation/sdnc/src/main/docker/Dockerfile | 4 | ||||
| -rw-r--r-- | installation/sdnc/src/main/resources/sdnctl.dump | 1 | ||||
| -rw-r--r-- | installation/ueb-listener/src/main/docker/Dockerfile | 2 |
4 files changed, 7 insertions, 2 deletions
diff --git a/admportal/views/user/list.ejs b/admportal/views/user/list.ejs index 4a4e909c..947a8114 100644 --- a/admportal/views/user/list.ejs +++ b/admportal/views/user/list.ejs @@ -178,7 +178,7 @@ function updateRequest(email,password,privilege) { document.getElementById('uf_confirm_password').value = password; if ( privilege == "A" ){ document.getElementById('uf_privilege').value = 'admin'; - }else if (priv == "R"){ + }else if (privilege == "R"){ document.getElementById('uf_privilege').value = 'readonly'; }else{ document.getElementById('uf_privilege').value = 'admin'; diff --git a/installation/sdnc/src/main/docker/Dockerfile b/installation/sdnc/src/main/docker/Dockerfile index 7f7c0dea..df392101 100755 --- a/installation/sdnc/src/main/docker/Dockerfile +++ b/installation/sdnc/src/main/docker/Dockerfile @@ -13,6 +13,8 @@ ENV JAVA_SECURITY_DIR $SSL_CERTS_DIR/java ENV SDNC_NORTHBOUND_REPO mvn:org.onap.sdnc.northbound/sdnc-northbound-all/${sdnc.northbound.version}/xml/features +USER root + # imstall ssl and java certificates COPY AAF_RootCA.cer $SSL_CERTS_DIR @@ -35,6 +37,8 @@ RUN cp $ODL_HOME/etc/org.apache.karaf.features.cfg $ODL_HOME/etc/org.apache.kara RUN sed -i -e "\|featuresRepositories|s|$|,${SDNC_NORTHBOUND_REPO}|" $ODL_HOME/etc/org.apache.karaf.features.cfg RUN sed -i -e "\|featuresBoot[^a-zA-Z]|s|$|,sdnc-northbound-all|" $ODL_HOME/etc/org.apache.karaf.features.cfg +RUN chown -R odl /opt +USER odl ENTRYPOINT /opt/onap/sdnc/bin/startODL.sh EXPOSE 8181 diff --git a/installation/sdnc/src/main/resources/sdnctl.dump b/installation/sdnc/src/main/resources/sdnctl.dump index ee6d8460..dfe7f928 100644 --- a/installation/sdnc/src/main/resources/sdnctl.dump +++ b/installation/sdnc/src/main/resources/sdnctl.dump @@ -1554,6 +1554,7 @@ CREATE TABLE `NETWORK_MODEL` ( `network_type` varchar(255) DEFAULT NULL, `network_role` varchar(255) DEFAULT NULL, `network_technology` varchar(255) DEFAULT NULL, + `trunk_network_indicator` char(1) DEFAULT NULL, `network_scope` varchar(255) DEFAULT NULL, `naming_policy` varchar(255) DEFAULT NULL, `ecomp_generated_naming` char(1) DEFAULT NULL, diff --git a/installation/ueb-listener/src/main/docker/Dockerfile b/installation/ueb-listener/src/main/docker/Dockerfile index 0ff773d9..8008dfd9 100644 --- a/installation/ueb-listener/src/main/docker/Dockerfile +++ b/installation/ueb-listener/src/main/docker/Dockerfile @@ -1,7 +1,7 @@ # Base alpine with added packages needed for open ecomp FROM onap/ccsdk-alpine-image:${ccsdk.docker.version} MAINTAINER SDNC Team (onap-sdnc@lists.onap.org) -ENV JAVA_HOME /usr/lib/jvm/java-8-openjdk +ENV JAVA_HOME /usr/lib/jvm/java-1.8-openjdk ENV SDNC_CONFIG_DIR /opt/onap/sdnc/data/properties |