diff options
| author |   Juraj Linkeš <juraj.linkes@pantheon.tech> | 2020-07-01 13:21:07 +0200 |
|---|---|---|
| committer | Juraj Linkeš <juraj.linkes@pantheon.tech> | 2020-07-01 13:43:25 +0200 |
| commit | a0c99f7d37f8460a5f362ef3402d9afdc6284e86 (patch) | |
| tree | 4a778752b2a2e60bb804289218229957be2b6c66 /resources | |
| parent | d9e9ec7c969cb3d197895c64664e65f26863563d (diff) | |
Infra: Update ansible ARM dev server
Remove nomad installation from the ARM dev server and add a generic
vppdev user to it. Add ansible role dev for this.
Change-Id: Icb967ff18cbe939464ddb3d8dbce5101747e739f
Signed-off-by: Juraj Linkeš <juraj.linkes@pantheon.tech>
Diffstat (limited to 'resources')
4 files changed, 21 insertions, 21 deletions
diff --git a/resources/tools/testbed-setup/ansible/dev.yaml b/resources/tools/testbed-setup/ansible/dev.yaml new file mode 100644 index 0000000000..48ec6b21c5 --- /dev/null +++ b/resources/tools/testbed-setup/ansible/dev.yaml @@ -0,0 +1,12 @@ +--- +# file: dev.yaml + +- hosts: dev + remote_user: testuser + become: yes + become_user: root + roles: + - role: user_add + tags: user_add + - role: docker + tags: docker diff --git a/resources/tools/testbed-setup/ansible/inventories/lf_inventory/host_vars/10.30.51.38.yaml b/resources/tools/testbed-setup/ansible/inventories/lf_inventory/host_vars/10.30.51.38.yaml index 04c26c548c..d623e56577 100644 --- a/resources/tools/testbed-setup/ansible/inventories/lf_inventory/host_vars/10.30.51.38.yaml +++ b/resources/tools/testbed-setup/ansible/inventories/lf_inventory/host_vars/10.30.51.38.yaml @@ -17,23 +17,6 @@ users: password: "$6$zpBUdQ4q$P2zKclumvCndWujgP/qQ8eMk3YZk7ESAom04Fqp26hJH2jWkMXEX..jqxzMdDLJKiDaDHIaSkQMVjHzd3cRLs1" ssh_key: - "ssh-rsa AAAAB3NzaC1yc2EAAAABJQAAAQEAgObJFDIMmPwQhhkjAynvlbwpM5yeSewyaE7vTLaFf4uFz4vmsE2hFf6B2xXHUGLVwoVfk91UeK7LOGrdDpoDDHzvPZXj5NmZI+WiWax5y2pQZNkcSZws0ENCeEc4hPwc4veJ1JmhokF4Bsmu14HyFMaFUhM8897jtJwsh+9fLA/no0iPGaQqEtRUQhkV+P4jCEPoY0qdRZAzVw/rY4EGAMhsJe3EJmyj63OfrrkG3+hvSLFo5pDxHQr3pZd/c6ukI7xMef48PosAvGCm3oxzb/Gu9PZIGuHLczY+tCnzCkY7MO7E+IWgjXrUAfYwSWz8XmFmA9LLe26DT5jkcK8hGQ== pmikus@cisco.com" - -# Nomad settings. -nomad_certificates: - - src: "{{ vault_nomad_v1_ca_file }}" - dest: "{{ nomad_ca_file }}" - - src: "{{ vault_nomad_v1_cert_file }}" - dest: "{{ nomad_cert_file }}" - - src: "{{ vault_nomad_v1_key_file }}" - dest: "{{ nomad_key_file }}" -nomad_datacenter: "yul1" -nomad_name: "{{ hostname }}-{{ ansible_architecture }}" -nomad_node_role: "client" -nomad_node_class: "builder" -nomad_options: - driver.raw_exec.enable: 0 - docker.cleanup.image: false - docker.privileged.enabled: true - driver.whitelist: "docker,raw_exec,exec" -nomad_servers: [ "10.30.51.32:4647", "10.30.51.33:4647" ] -nomad_cpu_total_compute: "40000" + - username: vppdev + groups: [adm, sudo] + password: "$6$C5R6nFQlJ9Vu$l.Q6BDOMSgUFQv5OQw4viZVz8LCHziubXAwThaJXo/xVaAkqTGupPTvdMlK5r4ArDvDMPgD0AeO8/L.ciPl.g." diff --git a/resources/tools/testbed-setup/ansible/inventories/lf_inventory/hosts b/resources/tools/testbed-setup/ansible/inventories/lf_inventory/hosts index 157f03f67b..faf93f9969 100644 --- a/resources/tools/testbed-setup/ansible/inventories/lf_inventory/hosts +++ b/resources/tools/testbed-setup/ansible/inventories/lf_inventory/hosts @@ -57,10 +57,12 @@ all: 10.32.8.14: #s46-nomad - skylake 10.32.8.15: #s47-nomad - skylake 10.32.8.16: #s48-nomad - skylake - 10.30.51.38: #fdio-marvell-dev - thunderx 88xx 10.30.51.39: #s53-nomad - thunderx 88xx 10.30.51.40: #s54-nomad - thunderx 88xx 10.30.51.65: #s52-nomad - thunderx 88xx #10.30.51.66: #s51-nomad - thunderx 88xx 10.30.51.67: #s49-nomad - thunderx 88xx #10.30.51.68: #s50-nomad - thunderx 88xx + dev: + hosts: + 10.30.51.38: #fdio-marvell-dev - thunderx 88xx diff --git a/resources/tools/testbed-setup/ansible/site.yaml b/resources/tools/testbed-setup/ansible/site.yaml index 6ea7fa1d0f..5ac76ca340 100644 --- a/resources/tools/testbed-setup/ansible/site.yaml +++ b/resources/tools/testbed-setup/ansible/site.yaml @@ -12,3 +12,6 @@ - import_playbook: nomad.yaml tags: nomad + +- import_playbook: dev.yaml + tags: dev |