diff options
| author |   Markos Chandras <mchandras@suse.de> | 2017-09-29 08:27:21 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <gerrit@opnfv.org> | 2017-09-29 08:27:21 +0000 |
| commit | cfd3a2099c5687e23c80bfdee55127572a39edc9 (patch) | |
| tree | f765aed90587b84960bf4c0f9ae53bc20dcb19e5 /xci/playbooks | |
| parent | b1417cb094ec9c546b3230746278942d4c273401 (diff) | |
| parent | 4e376686a539fa08cd0873de6a036f0a096a0066 (diff) | |
Merge changes from topic 'fix-vm-on-jenkins'
* changes:
xci: xci-deploy.sh: Apply workaround for checking db cluster on SUSE
xci: playbooks: synchronize-time: Fix service name for openSUSE
xci: configure-opnfvhost: Do not run 'remove-folders'
xci: scripts: build-dib-os.sh: Pin diskimage-builder
xci: configure-opnfvhost: Do not check /etc/ssl/certs on SUSE
Diffstat (limited to 'xci/playbooks')
| -rw-r--r-- | xci/playbooks/configure-opnfvhost.yml | 14 | ||||
| -rw-r--r-- | xci/playbooks/roles/synchronize-time/tasks/main.yml | 2 |
2 files changed, 2 insertions, 14 deletions
diff --git a/xci/playbooks/configure-opnfvhost.yml b/xci/playbooks/configure-opnfvhost.yml index 76f8f06e..3ba2ae12 100644 --- a/xci/playbooks/configure-opnfvhost.yml +++ b/xci/playbooks/configure-opnfvhost.yml @@ -9,19 +9,6 @@ ############################################################################## - hosts: opnfv remote_user: root - become: yes - vars_files: - - ../var/flavor-vars.yml - - ../var/opnfv.yml - pre_tasks: - - name: Load distribution variables - include_vars: - file: ../var/{{ ansible_os_family }}.yml - roles: - - role: remove-folders - -- hosts: opnfv - remote_user: root vars_files: - ../var/flavor-vars.yml - ../var/opnfv.yml @@ -130,6 +117,7 @@ file: path: "/etc/ssl/certs" state: directory + when: ansible_pkg_mgr != 'zypper' - name: create key directory /etc/ssl/private file: path: "/etc/ssl/private" diff --git a/xci/playbooks/roles/synchronize-time/tasks/main.yml b/xci/playbooks/roles/synchronize-time/tasks/main.yml index cc73c447..8f94d33f 100644 --- a/xci/playbooks/roles/synchronize-time/tasks/main.yml +++ b/xci/playbooks/roles/synchronize-time/tasks/main.yml @@ -13,7 +13,7 @@ state: latest - name: restart chrony service: - name: chrony + name: "{{ (ansible_pkg_mgr == 'apt') | ternary('chrony', 'chronyd') }}" state: restarted - name: synchronize time shell: "chronyc -a 'burst 4/4' && chronyc -a makestep" |