diff options
Diffstat (limited to 'installation')
| -rw-r--r-- | installation/sdnc/src/main/scripts/installCerts.py | 4 | ||||
| -rwxr-xr-x | installation/sdnc/src/main/scripts/startODL.sh | 3 | ||||
| -rw-r--r-- | installation/src/main/yaml/docker-compose.yml | 2 |
3 files changed, 6 insertions, 3 deletions
diff --git a/installation/sdnc/src/main/scripts/installCerts.py b/installation/sdnc/src/main/scripts/installCerts.py index a8133d5f..ae5d5b3b 100644 --- a/installation/sdnc/src/main/scripts/installCerts.py +++ b/installation/sdnc/src/main/scripts/installCerts.py @@ -221,9 +221,9 @@ def timeIncrement(timePassed): def get_pass(file_name): try: - with open(file_name , 'r') as file_obj: + with open(file_name, 'r') as file_obj: password = file_obj.read().strip() - return password + return "'{}'".format(password) except Exception as e: logging.error("Error occurred while fetching password : %s", e) exit() diff --git a/installation/sdnc/src/main/scripts/startODL.sh b/installation/sdnc/src/main/scripts/startODL.sh index e043bc04..47388512 100755 --- a/installation/sdnc/src/main/scripts/startODL.sh +++ b/installation/sdnc/src/main/scripts/startODL.sh @@ -173,6 +173,9 @@ fi cp /opt/opendaylight/current/certs/* /tmp cp -r /opt/app/osaaf/local/. /tmp +# Create ODL data log directory (it nornally is created after karaf +# is started, but needs to exist before installCerts.py runs) +mkdir -p /opt/opendaylight/data/log nohup python ${SDNC_BIN}/installCerts.py & exec ${ODL_HOME}/bin/karaf server diff --git a/installation/src/main/yaml/docker-compose.yml b/installation/src/main/yaml/docker-compose.yml index 54d3cbbf..773d0616 100644 --- a/installation/src/main/yaml/docker-compose.yml +++ b/installation/src/main/yaml/docker-compose.yml @@ -61,7 +61,7 @@ services: - SDNC_CONFIG_DIR=/opt/onap/sdnc/data/properties - SDNC_BIN=/opt/onap/sdnc/bin - ODL_CERT_DIR=/tmp - - ODL_ADMIN_USERNAMEadmin + - ODL_ADMIN_USERNAME=admin - ODL_ADMIN_PASSWORD=Kp8bJ4SXszM0WXlhak3eHlcse2gAw84vaoGGmJvUy2U dns: - ${DNS_IP_ADDR-10.0.100.1} |