diff options
| -rw-r--r-- | configure.yml | 2 | ||||
| -rw-r--r-- | molecule/proxmox/converge.yml | 2 | ||||
| -rw-r--r-- | roles/proxmox-ve/defaults/main.yml | 4 | ||||
| -rw-r--r-- | roles/pve/defaults/main.yml | 4 | ||||
| -rw-r--r-- | roles/pve/handlers/main.yml (renamed from roles/proxmox-ve/handlers/main.yml) | 0 | ||||
| -rw-r--r-- | roles/pve/meta/argument_specs.yml (renamed from roles/proxmox-ve/meta/argument_specs.yml) | 6 | ||||
| -rw-r--r-- | roles/pve/meta/main.yml (renamed from roles/proxmox-ve/meta/main.yml) | 0 | ||||
| -rw-r--r-- | roles/pve/tasks/main.yml (renamed from roles/proxmox-ve/tasks/main.yml) | 8 |
8 files changed, 13 insertions, 13 deletions
diff --git a/configure.yml b/configure.yml index 6331ccfb..ec7e34cb 100644 --- a/configure.yml +++ b/configure.yml @@ -111,7 +111,7 @@ hosts: - pve.local roles: - - role: "proxmox-ve" + - role: "pve" - role: "locales" - role: "timezone" - role: "bash" diff --git a/molecule/proxmox/converge.yml b/molecule/proxmox/converge.yml index a75f33ce..ace4aa74 100644 --- a/molecule/proxmox/converge.yml +++ b/molecule/proxmox/converge.yml @@ -48,7 +48,7 @@ ansible.builtin.set_fact: ansible_facts: "{{ ansible_facts | combine({'is_chroot': false}) }}" roles: - - role: "proxmox-ve" + - role: "pve" - role: "locales" - role: "timezone" - role: "bash" diff --git a/roles/proxmox-ve/defaults/main.yml b/roles/proxmox-ve/defaults/main.yml deleted file mode 100644 index e56c830b..00000000 --- a/roles/proxmox-ve/defaults/main.yml +++ /dev/null @@ -1,4 +0,0 @@ ---- -proxmox_ve_repo: "no-subscription" -proxmox_ve_admin_user: "admin" -proxmox_ve_admin_password: "changeme" diff --git a/roles/pve/defaults/main.yml b/roles/pve/defaults/main.yml new file mode 100644 index 00000000..c9047655 --- /dev/null +++ b/roles/pve/defaults/main.yml @@ -0,0 +1,4 @@ +--- +pve_repo: "no-subscription" +pve_admin_user: "admin" +pve_admin_password: "changeme" diff --git a/roles/proxmox-ve/handlers/main.yml b/roles/pve/handlers/main.yml index ccce330d..ccce330d 100644 --- a/roles/proxmox-ve/handlers/main.yml +++ b/roles/pve/handlers/main.yml diff --git a/roles/proxmox-ve/meta/argument_specs.yml b/roles/pve/meta/argument_specs.yml index adf6e105..195ca146 100644 --- a/roles/proxmox-ve/meta/argument_specs.yml +++ b/roles/pve/meta/argument_specs.yml @@ -2,18 +2,18 @@ argument_specs: main: options: - proxmox_ve_repo: + pve_repo: type: "str" description: "Proxmox VE apt repository type (no-subscription or enterprise)" default: "no-subscription" choices: - "no-subscription" - "enterprise" - proxmox_ve_admin_user: + pve_admin_user: type: "str" description: "PVE realm admin username" default: "admin" - proxmox_ve_admin_password: + pve_admin_password: type: "str" description: "PVE realm admin password" default: "changeme" diff --git a/roles/proxmox-ve/meta/main.yml b/roles/pve/meta/main.yml index a116b3b9..a116b3b9 100644 --- a/roles/proxmox-ve/meta/main.yml +++ b/roles/pve/meta/main.yml diff --git a/roles/proxmox-ve/tasks/main.yml b/roles/pve/tasks/main.yml index b7378a12..f58f62db 100644 --- a/roles/proxmox-ve/tasks/main.yml +++ b/roles/pve/tasks/main.yml @@ -11,7 +11,7 @@ - name: "Configure Proxmox repos" become: true - when: proxmox_ve_repo == "no-subscription" + when: pve_repo == "no-subscription" block: - name: "Configure no-subscription repos" ansible.builtin.apt_repository: @@ -49,7 +49,7 @@ - name: "Create PVE admin user" become: true ansible.builtin.command: - cmd: "pveum user add {{ proxmox_ve_admin_user }}@pve" + cmd: "pveum user add {{ pve_admin_user }}@pve" register: pveum_user_add changed_when: pveum_user_add.rc == 0 failed_when: pveum_user_add.rc != 0 and 'already exists' not in pveum_user_add.stderr @@ -60,7 +60,7 @@ become: true no_log: true ansible.builtin.command: - cmd: "pveum passwd {{ proxmox_ve_admin_user }}@pve --password {{ proxmox_ve_admin_password }}" + cmd: "pveum passwd {{ pve_admin_user }}@pve --password {{ pve_admin_password }}" changed_when: true tags: - "molecule-notest" @@ -68,7 +68,7 @@ - name: "Grant PVE Administrator role" become: true ansible.builtin.command: - cmd: "pveum acl modify / --roles Administrator --users {{ proxmox_ve_admin_user }}@pve" + cmd: "pveum acl modify / --roles Administrator --users {{ pve_admin_user }}@pve" changed_when: true tags: - "molecule-notest" |