diff options
| author |   Christophe Closset <cc697w@intl.att.com> | 2017-03-08 17:09:48 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <gerrit@openecomp.org> | 2017-03-08 17:09:48 +0000 |
| commit | 60760692af59cfd30cdf3d481087d00f09fcf8e9 (patch) | |
| tree | 4ffb43103d992b257c3a28df02dd6e4ab21cd826 | |
| parent | 78cb324780f4ca44238d14f84592edfd57999898 (diff) | |
| parent | c4a12db99ca3789cf9e0e3475bba8f12e9b29e0b (diff) | |
Merge "Do not start chef-solo if mso-docker.json is empty"
| -rwxr-xr-x[-rw-r--r--] | packages/docker/src/main/docker/docker-files/scripts/start-jboss-server.sh | 11 |
1 files changed, 8 insertions, 3 deletions
diff --git a/packages/docker/src/main/docker/docker-files/scripts/start-jboss-server.sh b/packages/docker/src/main/docker/docker-files/scripts/start-jboss-server.sh index 2e9b9da27d..d8d81cca6c 100644..100755 --- a/packages/docker/src/main/docker/docker-files/scripts/start-jboss-server.sh +++ b/packages/docker/src/main/docker/docker-files/scripts/start-jboss-server.sh @@ -12,9 +12,14 @@ update-ca-certificates echo 'Running in JBOSS' su - jboss -#Start the chef-solo -chef-solo -c /var/berks-cookbooks/${CHEF_REPO_NAME}/solo.rb -o recipe[mso-config::apih],recipe[mso-config::bpmn],recipe[mso-config::jra] - +#Start the chef-solo if mso-docker.json contains some data. +if [ -s /var/berks-cookbooks/${CHEF_REPO_NAME}/environments/mso-docker.json ] +then + echo "mso-docker.json has some configuration, replay the recipes." + chef-solo -c /var/berks-cookbooks/${CHEF_REPO_NAME}/solo.rb -o recipe[mso-config::apih],recipe[mso-config::bpmn],recipe[mso-config::jra] +else + echo "mso-docker.json is empty, do not replay the recipes." +fi JBOSS_PIDFILE=/tmp/jboss-standalone.pid $JBOSS_HOME/bin/standalone.sh -c standalone-full-ha-mso.xml & |