From 6afb84b4438cb92c22f7a2363d937f08d569bef2 Mon Sep 17 00:00:00 2001 From: Ethan Paul Date: Sat, 11 Dec 2021 22:41:11 -0500 Subject: [PATCH] Add collection namespacing to playbook roles --- skylab/core/playbooks/configure.yaml | 8 ++++---- skylab/core/playbooks/node_up.yaml | 2 +- skylab/core/playbooks/provision.yaml | 2 -- 3 files changed, 5 insertions(+), 7 deletions(-) diff --git a/skylab/core/playbooks/configure.yaml b/skylab/core/playbooks/configure.yaml index ff74747..8a40016 100644 --- a/skylab/core/playbooks/configure.yaml +++ b/skylab/core/playbooks/configure.yaml @@ -21,20 +21,20 @@ hosts: linux:!workstation gather_facts: false roles: - - role: server + - role: skylab.core.server - name: Configure cluster hosts: linux:&cluster gather_facts: false roles: - - role: datastore - - role: swarm + - role: skylab.core.datastore + - role: skylab.core.swarm - name: Configure dashboard nodes hosts: iridium gather_facts: false roles: - - role: dashboard + - role: skylab.core.dashboard dashboard_hostname: "{{ skylab_dashboard }}" diff --git a/skylab/core/playbooks/node_up.yaml b/skylab/core/playbooks/node_up.yaml index b72cb0b..a0c3a0a 100644 --- a/skylab/core/playbooks/node_up.yaml +++ b/skylab/core/playbooks/node_up.yaml @@ -9,7 +9,7 @@ - name: Configure remote execution environment ansible.builtin.import_tasks: tasks/meta/bootstrap-remote-env.yaml roles: - - role: datastore + - role: skylab.core.datastore tasks: - name: Fetch node swarm ID ansible.builtin.command: diff --git a/skylab/core/playbooks/provision.yaml b/skylab/core/playbooks/provision.yaml index 13cfc45..9167380 100644 --- a/skylab/core/playbooks/provision.yaml +++ b/skylab/core/playbooks/provision.yaml @@ -50,8 +50,6 @@ key: https://archive.fedoraproject.org/pub/epel/RPM-GPG-KEY-EPEL-{{ ansible_distribution_major_version }} - - - import_playbook: update.yaml