diff --git a/data/ansible/calls/asterisk/cgrates.yaml b/data/ansible/calls/asterisk/cgrates.yaml index 6d2d859ae..202583517 100644 --- a/data/ansible/calls/asterisk/cgrates.yaml +++ b/data/ansible/calls/asterisk/cgrates.yaml @@ -4,10 +4,10 @@ file: state: directory mode: 'u=rwx,go=rx' - owner: "{{ gouser }}" - group: "{{ gouser }}" + owner: "{{ user }}" + group: "{{ user }}" dest: '{{ cgrates_dir }}' - become_user: "{{ gouser }}" + become_user: "{{ user }}" - name: git clone cgrates git: @@ -16,7 +16,7 @@ update: yes force: yes become: yes - become_user: "{{ gouser }}" + become_user: "{{ user }}" - name: build cgrates shell: "sh {{ cgrates_dir }}/build.sh" diff --git a/data/ansible/calls/asterisk/main.yaml b/data/ansible/calls/asterisk/main.yaml index 71d79ceff..dceee686b 100644 --- a/data/ansible/calls/asterisk/main.yaml +++ b/data/ansible/calls/asterisk/main.yaml @@ -14,7 +14,7 @@ # Directory to store files downloaded for Go language SDK installation golang_download_dir: "{{ x_ansible_download_dir | default(ansible_env.HOME + '/.ansible/tmp/downloads') }}" # Location for GOPATH environment variable - golang_gopath: "/home/{{ gouser }}/go" + golang_gopath: "/home/{{ user }}/go" # Filename of Go language SDK redistributable package golang_redis_filename: 'go{{ golang_version }}.linux-amd64.tar.gz' ############################################################### @@ -49,7 +49,7 @@ customPath: "{{ lookup('env','PATH') }}:{{ golang_gopath }}/bin:/usr/local/go/bin:{{ ansible_env.PATH }}" - remote_user: '{{ gouser }}' + remote_user: '{{ user }}' tasks: ########################################################################################################################### # install dependencies diff --git a/data/ansible/calls/freeswitch/cgrates.yaml b/data/ansible/calls/freeswitch/cgrates.yaml index 6d2d859ae..202583517 100644 --- a/data/ansible/calls/freeswitch/cgrates.yaml +++ b/data/ansible/calls/freeswitch/cgrates.yaml @@ -4,10 +4,10 @@ file: state: directory mode: 'u=rwx,go=rx' - owner: "{{ gouser }}" - group: "{{ gouser }}" + owner: "{{ user }}" + group: "{{ user }}" dest: '{{ cgrates_dir }}' - become_user: "{{ gouser }}" + become_user: "{{ user }}" - name: git clone cgrates git: @@ -16,7 +16,7 @@ update: yes force: yes become: yes - become_user: "{{ gouser }}" + become_user: "{{ user }}" - name: build cgrates shell: "sh {{ cgrates_dir }}/build.sh" diff --git a/data/ansible/calls/freeswitch/main.yaml b/data/ansible/calls/freeswitch/main.yaml index 0816f3c73..11ea78f21 100644 --- a/data/ansible/calls/freeswitch/main.yaml +++ b/data/ansible/calls/freeswitch/main.yaml @@ -14,7 +14,7 @@ # Directory to store files downloaded for Go language SDK installation golang_download_dir: "{{ x_ansible_download_dir | default(ansible_env.HOME + '/.ansible/tmp/downloads') }}" # Location for GOPATH environment variable - golang_gopath: "/home/{{ gouser }}/go" + golang_gopath: "/home/{{ user }}/go" # Filename of Go language SDK redistributable package golang_redis_filename: 'go{{ golang_version }}.linux-amd64.tar.gz' ############################################################### @@ -42,7 +42,7 @@ customPath: "{{ lookup('env','PATH') }}:{{ golang_gopath }}/bin:/usr/local/go/bin:{{ ansible_env.PATH }}" - remote_user: '{{ gouser }}' + remote_user: '{{ user }}' tasks: ########################################################################################################################### # install dependencies diff --git a/data/ansible/calls/kamailio/cgrates.yaml b/data/ansible/calls/kamailio/cgrates.yaml index 6d2d859ae..202583517 100644 --- a/data/ansible/calls/kamailio/cgrates.yaml +++ b/data/ansible/calls/kamailio/cgrates.yaml @@ -4,10 +4,10 @@ file: state: directory mode: 'u=rwx,go=rx' - owner: "{{ gouser }}" - group: "{{ gouser }}" + owner: "{{ user }}" + group: "{{ user }}" dest: '{{ cgrates_dir }}' - become_user: "{{ gouser }}" + become_user: "{{ user }}" - name: git clone cgrates git: @@ -16,7 +16,7 @@ update: yes force: yes become: yes - become_user: "{{ gouser }}" + become_user: "{{ user }}" - name: build cgrates shell: "sh {{ cgrates_dir }}/build.sh" diff --git a/data/ansible/calls/kamailio/main.yaml b/data/ansible/calls/kamailio/main.yaml index 6a312d448..2bec3ae03 100644 --- a/data/ansible/calls/kamailio/main.yaml +++ b/data/ansible/calls/kamailio/main.yaml @@ -14,7 +14,7 @@ # Directory to store files downloaded for Go language SDK installation golang_download_dir: "{{ x_ansible_download_dir | default(ansible_env.HOME + '/.ansible/tmp/downloads') }}" # Location for GOPATH environment variable - golang_gopath: "/home/{{ gouser }}/go" + golang_gopath: "/home/{{ user }}/go" # Filename of Go language SDK redistributable package golang_redis_filename: 'go{{ golang_version }}.linux-amd64.tar.gz' ############################################################### @@ -43,7 +43,7 @@ customPath: "{{ lookup('env','PATH') }}:{{ golang_gopath }}/bin:/usr/local/go/bin:{{ ansible_env.PATH }}" - remote_user: '{{ gouser }}' + remote_user: '{{ user }}' tasks: ########################################################################################################################### # install dependencies diff --git a/data/ansible/deb_packages/main.yaml b/data/ansible/deb_packages/main.yaml index a3124df94..b5041fee8 100644 --- a/data/ansible/deb_packages/main.yaml +++ b/data/ansible/deb_packages/main.yaml @@ -1,7 +1,7 @@ --- - name: Check and set python version on APT server hosts: apt - remote_user: '{{ gouser }}' + remote_user: '{{ user }}' gather_facts: false tasks: - name: symlink /usr/bin/python -> /usr/bin/python3 @@ -13,7 +13,7 @@ - name: Check and set python version on PKG server hosts: pkg - remote_user: '{{ gouser }}' + remote_user: '{{ user }}' gather_facts: false tasks: - name: symlink /usr/bin/python -> /usr/bin/python3 @@ -38,7 +38,7 @@ # Directory to store files downloaded for Go language SDK installation golang_download_dir: "{{ x_ansible_download_dir | default(ansible_env.HOME + '/.ansible/tmp/downloads') }}" # Location for GOPATH environment variable - golang_gopath: "/home/{{ gouser }}/go" + golang_gopath: "/home/{{ user }}/go" # Filename of Go language SDK redistributable package golang_redis_filename: 'go{{ golang_version }}.linux-amd64.tar.gz' @@ -70,7 +70,7 @@ - reprepro - nginx - remote_user: '{{ gouser }}' + remote_user: '{{ user }}' tasks: - name: set cgrates cgrates_distribution set_fact: @@ -123,10 +123,10 @@ file: state: directory mode: 'u=rwx,go=rx' - owner: "{{ gouser }}" - group: "{{ gouser }}" + owner: "{{ user }}" + group: "{{ user }}" dest: '{{ cgrates_dir }}' - become_user: "{{ gouser }}" + become_user: "{{ user }}" - name: git clone cgrates git: @@ -136,7 +136,7 @@ force: yes version: "{{ cgrates_branch }}" become: yes - become_user: "{{ gouser }}" + become_user: "{{ user }}" - name: clean go cache become: yes @@ -229,7 +229,7 @@ # Move the file to PKG server - name: Copy the file to PKG server become: yes - shell: 'sudo sshpass -p "{{ pkgPass }}" scp /var/packages/debian/incoming/{{ item }} {{ gouser }}@{{ internalPkgAddr }}:/tmp/' + shell: 'scp /var/packages/debian/incoming/{{ item }} {{ {{ pkgAddr }} }}:/tmp/' args: chdir: /var/packages/debian/incoming/ with_items: '{{ debFileName.stdout_lines }}' @@ -242,7 +242,7 @@ chdir: /var/packages/debian - hosts: pkg - remote_user: '{{ gouser }}' + remote_user: '{{ user }}' tasks: - name: set cgrates cgrates_distribution set_fact: diff --git a/data/ansible/docker/docker.yaml b/data/ansible/docker/docker.yaml index 75ebc19f7..b5e1e31ad 100644 --- a/data/ansible/docker/docker.yaml +++ b/data/ansible/docker/docker.yaml @@ -25,7 +25,7 @@ - name: Add user(s) to "docker" group become: true user: - name: "{{ gouser }}" + name: "{{ user }}" groups: "docker" append: true diff --git a/data/ansible/docker/main.yaml b/data/ansible/docker/main.yaml index b1ba30023..0cb316280 100644 --- a/data/ansible/docker/main.yaml +++ b/data/ansible/docker/main.yaml @@ -1,7 +1,7 @@ --- - name: Check and set python version on APT server hosts: docker - remote_user: '{{ gouser }}' + remote_user: '{{ user }}' gather_facts: false tasks: - name: symlink /usr/bin/python -> /usr/bin/python3 @@ -26,7 +26,7 @@ # Directory to store files downloaded for Go language SDK installation golang_download_dir: "{{ x_ansible_download_dir | default(ansible_env.HOME + '/.ansible/tmp/downloads') }}" # Location for GOPATH environment variable - golang_gopath: "/home/{{ gouser }}/go" + golang_gopath: "/home/{{ user }}/go" # Filename of Go language SDK redistributable package golang_redis_filename: 'go{{ golang_version }}.linux-amd64.tar.gz' @@ -52,7 +52,7 @@ - python3-setuptools rootUser : root - remote_user: '{{ gouser }}' + remote_user: '{{ user }}' tasks: - name: set cgrates distribution set_fact: @@ -103,10 +103,10 @@ file: state: directory mode: 'u=rwx,go=rx' - owner: "{{ gouser }}" - group: "{{ gouser }}" + owner: "{{ user }}" + group: "{{ user }}" dest: '{{ cgrates_dir }}' - become_user: "{{ gouser }}" + become_user: "{{ user }}" - name: git clone cgrates git: @@ -116,7 +116,7 @@ force: yes version: "{{ cgrates_branch }}" become: yes - become_user: "{{ gouser }}" + become_user: "{{ user }}" - name: clean go cache become: yes diff --git a/data/ansible/integration_tests/main.yaml b/data/ansible/integration_tests/main.yaml index 0afabae2a..117a2017b 100644 --- a/data/ansible/integration_tests/main.yaml +++ b/data/ansible/integration_tests/main.yaml @@ -14,7 +14,7 @@ # Directory to store files downloaded for Go language SDK installation golang_download_dir: "{{ x_ansible_download_dir | default(ansible_env.HOME + '/.ansible/tmp/downloads') }}" # Location for GOPATH environment variable - golang_gopath: "/home/{{ gouser }}/go" + golang_gopath: "/home/{{ user }}/go" # Filename of Go language SDK redistributable package golang_redis_filename: 'go{{ golang_version }}.linux-amd64.tar.gz' ############################################################### @@ -103,17 +103,17 @@ file: state: directory mode: 'u=rwx,go=rx' - owner: "{{ gouser }}" - group: "{{ gouser }}" + owner: "{{ user }}" + group: "{{ user }}" dest: '{{ cgrates_dir }}' - become_user: "{{ gouser }}" + become_user: "{{ user }}" - name: git clone cgrates git: repo: https://github.com/cgrates/cgrates.git dest: '{{ cgrates_dir }}' become: yes - become_user: "{{ gouser }}" + become_user: "{{ user }}" - name: build cgrates command: 'sh {{ cgrates_dir }}/build.sh' diff --git a/data/ansible/rpm_packages/main.yaml b/data/ansible/rpm_packages/main.yaml index 643c38795..0bdaa615c 100644 --- a/data/ansible/rpm_packages/main.yaml +++ b/data/ansible/rpm_packages/main.yaml @@ -1,6 +1,6 @@ - name: Check and set python version on PKG server hosts: pkg - remote_user: '{{ gouser }}' + remote_user: '{{ user }}' gather_facts: false tasks: - name: symlink /usr/bin/python -> /usr/bin/python3 @@ -25,7 +25,7 @@ # Directory to store files downloaded for Go language SDK installation golang_download_dir: "{{ x_ansible_download_dir | default(ansible_env.HOME + '/.ansible/tmp/downloads') }}" # Location for GOPATH environment variable - golang_gopath: "/home/{{ gouser }}/go" + golang_gopath: "/home/{{ user }}/go" # Filename of Go language SDK redistributable package golang_redis_filename: 'go{{ golang_version }}.linux-amd64.tar.gz' @@ -50,7 +50,7 @@ customPath: "{{ lookup('env','PATH') }}:{{ golang_gopath }}/bin:/usr/local/go/bin:{{ ansible_env.PATH }}" - remote_user: '{{ gouser }}' + remote_user: '{{ user }}' tasks: - name: set cgrates cgrates_distribution set_fact: @@ -155,10 +155,10 @@ file: state: directory mode: 'u=rwx,go=rx' - owner: "{{ gouser }}" - group: "{{ gouser }}" + owner: "{{ user }}" + group: "{{ user }}" dest: '{{ cgrates_dir }}' - become_user: "{{ gouser }}" + become_user: "{{ user }}" - name: git clone cgrates git: @@ -168,7 +168,7 @@ force: yes version: "{{ cgrates_branch }}" become: yes - become_user: "{{ gouser }}" + become_user: "{{ user }}" - name: clean go cache become: yes @@ -263,7 +263,7 @@ - name: Generate the .rpm file become: yes - shell: 'rpmbuild -bb --define "_topdir /home/{{ gouser }}/cgr_build" cgr_build/SPECS/cgrates.spec' + shell: 'rpmbuild -bb --define "_topdir /home/{{ user }}/cgr_build" cgr_build/SPECS/cgrates.spec' environment: PATH: "{{ lookup('env','PATH') }}:{{ golang_gopath }}/bin:/usr/local/go/bin:{{ ansible_env.PATH }}" @@ -274,7 +274,7 @@ # Move the file to PKG server - name: Copy the file to PKG server - shell: 'sshpass -p {{ pkgPass }} scp cgr_build/RPMS/x86_64/{{ item }} {{ gouser }}@{{ internalPkgAddr }}:/tmp/' + shell: 'scp cgr_build/RPMS/x86_64/{{ item }} {{ {{ pkgAddr }} }}:/tmp/' with_items: '{{ rmpFileName.stdout_lines }}' - name: Sign with rpm --addsign the .rpm file @@ -315,7 +315,7 @@ when: cgrates_branch != "master" and gitTagVar.stdout_lines|length == 0 - hosts: pkg - remote_user: '{{ gouser }}' + remote_user: '{{ user }}' tasks: - name: set cgrates cgrates_distribution set_fact: