diff options
| author |   Timoney, Dan (dt5972) <dt5972@att.com> | 2018-04-27 08:55:48 -0400 |
|---|---|---|
| committer | Timoney, Dan (dt5972) <dt5972@att.com> | 2018-04-27 08:55:48 -0400 |
| commit | 9b844cb5985a1a573a1ed43990aac3282547b2ce (patch) | |
| tree | 538f27219e2595bdf74a2c37f250f7c6e47e3e8d /installation/ansible-server/src/main | |
| parent | 49e275cac824dd6dcd4cbc7ccd5f922419d662f3 (diff) | |
Fix ansible server config
Added ansible server to docker-compose.yml and made a few config changes:
- redirect of output in final exec causes exec to fail. Instead, need
to redirect output in standalone exec line. Redirected to
/var/log/ansible-server.log
- Updated LCM config to use ansiblehost alias to reach ansible
(was incorrectly using 0.0.0.0)
Change-Id: I4b1b6bbc5f3df6f480333d53adda4c8e6e0d6510
Issue-ID: SDNC-288
Signed-off-by: Timoney, Dan (dt5972) <dt5972@att.com>
Former-commit-id: 50c65c2c7cd92db6d14215114d098b33da5f618d
Diffstat (limited to 'installation/ansible-server/src/main')
| -rw-r--r-- | installation/ansible-server/src/main/scripts/RestServer_config | 6 | ||||
| -rw-r--r-- | installation/ansible-server/src/main/scripts/startAnsibleServer.sh | 3 |
2 files changed, 5 insertions, 4 deletions
diff --git a/installation/ansible-server/src/main/scripts/RestServer_config b/installation/ansible-server/src/main/scripts/RestServer_config index accfb044..a98d8749 100644 --- a/installation/ansible-server/src/main/scripts/RestServer_config +++ b/installation/ansible-server/src/main/scripts/RestServer_config @@ -17,13 +17,13 @@ # * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. # * See the License for the specific language governing permissions and # * limitations under the License. -# * +# * # * ECOMP is a trademark and service mark of AT&T Intellectual Property. # * ============LICENSE_END========================================================= # */ # Host definition -ip: 0.0.0.0 +ip: 0.0.0.0 port: 8000 # Security (controls use of TLS encrypton and RestServer authentication) @@ -39,7 +39,7 @@ id: sdnc psswd: sdnc # Mysql -host: localhost +host: dbhost user: sdnc passwd: sdnc db: ansible diff --git a/installation/ansible-server/src/main/scripts/startAnsibleServer.sh b/installation/ansible-server/src/main/scripts/startAnsibleServer.sh index 643bbab2..e9b912bb 100644 --- a/installation/ansible-server/src/main/scripts/startAnsibleServer.sh +++ b/installation/ansible-server/src/main/scripts/startAnsibleServer.sh @@ -1,4 +1,5 @@ #/bin/bash +exec &> /var/log/ansible-server.log if [ ! -d /tmp/.ansible-server-installed] then @@ -13,4 +14,4 @@ then fi cd /opt/onap/sdnc -exec python RestServer.py > RestServer.out
\ No newline at end of file +exec python RestServer.py
\ No newline at end of file |