From 7a97936af7e4f1915c81af3d175d0bf6cb652a86 Mon Sep 17 00:00:00 2001 From: Michael Jeanson Date: Thu, 30 Sep 2021 15:50:04 -0400 Subject: [PATCH] ansible: replace deprecated '-' in group names Signed-off-by: Michael Jeanson --- automation/ansible/hosts | 38 +++++++++---------- automation/ansible/node-ppc64el.yml | 7 ---- .../ansible/{node-all.yml => node_all.yml} | 0 .../{node-amd64.yml => node_amd64.yml} | 2 +- .../{node-arm64.yml => node_arm64.yml} | 2 +- .../{node-armhf.yml => node_armhf.yml} | 2 +- .../ansible/{node-el8.yml => node_el8.yml} | 2 +- .../ansible/{node-i386.yml => node_i386.yml} | 2 +- .../{node-powerpc.yml => node_powerpc.yml} | 2 +- automation/ansible/node_ppc64el.yml | 7 ++++ .../ansible/{node-sles.yml => node_sles.yml} | 2 +- ...ode-standalone.yml => node_standalone.yml} | 2 +- automation/ansible/site.yml | 18 ++++----- 13 files changed, 43 insertions(+), 43 deletions(-) delete mode 100644 automation/ansible/node-ppc64el.yml rename automation/ansible/{node-all.yml => node_all.yml} (100%) rename automation/ansible/{node-amd64.yml => node_amd64.yml} (89%) rename automation/ansible/{node-arm64.yml => node_arm64.yml} (81%) rename automation/ansible/{node-armhf.yml => node_armhf.yml} (81%) rename automation/ansible/{node-el8.yml => node_el8.yml} (82%) rename automation/ansible/{node-i386.yml => node_i386.yml} (85%) rename automation/ansible/{node-powerpc.yml => node_powerpc.yml} (79%) create mode 100644 automation/ansible/node_ppc64el.yml rename automation/ansible/{node-sles.yml => node_sles.yml} (82%) rename automation/ansible/{node-standalone.yml => node_standalone.yml} (85%) diff --git a/automation/ansible/hosts b/automation/ansible/hosts index a4433ce..ba6256e 100644 --- a/automation/ansible/hosts +++ b/automation/ansible/hosts @@ -10,7 +10,7 @@ cloud05.internal.efficios.com #cloud07.internal.efficios.com #cloud08.internal.efficios.com -[node-armhf] +[node_armhf] ci-node-deb10-armhf-01 ci-node-deb10-armhf-02 ci-node-deb10-armhf-03 @@ -20,29 +20,29 @@ ci-node-deb10-armhf-06 ci-node-deb10-armhf-07 ci-node-deb10-armhf-08 -[node-arm64] +[node_arm64] ci-node-bionic-arm64-01 ci-node-bionic-arm64-02 ci-node-bionic-arm64-03 ci-node-bionic-arm64-04 ci-node-bionic-arm64-05 -[node-powerpc] +[node_powerpc] ci-node-xenial-powerpc-01 #ci-node-xenial-powerpc-02 ci-node-xenial-powerpc-03 -[node-ppc64el] +[node_ppc64el] ci-node-bionic-ppc64el-01 ci-node-bionic-ppc64el-02 -[node-i386] +[node_i386] ci-node-bionic-i386-02-01 ci-node-bionic-i386-03-01 ci-node-bionic-i386-04-01 ci-node-bionic-i386-05-01 -[node-amd64] +[node_amd64] ci-node-bionic-amd64-02-01 ci-node-bionic-amd64-02-02 ci-node-bionic-amd64-02-03 @@ -88,28 +88,28 @@ ci-node-bionic-amd64-05-08 ci-node-bionic-amd64-05-09 ci-node-bionic-amd64-05-10 -[node-standalone] +[node_standalone] #ci-node-standalone-amd64-02 #ci-node-standalone-amd64-03 ci-rootnode-bionic-amd64-02 ci-rootnode-bionic-amd64-03 -[node-sles] +[node_sles] ci-node-sles12sp5-amd64-03-01 -[node-el8] +[node_el8] ci-node-el8-amd64-03-01 -[node-el8:vars] +[node_el8:vars] ansible_python_interpreter=/usr/bin/python3 [node:children] -node-i386 -node-amd64 -node-armhf -node-arm64 -node-powerpc -node-ppc64el -node-standalone -node-sles -node-el8 +node_i386 +node_amd64 +node_armhf +node_arm64 +node_powerpc +node_ppc64el +node_standalone +node_sles +node_el8 diff --git a/automation/ansible/node-ppc64el.yml b/automation/ansible/node-ppc64el.yml deleted file mode 100644 index 0836009..0000000 --- a/automation/ansible/node-ppc64el.yml +++ /dev/null @@ -1,7 +0,0 @@ -- hosts: node-ppc64el - roles: - - common - - babeltrace - - liburcu - - lttng-ust - - lttng-tools diff --git a/automation/ansible/node-all.yml b/automation/ansible/node_all.yml similarity index 100% rename from automation/ansible/node-all.yml rename to automation/ansible/node_all.yml diff --git a/automation/ansible/node-amd64.yml b/automation/ansible/node_amd64.yml similarity index 89% rename from automation/ansible/node-amd64.yml rename to automation/ansible/node_amd64.yml index 66117ae..56d3ffe 100644 --- a/automation/ansible/node-amd64.yml +++ b/automation/ansible/node_amd64.yml @@ -1,4 +1,4 @@ -- hosts: node-amd64 +- hosts: node_amd64 roles: - common - cross-compilers diff --git a/automation/ansible/node-arm64.yml b/automation/ansible/node_arm64.yml similarity index 81% rename from automation/ansible/node-arm64.yml rename to automation/ansible/node_arm64.yml index 496bbe2..4dd9663 100644 --- a/automation/ansible/node-arm64.yml +++ b/automation/ansible/node_arm64.yml @@ -1,4 +1,4 @@ -- hosts: node-arm64 +- hosts: node_arm64 roles: - common - babeltrace diff --git a/automation/ansible/node-armhf.yml b/automation/ansible/node_armhf.yml similarity index 81% rename from automation/ansible/node-armhf.yml rename to automation/ansible/node_armhf.yml index de54056..9591ee4 100644 --- a/automation/ansible/node-armhf.yml +++ b/automation/ansible/node_armhf.yml @@ -1,4 +1,4 @@ -- hosts: node-armhf +- hosts: node_armhf roles: - common - babeltrace diff --git a/automation/ansible/node-el8.yml b/automation/ansible/node_el8.yml similarity index 82% rename from automation/ansible/node-el8.yml rename to automation/ansible/node_el8.yml index 4d5eced..edf32fc 100644 --- a/automation/ansible/node-el8.yml +++ b/automation/ansible/node_el8.yml @@ -1,4 +1,4 @@ -- hosts: node-el8 +- hosts: node_el8 roles: - common - babeltrace diff --git a/automation/ansible/node-i386.yml b/automation/ansible/node_i386.yml similarity index 85% rename from automation/ansible/node-i386.yml rename to automation/ansible/node_i386.yml index cf27bee..6e18d13 100644 --- a/automation/ansible/node-i386.yml +++ b/automation/ansible/node_i386.yml @@ -1,4 +1,4 @@ -- hosts: node-i386 +- hosts: node_i386 roles: - common - babeltrace diff --git a/automation/ansible/node-powerpc.yml b/automation/ansible/node_powerpc.yml similarity index 79% rename from automation/ansible/node-powerpc.yml rename to automation/ansible/node_powerpc.yml index b18ae49..3a3ff21 100644 --- a/automation/ansible/node-powerpc.yml +++ b/automation/ansible/node_powerpc.yml @@ -1,4 +1,4 @@ -- hosts: node-powerpc +- hosts: node_powerpc roles: - common - babeltrace diff --git a/automation/ansible/node_ppc64el.yml b/automation/ansible/node_ppc64el.yml new file mode 100644 index 0000000..b0a3d3c --- /dev/null +++ b/automation/ansible/node_ppc64el.yml @@ -0,0 +1,7 @@ +- hosts: node_ppc64el + roles: + - common + - babeltrace + - liburcu + - lttng-ust + - lttng-tools diff --git a/automation/ansible/node-sles.yml b/automation/ansible/node_sles.yml similarity index 82% rename from automation/ansible/node-sles.yml rename to automation/ansible/node_sles.yml index da583f5..c403d7c 100644 --- a/automation/ansible/node-sles.yml +++ b/automation/ansible/node_sles.yml @@ -1,4 +1,4 @@ -- hosts: node-sles +- hosts: node_sles roles: - common - babeltrace diff --git a/automation/ansible/node-standalone.yml b/automation/ansible/node_standalone.yml similarity index 85% rename from automation/ansible/node-standalone.yml rename to automation/ansible/node_standalone.yml index 861048d..5f11630 100644 --- a/automation/ansible/node-standalone.yml +++ b/automation/ansible/node_standalone.yml @@ -1,4 +1,4 @@ -- hosts: node-standalone +- hosts: node_standalone roles: - common - cross-compilers diff --git a/automation/ansible/site.yml b/automation/ansible/site.yml index 17df035..20fc9c5 100644 --- a/automation/ansible/site.yml +++ b/automation/ansible/site.yml @@ -1,11 +1,11 @@ --- - import_playbook: hosts.yml -- import_playbook: node-armhf.yml -- import_playbook: node-arm64.yml -- import_playbook: node-powerpc.yml -- import_playbook: node-ppc64el.yml -- import_playbook: node-i386.yml -- import_playbook: node-amd64.yml -- import_playbook: node-standalone.yml -- import_playbook: node-sles.yml -- import_playbook: node-el8.yml +- import_playbook: node_armhf.yml +- import_playbook: node_arm64.yml +- import_playbook: node_powerpc.yml +- import_playbook: node_ppc64el.yml +- import_playbook: node_i386.yml +- import_playbook: node_amd64.yml +- import_playbook: node_standalone.yml +- import_playbook: node_sles.yml +- import_playbook: node_el8.yml -- 2.34.1