From: Dan Timoney Date: Mon, 19 Nov 2018 22:38:06 +0000 (+0000) Subject: Merge "[CCSDK-683] fixed dg import from local git repo" X-Git-Tag: 0.4.0~7 X-Git-Url: https://gerrit.onap.org/r/gitweb?p=ccsdk%2Fdistribution.git;a=commitdiff_plain;h=fc59bbb6279e492dea2fa361c7080163f3f888ea;hp=8797a459b6a5c4516032260cc55663e08a2ab538 Merge "[CCSDK-683] fixed dg import from local git repo" --- diff --git a/ansible-server/src/main/scripts/startAnsibleServer.sh b/ansible-server/src/main/scripts/startAnsibleServer.sh index dd6f2a36..1d76b1a3 100644 --- a/ansible-server/src/main/scripts/startAnsibleServer.sh +++ b/ansible-server/src/main/scripts/startAnsibleServer.sh @@ -7,6 +7,7 @@ then pip install 'cherrypy<18.0.0' pip install requests + apt-get update -y apt-get -y install software-properties-common apt-add-repository -y ppa:ansible/ansible apt-get -y install ansible diff --git a/dgbuilder/CONTRIBUTING.md b/dgbuilder/CONTRIBUTING.md index 52fe8911..6e193361 100644 --- a/dgbuilder/CONTRIBUTING.md +++ b/dgbuilder/CONTRIBUTING.md @@ -58,7 +58,7 @@ code base. Some basic rules include: - opening brace on same line as `if`/`for`/`function`/etc, closing brace on its own line. -### Contributor License Aggreement +### Contributor License Agreement In order for us to accept pull-requests, the contributor must first complete a Contributor License Agreement (CLA). This clarifies the intellectual diff --git a/docs/release-notes.rst b/docs/release-notes.rst index b3a4c291..bdf8529c 100644 --- a/docs/release-notes.rst +++ b/docs/release-notes.rst @@ -1,10 +1,43 @@ .. This work is licensed under a Creative Commons Attribution 4.0 International License. Release Notes -============= +############# + +Version: 0.3.2 +************** + +:Release Date: 2018-11-15 + +**New Features** + +The full list of Casablanca epics and user stories for CCSDK maybe be found at . +The following list summarizes some of the most significant epics: + ++-------------+------------------------------------------------+ +| Jira # | Abstract | ++=============+================================================+ +| [CCSDK-279] | Update to OpenDaylight Oxygen release | ++-------------+------------------------------------------------+ +| [CCSDK-357] | Develop Controller Design Studio in Casablanca | ++-------------+------------------------------------------------+ +| [CCSDK-324] | Enhancements to support CCVPN use case | ++-------------+------------------------------------------------+ +| [CCSDK-288] | Usability Enhancements | ++-------------+------------------------------------------------+ + +**Bug Fixes** +The full list of bug fixes in the CCSDK Casablanca release may be found at + +**Known Issues** +The full list of known issues in CCSDK may be found in the ONAP Jira at ++-------------+-------------------------------------------------------+ +| Jira # | Abstract | ++-------------+-------------------------------------------------------+ +| [CCSDK-293] | COMPONENT_DONE not being sent after model is received | ++-------------+-------------------------------------------------------+ Version: 0.2.4 --------------- +************** :Release Date: 2018-06-07 @@ -16,25 +49,25 @@ Version: 0.2.4 The full list of Beijing Epics and user stories for CCSDK may be found at . The following list summarizes some of the more critical features: -+-------------+---------------------------------------------------------------------------------------------------------------------+ -| Jira # | Abstract | -+=============+=====================================================================================================================+ -| [CCSDK-222] | Ansible server support | -+-------------+---------------------------------------------------------------------------------------------------------------------+ -| [CCSDK-191] | enable fast loading of graphs | -+-------------+---------------------------------------------------------------------------------------------------------------------+ -| [CCSDK-179] | Upgrade CCSDK ODL containers to Nitrogen | -+-------------+---------------------------------------------------------------------------------------------------------------------+ -| [CCSDK-177] | Upgrade sli/northbound to Nitrogen | -+-------------+---------------------------------------------------------------------------------------------------------------------+ -| [CCSDK-176] | Upgrade sli/adaptors to Nitrogen | -+-------------+---------------------------------------------------------------------------------------------------------------------+ -| [CCSDK-175] | Upgrade sli/core to Nitrogen | -+-------------+---------------------------------------------------------------------------------------------------------------------+ -| [CCSDK-174] | Update ccsdk parent to support Nitrogen parent poms | -+-------------+---------------------------------------------------------------------------------------------------------------------+ -| [CCSDK-172] | Ability to call Ansible playbook from directed graph | -+-------------+---------------------------------------------------------------------------------------------------------------------+ ++--------------+-----------------------------------------------------------------------------------------------+ +| Jira # | Abstract | ++==============+===============================================================================================+ +| [CCSDK-222]  | Ansible server support | ++--------------+-----------------------------------------------------------------------------------------------+ +| [CCSDK-191]  | enable fast loading of graphs | ++--------------+-----------------------------------------------------------------------------------------------+ +| [CCSDK-179]  | Upgrade CCSDK ODL containers to Nitrogen | ++--------------+-----------------------------------------------------------------------------------------------+ +| [CCSDK-177]  | Upgrade sli/northbound to Nitrogen | ++--------------+-----------------------------------------------------------------------------------------------+ +| [CCSDK-176]  | Upgrade sli/adaptors to Nitrogen | ++--------------+-----------------------------------------------------------------------------------------------+ +| [CCSDK-175]  | Upgrade sli/core to Nitrogen | ++--------------+-----------------------------------------------------------------------------------------------+ +| [CCSDK-174]  | Update ccsdk parent to support Nitrogen parent poms | ++--------------+-----------------------------------------------------------------------------------------------+ +| [CCSDK-172]  | Ability to call Ansible playbook from directed graph | ++--------------+-----------------------------------------------------------------------------------------------+ **Bug Fixes** @@ -42,11 +75,11 @@ The full list of bug fixes in the CCSDK Beijing release may be found at | -+-------------+-----------------------------------------------------------------------------------------------------+ ++--------------+-----------------------------------------------------------------------------------------------------+ +| Jira # | Abstract | ++==============+=====================================================================================================+ +| [CCSDK-136]  | pgaas is dependent on location\_prefix being all lowercase | ++--------------+-----------------------------------------------------------------------------------------------------+ **Security Notes** @@ -73,7 +106,7 @@ N/A Version: 0.1.0 --------------- +************** :Release Date: 2017-11-16 diff --git a/odlsli/src/main/scripts/startODL.sh b/odlsli/src/main/scripts/startODL.sh index 8c45dda5..4d608577 100644 --- a/odlsli/src/main/scripts/startODL.sh +++ b/odlsli/src/main/scripts/startODL.sh @@ -29,6 +29,7 @@ ODL_ADMIN_PASSWORD=${ODL_ADMIN_PASSWORD:-Kp8bJ4SXszM0WXlhak3eHlcse2gAw84vaoGGmJv CCSDK_HOME=${CCSDK_HOME:-/opt/onap/ccsdk} SLEEP_TIME=${SLEEP_TIME:-120} MYSQL_PASSWD=${MYSQL_PASSWD:-openECOMP1.0} +INSTALLED_DIR=${INSTALLED_FILE:-/opt/opendaylight/current/daexim} # @@ -42,7 +43,12 @@ do done echo -e "\nmysql ready" -if [ ! -f ${CCSDK_HOME}/.installed ] +if [ ! -d ${INSTALLED_DIR} ] +then + mkdir -p ${INSTALLED_DIR} +fi + +if [ ! -f ${INSTALLED_DIR}/.installed ] then echo "Installing SDN-C database" ${CCSDK_HOME}/bin/installSdncDb.sh @@ -53,7 +59,7 @@ then echo "Installing directed graphs" ${CCSDK_HOME}/svclogic/bin/install.sh fi - echo "Installed at `date`" > ${CCSDK_HOME}/.installed + echo "Installed at `date`" > ${INSTALLED_DIR}/.installed fi exec ${ODL_HOME}/bin/karaf server