OCTOPUS-625:Moved Ignition and templates files to virtual machine folder #20

pkenchap · 2024-04-15T08:22:08Z

Removed the ignition roles and added as part of virtual machine task .
Modified the templates for virtual machine .

Signed-off-by: Punith Kenchappa <[email protected]>

prb112 · 2024-04-15T23:47:23Z

openstack/intel-worker/playbooks/roles/virtual_machine_create/defaults/main.yml

-virtual_machine_create_userdata: "#!/bin/sh\nyum -y install python3"
+virtual_machine_create_userdata: "{{ lookup('template', 'worker-amd64.ign.j2') }}"
+# virtual_machine_create_userdata: "{{ lookup('file', '/var/www/html/ignition/worker-amd64.ign') | string }}"
+# virtual_machine_create_userdata: "#!/bin/sh\nyum -y install python3"


Suggested change

# virtual_machine_create_userdata: "#!/bin/sh\nyum -y install python3"

prb112 · 2024-04-15T23:47:31Z

openstack/intel-worker/playbooks/roles/virtual_machine_create/defaults/main.yml

 virtual_machine_create_volume_size: 80
 virtual_machine_create_keypair_name: pun_keypair
 virtual_machine_create_network_name: provider
-virtual_machine_create_userdata: "#!/bin/sh\nyum -y install python3"
+virtual_machine_create_userdata: "{{ lookup('template', 'worker-amd64.ign.j2') }}"
+# virtual_machine_create_userdata: "{{ lookup('file', '/var/www/html/ignition/worker-amd64.ign') | string }}"


Suggested change

# virtual_machine_create_userdata: "{{ lookup('file', '/var/www/html/ignition/worker-amd64.ign') | string }}"

prb112 · 2024-04-15T23:47:45Z

openstack/intel-worker/playbooks/roles/virtual_machine_create/defaults/main.yml

@@ -21,3 +23,18 @@ virtual_machine_create_userdata: "#!/bin/sh\nyum -y install python3"
 #           - ansible
 #         package_upgrade: true


Suggested change

# package_upgrade: true

prb112 · 2024-04-15T23:47:57Z

openstack/intel-worker/playbooks/roles/virtual_machine_create/defaults/main.yml

@@ -21,3 +23,18 @@ virtual_machine_create_userdata: "#!/bin/sh\nyum -y install python3"
 #           - ansible


Suggested change

# - ansible

prb112 · 2024-04-15T23:48:36Z

openstack/intel-worker/playbooks/roles/virtual_machine_create/tasks/ignition.yml

@@ -1,7 +1,7 @@
 ---
 - name: Create worker.ign and store it to /var/www/html/ignition/
  ansible.builtin.get_url:
-    url: https://{{ bastion_ip }}:22623/config/worker
+    url: https://{{ virtual_machine_create_bastion_ip }}:22623/config/worker


Suggested change

url: https://{{ virtual_machine_create_bastion_ip }}:22623/config/worker

url: https://{{ bastion_ip }}:22623/config/worker

let's just call it bastion_ip

Ansible lint expects to have a role name as a prefix for the variable names . if we just keep bastion_ip it was giving error .

prb112 · 2024-04-15T23:49:21Z

openstack/intel-worker/playbooks/roles/virtual_machine_create/tasks/ignition.yml

@@ -14,8 +14,8 @@

 - name: Set the variables (To be used in Customization Script)
  ansible.builtin.set_fact:
-    worker_hostname_encoded: "{{ worker_hostname | b64encode }}"
-    dns_none_encoded: "{{ dns_none_conf | b64encode }}"
+    worker_hostname_encoded: "{{ virtual_machine_create_worker_hostname | b64encode }}"


Suggested change

worker_hostname_encoded: "{{ virtual_machine_create_worker_hostname | b64encode }}"

worker_hostname_encoded: "{{ worker_hostname | b64encode }}"

please use worker_hostname. it's more readable

Ansible lint expects to have a role name as a prefix for the variable names .

prb112 · 2024-04-15T23:49:45Z

openstack/intel-worker/playbooks/roles/virtual_machine_create/tasks/ignition.yml

-    worker_hostname_encoded: "{{ worker_hostname | b64encode }}"
-    dns_none_encoded: "{{ dns_none_conf | b64encode }}"
+    worker_hostname_encoded: "{{ virtual_machine_create_worker_hostname | b64encode }}"
+    dns_none_encoded: "{{ virtual_machine_create_dns_none_conf | b64encode }}"


please use dns_none_conf

same as above .

prb112 · 2024-04-15T23:49:56Z

openstack/intel-worker/playbooks/roles/virtual_machine_create/tasks/ignition.yml

-    worker_hostname_encoded: "{{ worker_hostname | b64encode }}"
-    dns_none_encoded: "{{ dns_none_conf | b64encode }}"
+    worker_hostname_encoded: "{{ virtual_machine_create_worker_hostname | b64encode }}"
+    dns_none_encoded: "{{ virtual_machine_create_dns_none_conf | b64encode }}"


Suggested change

dns_none_encoded: "{{ virtual_machine_create_dns_none_conf | b64encode }}"

dns_none_encoded: "{{ dns_none_conf | b64encode }}"

Ansible lint expects to have a role name as a prefix for the variable names .

prb112 · 2024-04-15T23:50:19Z

openstack/intel-worker/playbooks/roles/virtual_machine_create/tasks/main.yml

@@ -1,5 +1,8 @@
 ---
 # file: intel-worker-playbook.yml
+- name: Add identity resources


Suggested change

- name: Add identity resources

- name: Add ignition resources

Sure , I will make these changes.

prb112 · 2024-04-15T23:50:46Z

openstack/intel-worker/playbooks/roles/virtual_machine_create/templates/resolv.conf.j2

+search {{ virtual_machine_create_domain_name }}
+nameserver {{ virtual_machine_create_bastion_ip }}


Suggested change

search {{ virtual_machine_create_domain_name }}

nameserver {{ virtual_machine_create_bastion_ip }}

search {{ domain_name }}

nameserver {{ bastion_ip }}

Ansible lint expects to have a role name as a prefix for the variable names .

prb112 · 2024-04-15T23:51:32Z

openstack/intel-worker/playbooks/roles/virtual_machine_create/templates/worker-amd64.ign.j2

+				"path": "/etc/NetworkManager/conf.d/90-dns-none.conf",
+				"user": {},
+				"contents": {
+					"source": "data:text/plain;base64,{{ virtual_machine_create_dns_none_encoded }}",


Suggested change

"source": "data:text/plain;base64,{{ virtual_machine_create_dns_none_encoded }}",

"source": "data:text/plain;base64,{{ dns_none_encoded }}",

Ansible lint expects to have a role name as a prefix for the variable names .

prb112 · 2024-04-15T23:51:44Z

openstack/intel-worker/playbooks/roles/virtual_machine_create/templates/worker-amd64.ign.j2

+				"path": "/etc/resolv.conf",
+				"user": {},
+				"contents": {
+					"source": "data:text/plain;base64,{{ virtual_machine_create_etc_resolve_encoded }}",


Suggested change

"source": "data:text/plain;base64,{{ virtual_machine_create_etc_resolve_encoded }}",

"source": "data:text/plain;base64,{{ etc_resolve_encoded }}",

Ansible lint expects to have a role name as a prefix for the variable names .

prb112 · 2024-04-15T23:51:53Z

openstack/intel-worker/playbooks/roles/virtual_machine_create/templates/worker-amd64.ign.j2

+				"path": "/etc/hostname",
+				"user": {},
+				"contents": {
+					"source": "data:text/plain;base64,{{ virtual_machine_create_worker_hostname_encoded }}",


Suggested change

"source": "data:text/plain;base64,{{ virtual_machine_create_worker_hostname_encoded }}",

"source": "data:text/plain;base64,{{ hostname_encoded }}",

Ansible lint expects to have a role name as a prefix for the variable names .

prb112 · 2024-04-15T23:52:10Z

openstack/intel-worker/playbooks/roles/virtual_machine_create/templates/worker-amd64.ign.j2

+		"config": {
+			"merge": [
+				{
+					"source": "http://{{ virtual_machine_create_bastion_ip }}:{{ virtual_machine_create_http_port }}/ignition/worker-amd64.ign"


Suggested change

"source": "http://{{ virtual_machine_create_bastion_ip }}:{{ virtual_machine_create_http_port }}/ignition/worker-amd64.ign"

"source": "http://{{ bastion_ip }}:{{ http_port }}/ignition/worker-amd64.ign"

Ansible lint expects to have a role name as a prefix for the variable names .

prb112 · 2024-04-15T23:52:46Z

Hey Punith,

Made some comments based on readability.
Please address when you can.

prb112 · 2024-04-16T14:13:38Z

Discussed with Punith the restrictions on variable names
/LGTM

OCTOPUS-625:Moved Ignition and templates files to virtual machine folder

f8f8359

Signed-off-by: Punith Kenchappa <[email protected]>

pkenchap self-assigned this Apr 15, 2024

pkenchap requested a review from prb112 April 15, 2024 08:22

prb112 reviewed Apr 15, 2024

View reviewed changes

prb112 approved these changes Apr 16, 2024

View reviewed changes

prb112 merged commit 75f22c8 into ocp-power-automation:main Apr 16, 2024
0 of 2 checks passed

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

OCTOPUS-625:Moved Ignition and templates files to virtual machine folder #20

OCTOPUS-625:Moved Ignition and templates files to virtual machine folder #20

pkenchap commented Apr 15, 2024

prb112 Apr 15, 2024

prb112 Apr 15, 2024

prb112 Apr 15, 2024

prb112 Apr 15, 2024

prb112 Apr 15, 2024

prb112 Apr 15, 2024

pkenchap Apr 16, 2024

prb112 Apr 15, 2024

prb112 Apr 15, 2024

pkenchap Apr 16, 2024

prb112 Apr 15, 2024

pkenchap Apr 16, 2024

prb112 Apr 15, 2024

pkenchap Apr 16, 2024

prb112 Apr 15, 2024

pkenchap Apr 16, 2024

prb112 Apr 15, 2024

pkenchap Apr 16, 2024

prb112 Apr 15, 2024

pkenchap Apr 16, 2024

prb112 Apr 15, 2024

pkenchap Apr 16, 2024

prb112 Apr 15, 2024

pkenchap Apr 16, 2024

prb112 Apr 15, 2024

pkenchap Apr 16, 2024

prb112 commented Apr 15, 2024

prb112 commented Apr 16, 2024

		@@ -21,3 +23,18 @@ virtual_machine_create_userdata: "#!/bin/sh\nyum -y install python3"
		# - ansible
		# package_upgrade: true

	url: https://{{ virtual_machine_create_bastion_ip }}:22623/config/worker
	url: https://{{ bastion_ip }}:22623/config/worker

	worker_hostname_encoded: "{{ virtual_machine_create_worker_hostname \| b64encode }}"
	worker_hostname_encoded: "{{ worker_hostname \| b64encode }}"

	dns_none_encoded: "{{ virtual_machine_create_dns_none_conf \| b64encode }}"
	dns_none_encoded: "{{ dns_none_conf \| b64encode }}"

	- name: Add identity resources
	- name: Add ignition resources

		search {{ virtual_machine_create_domain_name }}
		nameserver {{ virtual_machine_create_bastion_ip }}

	"source": "data:text/plain;base64,{{ virtual_machine_create_dns_none_encoded }}",
	"source": "data:text/plain;base64,{{ dns_none_encoded }}",

	"source": "data:text/plain;base64,{{ virtual_machine_create_etc_resolve_encoded }}",
	"source": "data:text/plain;base64,{{ etc_resolve_encoded }}",

	"source": "data:text/plain;base64,{{ virtual_machine_create_worker_hostname_encoded }}",
	"source": "data:text/plain;base64,{{ hostname_encoded }}",

	"source": "http://{{ virtual_machine_create_bastion_ip }}:{{ virtual_machine_create_http_port }}/ignition/worker-amd64.ign"
	"source": "http://{{ bastion_ip }}:{{ http_port }}/ignition/worker-amd64.ign"

OCTOPUS-625:Moved Ignition and templates files to virtual machine folder #20

OCTOPUS-625:Moved Ignition and templates files to virtual machine folder #20

Conversation

pkenchap commented Apr 15, 2024

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

prb112 commented Apr 15, 2024

prb112 commented Apr 16, 2024