X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=ansible-server%2Fsrc%2Fmain%2Fansible-server%2FAnsibleModule.py;h=d0af0cf2f3807dbfe39ce05409a8d46a4d249401;hb=refs%2Fchanges%2F99%2F86699%2F1;hp=2da7912929a310d458182a01bf446779a2054bb2;hpb=72d081256d30e5591a21298d117810062eadfd3d;p=ccsdk%2Fdistribution.git diff --git a/ansible-server/src/main/ansible-server/AnsibleModule.py b/ansible-server/src/main/ansible-server/AnsibleModule.py index 2da79129..d0af0cf2 100755 --- a/ansible-server/src/main/ansible-server/AnsibleModule.py +++ b/ansible-server/src/main/ansible-server/AnsibleModule.py @@ -19,7 +19,6 @@ * 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========================================================= */ ''' @@ -47,16 +46,16 @@ def ansibleSysCall (inventory_path, playbook_path, nodelist, mandatory, if str_parameters == '': str_parameters = '"' + str(key) + '=\'' + str(envparameters[key]) + '\'' else: - #str_parameters += ' ' + str(key) + '=\'' + str(envparameters[key]) + '\'' - str_parameters += ', ' + str(key) + '=\'' + str(envparameters[key]) + '\'' + str_parameters += ' ' + str(key) + '=\'' + str(envparameters[key]) + '\'' + # str_parameters += ', ' + str(key) + '=\'' + str(envparameters[key]) + '\'' str_parameters += '"' if len(str_parameters) > 0: - cmd = 'export HOME=/root; env; cd ' + playbookdir + ';' +'timeout -s KILL -t ' + str(timeout) + \ + cmd = 'export HOME=/home/ansible; env; cd ' + playbookdir + ';' +'timeout -s KILL -t ' + str(timeout) + \ ' ansible-playbook -v --timeout ' + str(timeout) + ' --extra-vars ' + str_parameters + ' -i ' + \ inventory_path + ' ' + playbook_path + ' | tee log.file' else: - cmd = 'export HOME=/root; env; cd ' + playbookdir + ';' +'timeout -s KILL -t ' + str(timeout) + \ + cmd = 'export HOME=/home/ansible; env; cd ' + playbookdir + ';' +'timeout -s KILL -t ' + str(timeout) + \ ' ansible-playbook -v --timeout ' + str(timeout) + ' -i ' + inventory_path + ' ' + playbook_path +' | tee log.file' cherrypy.log("CMD: " + cmd)