forked from pool/cloud-init
Robert Schweikert
738f268769
+ Version numbering scheme change now YY.NUMBER_OF_RELESE_THAT_YEAR
+ Remove cloud.cfg.suse, use generated default config file
+ Remove addopenSUSEBase.patch, included upstream
+ Remove suseIntegratedHandler.patch, included upstream
+ Remove openSUSEhostsTemplate.diff, included upstream
+ Remove cloud-init-handle-no-carrier.patch, included upstream
+ Remove cloud-init-digital-ocean-datasource.patch,
use upstream implementation
+ Remove cloud-init-digital-ocean-datasource-enable-by-default.patch,
use upstream implementation
+ Remove cloud-init-fix-unicode-handling-binarydecode.patch,
included upstream
+ Remove cloud-init-no-dmidecode-on-ppc64.patch, included upstream
+ Remove dataSourceOpenNebula.patch, use upstream implementation
+ Remove setupSUSEsysVInit.diff, included upstream
+ Remove SUSEsysVInit.diff, included upstream
+ Remove cloud-init-finalbeforelogin.patch, don't block login
+ Remove cloud-init-handle-not-implemented-query.patch, query option removed
+ Remove cloud-init-spceandtabs-clean.patch, indentation fixed upstream
+ Remove dynamicInitCmd.diff, different solution from upstream
+ Added cloud-init-more-tasks.patch, (bsc#1047363)
replace cloud-init-finalbeforelogin.patch
+ Forward port cloud-init-python2-sigpipe.patch
+ Remove cloud-init-net-eni.patch, included upstream
+ Remove cloud-init-service.patch, included upstream
+ Forward port cloud-init-sysconfig-netpathfix.patch
+ Remove cloud-init-net-sysconfig-lp1665441.patch, included upstream
+ Remove cloud-init-python26.patch, included upstream
+ Add cloud-init-tests-set-exec.patch
OBS-URL: https://build.opensuse.org/package/show/Cloud:Tools/cloud-init?expand=0&rev=88
41 lines
1.3 KiB
Diff
41 lines
1.3 KiB
Diff
--- config/cloud.cfg.tmpl.orig
|
|
+++ config/cloud.cfg.tmpl
|
|
@@ -79,6 +79,9 @@ cloud_config_modules:
|
|
- spacewalk
|
|
- yum-add-repo
|
|
{% endif %}
|
|
+{% if variant in ["opensuse", "suse"] %}
|
|
+ - zypper_add_repo
|
|
+{% endif %}
|
|
{% if variant in ["ubuntu", "unknown", "debian"] %}
|
|
- grub-dpkg
|
|
- apt-pipelining
|
|
@@ -127,7 +130,7 @@ cloud_final_modules:
|
|
# (not accessible to handlers/transforms)
|
|
system_info:
|
|
# This will affect which distro class gets used
|
|
-{% if variant in ["centos", "debian", "fedora", "rhel", "ubuntu", "freebsd"] %}
|
|
+{% if variant in ["centos", "debian", "fedora", "opensuse", "rhel", "suse", "ubuntu", "freebsd"] %}
|
|
distro: {{ variant }}
|
|
{% else %}
|
|
# Unknown/fallback distro.
|
|
@@ -186,4 +189,18 @@ system_info:
|
|
groups: [wheel]
|
|
sudo: ["ALL=(ALL) NOPASSWD:ALL"]
|
|
shell: /bin/tcsh
|
|
+{% elif variant in ["opensuse", "suse"] %}
|
|
+ # Default user name + that default users groups (if added/used)
|
|
+ default_user:
|
|
+ name: {{ variant }}
|
|
+ lock_passwd: True
|
|
+ gecos: {{ variant }} Cloud User
|
|
+ groups: [cdrom, users]
|
|
+ sudo: ["ALL=(ALL) NOPASSWD:ALL"]
|
|
+ shell: /bin/bash
|
|
+ # Other config here will be given to the distro class and/or path classes
|
|
+ paths:
|
|
+ cloud_dir: /var/lib/cloud/
|
|
+ templates_dir: /etc/cloud/templates/
|
|
+ ssh_svcname: sshd
|
|
{% endif %}
|