summaryrefslogtreecommitdiffstats
path: root/conductor.conf
AgeCommit message (Collapse)AuthorFilesLines
2018-06-04Fix OOF configurationDileep Ranganathan1-2/+30
Added missing multicloud section in conductor.conf Updated music version to reflect the latest version Change-Id: I7e943c4344c63d4e18df9f00f6b61600e97295a7 Issue-ID: OPTFRA-232 Signed-off-by: Dileep Ranganathan <dileep.ranganathan@intel.com>
2018-05-17Fixing connectivity issue with AAIRitu Sood1-2/+2
Removing the old certificates from conf file. Having these here causes connectivity issue with AAI Change-Id: I847ce9dcfc715124617edd305bb83acedbbbb10e Issue-ID: OPTFRA-232 Signed-off-by: Ritu Sood <ritu.sood@intel.com>
2018-05-11Adding basic auth to AAI PluginRitu Sood1-1/+8
For now leaving the original certificates as before so as not to disturb any existing test cases etc. Issue-ID: OPTFRA-232 Change-Id: If28c772f14c89dbf4229d754cf9dd49094fc5196 Signed-off-by: Ritu Sood <ritu.sood@intel.com>
2018-04-23Added AAI CertsIkramullah, Ikram1-6/+6
Heat based implementation changes added Issue-ID: INT-444 Change-Id: Ic3096422c9997be66d6d967c8938e35c6e2b2e0f Signed-off-by: Ikramullah, Ikram <ikram@research.att.com>
2018-03-23Accommodate Changes for Music 2.4.xIkram Ikramullah1-5/+20
Issue-ID: OPTFRA-199 Change-Id: Ieadb1ae38621cd406af384458a9fce6ffdd15f0c Signed-off-by: Ikram Ikramullah <ikram@research.att.com>
2018-03-16All compnents on Single docker imageIkram Ikramullah1-0/+328
Made changes to docker settings to make a single image instead of multiple. Also made changes to the run and build scripts to work on this single image. The data component requires certs, keys and ca bundles settings too. For this, made changes to the run script. Also, do to this, added the feature of picking the default values from the current directory if arguments are not provided to the run-docker.scripts. For example: sudo ./run-dockers.sh will run without providing any arguments to it IF the directory from where it is run has these files in it. 1. conductor.conf -- configuration file 2. log.conf -- log settings files 3. aai_cert.cer 4. aai_key.key 5. aai_ca_bunlde.pem (pem) file The first two from the above have been created and provided in the current directory (has/). However, since certs will be different from env to env, the last three needs to be provided either by copying in the current direcotry or as the arguments 3, 4 and 5. The script will give a detailed message on what may be missing and how an attempt was made to get the default files. Checkt it out by playing with run-docker.sh file. Finally, the build script also calls the push script now. Since there can be no testing of this in ONAP artifcats prod BEFORE being merged to master, we can only test the push part once merged to master. Issue-ID: OPTFRA-123 Change-Id: I83c54c97953b71aae18166b937dd89195e705f73 Signed-off-by: Ikram Ikramullah <ikram@research.att.com>