#14 Adding RHEL default cloud.cfg
Merged 3 years ago by otubo. Opened 3 years ago by otubo.
rpms/ otubo/cloud-init include_rhel_cloud_cfg  into  master

@@ -0,0 +1,88 @@ 

+ From d46ac3af1e964916f65dd920fc54bd8c0c8e32de Mon Sep 17 00:00:00 2001

+ From: Eduardo Otubo <otubo@redhat.com>

+ Date: Thu, 10 Dec 2020 17:43:15 +0100

+ Subject: [PATCH] Adding RHEL default cloud.cfg

+ 

+ ---

+  rhel/cloud.cfg | 69 ++++++++++++++++++++++++++++++++++++++++++++++++++

+  1 file changed, 69 insertions(+)

+  create mode 100644 rhel/cloud.cfg

+ 

+ diff --git a/rhel/cloud.cfg b/rhel/cloud.cfg

+ new file mode 100644

+ index 00000000..9ecba215

+ --- /dev/null

+ +++ b/rhel/cloud.cfg

+ @@ -0,0 +1,69 @@

+ +users:

+ + - default

+ +

+ +disable_root: 1

+ +ssh_pwauth:   0

+ +

+ +mount_default_fields: [~, ~, 'auto', 'defaults,nofail,x-systemd.requires=cloud-init.service', '0', '2']

+ +resize_rootfs_tmp: /dev

+ +ssh_deletekeys:   1

+ +ssh_genkeytypes:  ~

+ +syslog_fix_perms: ~

+ +disable_vmware_customization: false

+ +

+ +cloud_init_modules:

+ + - disk_setup

+ + - migrator

+ + - bootcmd

+ + - write-files

+ + - growpart

+ + - resizefs

+ + - set_hostname

+ + - update_hostname

+ + - update_etc_hosts

+ + - rsyslog

+ + - users-groups

+ + - ssh

+ +

+ +cloud_config_modules:

+ + - mounts

+ + - locale

+ + - set-passwords

+ + - rh_subscription

+ + - yum-add-repo

+ + - package-update-upgrade-install

+ + - timezone

+ + - puppet

+ + - chef

+ + - salt-minion

+ + - mcollective

+ + - disable-ec2-metadata

+ + - runcmd

+ +

+ +cloud_final_modules:

+ + - rightscale_userdata

+ + - scripts-per-once

+ + - scripts-per-boot

+ + - scripts-per-instance

+ + - scripts-user

+ + - ssh-authkey-fingerprints

+ + - keys-to-console

+ + - phone-home

+ + - final-message

+ + - power-state-change

+ +

+ +system_info:

+ +  default_user:

+ +    name: cloud-user

+ +    lock_passwd: true

+ +    gecos: Cloud User

+ +    groups: [adm, systemd-journal]

+ +    sudo: ["ALL=(ALL) NOPASSWD:ALL"]

+ +    shell: /bin/bash

+ +  distro: rhel

+ +  paths:

+ +    cloud_dir: /var/lib/cloud

+ +    templates_dir: /etc/cloud/templates

+ +  ssh_svcname: sshd

+ +

+ +# vim:syntax=yaml

+ -- 

+ 2.27.0

+ 

file modified
+3
@@ -25,6 +25,9 @@ 

  # fail

  Patch4:         cloud-init-20.4-sandbox-ca_certs-tests-to-avoid-failure.patch

  

+ # Adding default RHEL configuration file

+ Patch5:         cloud-init-20.4-Adding-RHEL-default-cloud.cfg.patch

+ 

  BuildArch:      noarch

  

  BuildRequires:  pkgconfig(systemd)

file removed
-69
@@ -1,69 +0,0 @@ 

- users:

-  - default

- 

- disable_root: 1

- ssh_pwauth:   0

- 

- mount_default_fields: [~, ~, 'auto', 'defaults,nofail,x-systemd.requires=cloud-init.service', '0', '2']

- resize_rootfs_tmp: /dev

- ssh_deletekeys:   1

- ssh_genkeytypes:  ~

- syslog_fix_perms: ~

- disable_vmware_customization: false

- 

- cloud_init_modules:

-  - disk_setup

-  - migrator

-  - bootcmd

-  - write-files

-  - growpart

-  - resizefs

-  - set_hostname

-  - update_hostname

-  - update_etc_hosts

-  - rsyslog

-  - users-groups

-  - ssh

- 

- cloud_config_modules:

-  - mounts

-  - locale

-  - set-passwords

-  - rh_subscription

-  - yum-add-repo

-  - package-update-upgrade-install

-  - timezone

-  - puppet

-  - chef

-  - salt-minion

-  - mcollective

-  - disable-ec2-metadata

-  - runcmd

- 

- cloud_final_modules:

-  - rightscale_userdata

-  - scripts-per-once

-  - scripts-per-boot

-  - scripts-per-instance

-  - scripts-user

-  - ssh-authkey-fingerprints

-  - keys-to-console

-  - phone-home

-  - final-message

-  - power-state-change

- 

- system_info:

-   default_user:

-     name: cloud-user

-     lock_passwd: true

-     gecos: Cloud User

-     groups: [adm, systemd-journal]

-     sudo: ["ALL=(ALL) NOPASSWD:ALL"]

-     shell: /bin/bash

-   distro: rhel

-   paths:

-     cloud_dir: /var/lib/cloud

-     templates_dir: /etc/cloud/templates

-   ssh_svcname: sshd

- 

- # vim:syntax=yaml

RHEL default configuration file was on the repo but not listed on the
SRPM. Adding it via patch referenced on the spec file.

Signed-off-by: Eduardo Otubo otubo@redhat.com

Build succeeded.

Pull-Request has been merged by otubo

3 years ago