diff options
| author |   Michal Ptacek <m.ptacek@partner.samsung.com> | 2019-05-29 13:31:03 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <gerrit@onap.org> | 2019-05-29 13:31:03 +0000 |
| commit | 6fdcd7d9bd8b4395180d8cbd6c6aa936e50dba76 (patch) | |
| tree | 95e225246d0d6bc39f84b1ba327a14ff4cfff32d /ansible/roles | |
| parent | 5b5c804c08cb49f03685cc3602f5eda1999185f2 (diff) | |
| parent | 2353ca7b38acbd7246adbf23b7d92723bc083dcf (diff) | |
Merge changes from topic "OOM-1816"
* changes:
Molecule test for infrastructure playbook.
Add the prepare-package-repository role
Add prepare-nexus role
Add prepare-nginx role
Add the prepare-dns role
Add prepare-vncserver role
Allow unsafe writes when modifying resolv.conf
Add nexus_come_up_wait_retries variable to nexus role
Remove docker restart condition from docker role
Diffstat (limited to 'ansible/roles')
| -rw-r--r-- | ansible/roles/docker/handlers/main.yml | 3 | ||||
| -rw-r--r-- | ansible/roles/nexus/defaults/main.yml | 1 | ||||
| -rw-r--r-- | ansible/roles/nexus/tasks/install.yml | 2 | ||||
| -rw-r--r-- | ansible/roles/package-repository/tasks/main.yml | 1 |
4 files changed, 3 insertions, 4 deletions
diff --git a/ansible/roles/docker/handlers/main.yml b/ansible/roles/docker/handlers/main.yml index 9916a81b..de4a52ac 100644 --- a/ansible/roles/docker/handlers/main.yml +++ b/ansible/roles/docker/handlers/main.yml @@ -1,6 +1,3 @@ --- - name: Restart Docker import_tasks: docker_restart.yml - when: - - ansible_env.container is defined - - ansible_env.container != 'docker' diff --git a/ansible/roles/nexus/defaults/main.yml b/ansible/roles/nexus/defaults/main.yml index 92089e9a..8f636979 100644 --- a/ansible/roles/nexus/defaults/main.yml +++ b/ansible/roles/nexus/defaults/main.yml @@ -1,4 +1,5 @@ --- +nexus_come_up_wait_retries: 30 # By default prepopulated nexus binary blob used. populate_nexus: false # By dafault no additional docker images pushed to nexus at runtime diff --git a/ansible/roles/nexus/tasks/install.yml b/ansible/roles/nexus/tasks/install.yml index f8de5e95..c88e5855 100644 --- a/ansible/roles/nexus/tasks/install.yml +++ b/ansible/roles/nexus/tasks/install.yml @@ -36,7 +36,7 @@ password: admin123 force_basic_auth: true method: GET - retries: 30 + retries: "{{ nexus_come_up_wait_retries }}" delay: 10 register: nexus_wait until: not nexus_wait.failed diff --git a/ansible/roles/package-repository/tasks/main.yml b/ansible/roles/package-repository/tasks/main.yml index 599e1052..7dc2e76f 100644 --- a/ansible/roles/package-repository/tasks/main.yml +++ b/ansible/roles/package-repository/tasks/main.yml @@ -5,6 +5,7 @@ path: /etc/resolv.conf state: present insertbefore: BOF + unsafe_writes: true - name: Disable all OS default repositories block: |