Skip to content

Commit 55374a0

Browse files
committed
rename playbooks and add conditional for playbooks
1 parent c12af52 commit 55374a0

File tree

5 files changed

+17
-7
lines changed

5 files changed

+17
-7
lines changed

.gitignore

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ Temporary Items
3434

3535
# Ansible playbook runtime
3636
*/buffer/*
37-
.ansible
37+
*.ansible/*
3838

3939
# VS Code files for those working on multiple tools
4040
**/.vscode/*

olvm/create_instance.yml

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -344,22 +344,26 @@
344344
ansible.builtin.import_playbook: "configure_secondary_nic.yml"
345345

346346
- name: Setup and configure instance basics
347-
ansible.builtin.import_playbook: "setup_host_basics.yml"
347+
ansible.builtin.import_playbook: "provision_instance_basics.yml"
348348

349349
- name: Configure passwordless SSH
350350
ansible.builtin.import_playbook: "configure_passwordless_ssh.yml"
351351

352352
- name: Create hosts file for secondary nic dns
353353
ansible.builtin.import_playbook: "create_hostfile_secondary_nic.yml"
354+
when: use_secondary_hostfile
354355

355356
- name: Provision VNC on OLVM engine
356357
ansible.builtin.import_playbook: "provision_vnc.yml"
358+
when: use_vnc_on_engine
357359

358360
- name: Install OLVM engine
359361
ansible.builtin.import_playbook: "provision_olvm_engine.yml"
362+
when: install_engine
360363

361-
- name: Copy OLVM engine private key to kvm host
362-
ansible.builtin.import_playbook: "provision_olvm_engine_privatekey.yml"
364+
- name: Copy OLVM engine public key to kvm host
365+
ansible.builtin.import_playbook: "provision_olvm_engine_publickey.yml"
366+
when: copy_engine_publickey
363367

364368
- name: Print instances
365369
hosts: all

olvm/default_vars.yml

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,4 +37,9 @@ engine_fqdn: olvm.pub.olv.oraclevcn.com
3737
engine_url: https://{{ engine_fqdn }}/ovirt-engine/api
3838
engine_user: admin@ovirt@internalsso
3939
engine_pass: How-2-install
40-
# engine_cafile: /tmp/pki-resource
40+
# engine_cafile: /tmp/pki-resource
41+
use_secondary_hostfile: false
42+
use_vnc_on_engine: false
43+
install_engine: false
44+
copy_engine_publickey: false
45+
copy_ova_template: false

olvm/setup_host_basics.yml renamed to olvm/provision_instance_basics.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
# The Universal Permissive License (UPL), Version 1.0 (see COPYING or https://oss.oracle.com/licenses/upl)
55
# See LICENSE.TXT for details.
66

7-
- name: Setup host basics
7+
- name: Provision instance basics
88
hosts: all
99
vars_files:
1010
- default_vars.yml

olvm/provision_olvm_engine_privatekey.yml renamed to olvm/provision_olvm_engine_publickey.yml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
# See LICENSE.TXT for details.
55
---
66

7-
- name: Copy OLVM engine private key to kvm host
7+
- name: Copy OLVM engine public key to kvm host
88
hosts: all
99
order: sorted
1010
vars_files:
@@ -51,3 +51,4 @@
5151
base_image_sha: dc5befa484c9aeb51fb0244d5926d53ab482453bd702512066734d8cb2c20600
5252
delegate_to: "{{ groups['kvm'] | sort | first }}"
5353
run_once: true
54+
when: copy_ova_template

0 commit comments

Comments
 (0)