cloud-init

Puppet fails with puppet 4

Bug #1446804 reported by Phil Fenstermacher
44
This bug affects 10 people
Affects Status Importance Assigned to Milestone
cloud-init
Fix Released
Medium
Romanos Skiadas

Bug Description

cloud-init is incompatible with Puppet 4 (released April 15)

Notable differences:

Package name is puppet-agent (not puppet)
Installed in /opt/puppetlabs/bin/
PUPPET_CONF_PATH = '/etc/puppetlabs/puppet/puppet.conf'
PUPPET_SSL_CERT_DIR = '/etc/puppetlabs/puppet/ssl/certs/'
PUPPET_SSL_DIR = '/etc/puppetlabs/puppet/ssl'
PUPPET_SSL_CERT_PATH = '/etc/puppetlabs/puppet/ssl/certs/ca.pem'

I'm happy to attempt writing a patch, but I'm not sure if this should be a new module or a modification to the existing module.

Related branches

~chad.smith/cloud-init:ubuntu/devel
Server Team CI bot: Approve (continuous-integration)
Scott Moser: Pending requested
Diff: 371 lines (+141/-27)
10 files modified
cloudinit/config/cc_puppet.py (+40/-14)
cloudinit/config/cc_salt_minion.py (+9/-0)
cloudinit/sources/DataSourceGCE.py (+7/-8)
cloudinit/util.py (+7/-2)
debian/changelog (+13/-0)
doc/examples/cloud-config-chef.txt (+2/-2)
tests/cloud_tests/testcases/modules/salt_minion.py (+5/-0)
tests/cloud_tests/testcases/modules/salt_minion.yaml (+5/-0)
tests/unittests/test_datasource/test_gce.py (+19/-1)
tests/unittests/test_util.py (+34/-0)
~smoser/cloud-init:feature/puppet_4
Chad Smith (community): Approve
Romanos Skiadas: Pending requested
Diff: 61263 lines (+39982/-7468) (has conflicts)
571 files modified
.gitignore (+6/-0)
.pylintrc (+60/-0)
ChangeLog (+656/-0)
HACKING.rst (+11/-0)
LICENSE (+22/-674)
LICENSE-Apache2.0 (+202/-0)
LICENSE-GPLv3 (+674/-0)
MANIFEST.in (+10/-1)
Makefile (+42/-15)
cloudinit/__init__.py (+0/-21)
cloudinit/analyze/__init__.py (+0/-0)
cloudinit/analyze/__main__.py (+157/-0)
cloudinit/analyze/dump.py (+170/-0)
cloudinit/analyze/show.py (+207/-0)
cloudinit/analyze/tests/test_dump.py (+210/-0)
cloudinit/apport.py (+105/-0)
cloudinit/atomic_helper.py (+14/-3)
cloudinit/cloud.py (+8/-21)
cloudinit/cmd/__init__.py (+0/-21)
cloudinit/cmd/clean.py (+103/-0)
cloudinit/cmd/devel/__init__.py (+0/-0)
cloudinit/cmd/devel/logs.py (+101/-0)
cloudinit/cmd/devel/parser.py (+26/-0)
cloudinit/cmd/devel/tests/__init__.py (+0/-0)
cloudinit/cmd/devel/tests/test_logs.py (+120/-0)
cloudinit/cmd/main.py (+260/-92)
cloudinit/cmd/status.py (+163/-0)
cloudinit/cmd/tests/__init__.py (+0/-0)
cloudinit/cmd/tests/test_clean.py (+177/-0)
cloudinit/cmd/tests/test_status.py (+390/-0)
cloudinit/config/__init__.py (+8/-19)
cloudinit/config/cc_apt_configure.py (+41/-32)
cloudinit/config/cc_apt_pipelining.py (+5/-15)
cloudinit/config/cc_bootcmd.py (+67/-47)
cloudinit/config/cc_byobu.py (+7/-17)
cloudinit/config/cc_ca_certs.py (+4/-14)
cloudinit/config/cc_chef.py (+41/-29)
cloudinit/config/cc_debug.py (+4/-14)
cloudinit/config/cc_disable_ec2_metadata.py (+7/-17)
cloudinit/config/cc_disk_setup.py (+125/-83)
cloudinit/config/cc_emit_upstart.py (+7/-17)
cloudinit/config/cc_fan.py (+7/-17)
cloudinit/config/cc_final_message.py (+7/-17)
cloudinit/config/cc_foo.py (+7/-17)
cloudinit/config/cc_growpart.py (+22/-19)
cloudinit/config/cc_grub_dpkg.py (+7/-17)
cloudinit/config/cc_keys_to_console.py (+7/-17)
cloudinit/config/cc_landscape.py (+13/-23)
cloudinit/config/cc_locale.py (+7/-17)
cloudinit/config/cc_lxd.py (+6/-16)
cloudinit/config/cc_mcollective.py (+8/-18)
cloudinit/config/cc_migrator.py (+5/-15)
cloudinit/config/cc_mounts.py (+57/-41)
cloudinit/config/cc_ntp.py (+160/-75)
cloudinit/config/cc_package_update_upgrade_install.py (+5/-15)
cloudinit/config/cc_phone_home.py (+7/-17)
cloudinit/config/cc_power_state_change.py (+7/-16)
cloudinit/config/cc_puppet.py (+59/-28)
cloudinit/config/cc_resizefs.py (+178/-102)
cloudinit/config/cc_resolv_conf.py (+9/-19)
cloudinit/config/cc_rh_subscription.py (+35/-36)
cloudinit/config/cc_rightscale_userdata.py (+7/-17)
cloudinit/config/cc_rsyslog.py (+17/-25)
cloudinit/config/cc_runcmd.py (+64/-44)
cloudinit/config/cc_salt_minion.py (+4/-14)
cloudinit/config/cc_scripts_per_boot.py (+7/-17)
cloudinit/config/cc_scripts_per_instance.py (+7/-17)
cloudinit/config/cc_scripts_per_once.py (+7/-17)
cloudinit/config/cc_scripts_user.py (+7/-17)
cloudinit/config/cc_scripts_vendor.py (+5/-15)
cloudinit/config/cc_seed_random.py (+10/-19)
cloudinit/config/cc_set_hostname.py (+8/-18)
cloudinit/config/cc_set_passwords.py (+67/-35)
cloudinit/config/cc_snap_config.py (+12/-19)
cloudinit/config/cc_snappy.py (+8/-18)
cloudinit/config/cc_spacewalk.py (+3/-13)
cloudinit/config/cc_ssh.py (+7/-17)
cloudinit/config/cc_ssh_authkey_fingerprints.py (+7/-17)
cloudinit/config/cc_ssh_import_id.py (+7/-17)
cloudinit/config/cc_timezone.py (+7/-17)
cloudinit/config/cc_update_etc_hosts.py (+9/-19)
cloudinit/config/cc_update_hostname.py (+7/-17)
cloudinit/config/cc_users_groups.py (+47/-35)
cloudinit/config/cc_write_files.py (+27/-26)
cloudinit/config/cc_yum_add_repo.py (+20/-24)
cloudinit/config/cc_zypper_add_repo.py (+218/-0)
cloudinit/config/schema.py (+360/-0)
cloudinit/cs_utils.py (+6/-15)
cloudinit/dhclient_hook.py (+3/-2)
cloudinit/distros/__init__.py (+81/-58)
cloudinit/distros/arch.py (+69/-49)
cloudinit/distros/centos.py (+12/-0)
cloudinit/distros/debian.py (+114/-48)
cloudinit/distros/fedora.py (+9/-19)
cloudinit/distros/freebsd.py (+265/-35)
cloudinit/distros/gentoo.py (+14/-23)
cloudinit/distros/net_util.py (+9/-19)
cloudinit/distros/opensuse.py (+212/-0)
cloudinit/distros/parsers/__init__.py (+5/-15)
cloudinit/distros/parsers/hostname.py (+5/-15)
cloudinit/distros/parsers/hosts.py (+7/-17)
cloudinit/distros/parsers/networkmanager_conf.py (+23/-0)
cloudinit/distros/parsers/resolv_conf.py (+12/-19)
cloudinit/distros/parsers/sys_conf.py (+5/-15)
cloudinit/distros/rhel.py (+24/-34)
cloudinit/distros/rhel_util.py (+9/-20)
cloudinit/distros/sles.py (+7/-169)
cloudinit/distros/ubuntu.py (+10/-20)
cloudinit/distros/ug_util.py (+18/-28)
cloudinit/ec2_utils.py (+45/-30)
cloudinit/filters/__init__.py (+0/-21)
cloudinit/filters/launch_index.py (+9/-19)
cloudinit/gpg.py (+9/-18)
cloudinit/handlers/__init__.py (+10/-20)
cloudinit/handlers/boot_hook.py (+9/-19)
cloudinit/handlers/cloud_config.py (+9/-19)
cloudinit/handlers/shell_script.py (+9/-19)
cloudinit/handlers/upstart_job.py (+9/-20)
cloudinit/helpers.py (+25/-33)
cloudinit/importer.py (+9/-19)
cloudinit/log.py (+14/-19)
cloudinit/mergers/__init__.py (+5/-15)
cloudinit/mergers/m_dict.py (+5/-15)
cloudinit/mergers/m_list.py (+5/-15)
cloudinit/mergers/m_str.py (+3/-14)
cloudinit/net/__init__.py (+450/-145)
cloudinit/net/cmdline.py (+23/-52)
cloudinit/net/dhcp.py (+224/-0)
cloudinit/net/eni.py (+64/-63)
cloudinit/net/netplan.py (+399/-0)
cloudinit/net/network_state.py (+579/-57)
cloudinit/net/renderer.py (+23/-16)
cloudinit/net/renderers.py (+53/-0)
cloudinit/net/sysconfig.py (+329/-101)
cloudinit/net/tests/__init__.py (+0/-0)
cloudinit/net/tests/test_dhcp.py (+323/-0)
cloudinit/net/tests/test_init.py (+613/-0)
cloudinit/net/udev.py (+8/-16)
cloudinit/netinfo.py (+18/-27)
cloudinit/patcher.py (+7/-17)
cloudinit/registry.py (+5/-3)
cloudinit/reporting/__init__.py (+3/-2)
cloudinit/reporting/events.py (+4/-3)
cloudinit/reporting/handlers.py (+5/-3)
cloudinit/safeyaml.py (+5/-15)
cloudinit/serial.py (+3/-14)
cloudinit/settings.py (+15/-20)
cloudinit/signal_handler.py (+7/-17)
cloudinit/simpletable.py (+62/-0)
cloudinit/sources/DataSourceAliYun.py (+26/-4)
cloudinit/sources/DataSourceAltCloud.py (+18/-26)
cloudinit/sources/DataSourceAzure.py (+515/-158)
cloudinit/sources/DataSourceBigstep.py (+10/-5)
cloudinit/sources/DataSourceCloudSigma.py (+12/-18)
cloudinit/sources/DataSourceCloudStack.py (+58/-41)
cloudinit/sources/DataSourceConfigDrive.py (+23/-27)
cloudinit/sources/DataSourceDigitalOcean.py (+10/-17)
cloudinit/sources/DataSourceEc2.py (+396/-49)
cloudinit/sources/DataSourceGCE.py (+214/-93)
cloudinit/sources/DataSourceMAAS.py (+56/-37)
cloudinit/sources/DataSourceNoCloud.py (+27/-22)
cloudinit/sources/DataSourceNone.py (+9/-16)
cloudinit/sources/DataSourceOVF.py (+292/-90)
cloudinit/sources/DataSourceOpenNebula.py (+83/-83)
cloudinit/sources/DataSourceOpenStack.py (+22/-20)
cloudinit/sources/DataSourceScaleway.py (+236/-0)
cloudinit/sources/DataSourceSmartOS.py (+11/-19)
cloudinit/sources/__init__.py (+154/-39)
cloudinit/sources/helpers/__init__.py (+0/-13)
cloudinit/sources/helpers/azure.py (+45/-17)
cloudinit/sources/helpers/digitalocean.py (+38/-44)
cloudinit/sources/helpers/openstack.py (+23/-20)
cloudinit/sources/helpers/vmware/__init__.py (+0/-13)
cloudinit/sources/helpers/vmware/imc/__init__.py (+0/-13)
cloudinit/sources/helpers/vmware/imc/boot_proto.py (+6/-16)
cloudinit/sources/helpers/vmware/imc/config.py (+31/-19)
cloudinit/sources/helpers/vmware/imc/config_custom_script.py (+153/-0)
cloudinit/sources/helpers/vmware/imc/config_file.py (+10/-20)
cloudinit/sources/helpers/vmware/imc/config_namespace.py (+6/-16)
cloudinit/sources/helpers/vmware/imc/config_nic.py (+141/-104)
cloudinit/sources/helpers/vmware/imc/config_passwd.py (+67/-0)
cloudinit/sources/helpers/vmware/imc/config_source.py (+6/-16)
cloudinit/sources/helpers/vmware/imc/guestcust_error.py (+6/-16)
cloudinit/sources/helpers/vmware/imc/guestcust_event.py (+6/-16)
cloudinit/sources/helpers/vmware/imc/guestcust_state.py (+6/-16)
cloudinit/sources/helpers/vmware/imc/guestcust_util.py (+13/-21)
cloudinit/sources/helpers/vmware/imc/ipv4_mode.py (+6/-16)
cloudinit/sources/helpers/vmware/imc/nic.py (+6/-16)
cloudinit/sources/helpers/vmware/imc/nic_base.py (+6/-16)
cloudinit/sources/tests/__init__.py (+0/-0)
cloudinit/sources/tests/test_init.py (+202/-0)
cloudinit/ssh_util.py (+27/-28)
cloudinit/stages.py (+75/-67)
cloudinit/temp_utils.py (+106/-0)
cloudinit/templater.py (+15/-25)
cloudinit/tests/__init__.py (+0/-0)
cloudinit/tests/helpers.py (+170/-54)
cloudinit/tests/test_netinfo.py (+106/-0)
cloudinit/tests/test_simpletable.py (+106/-0)
cloudinit/tests/test_temp_utils.py (+101/-0)
cloudinit/tests/test_url_helper.py (+40/-0)
cloudinit/tests/test_util.py (+46/-0)
cloudinit/type_utils.py (+9/-19)
cloudinit/url_helper.py (+49/-37)
cloudinit/user_data.py (+35/-31)
cloudinit/util.py (+420/-199)
cloudinit/version.py (+13/-16)
cloudinit/warnings.py (+139/-0)
config/cloud.cfg.tmpl (+86/-5)
dev/null (+0/-171)
doc/examples/cloud-config-apt.txt (+2/-2)
doc/examples/cloud-config-chef.txt (+49/-41)
doc/examples/cloud-config-disk-setup.txt (+7/-7)
doc/examples/cloud-config-gluster.txt (+2/-2)
doc/examples/cloud-config-mount-points.txt (+4/-4)
doc/examples/cloud-config-resolv-conf.txt (+2/-2)
doc/examples/cloud-config-update-apt.txt (+4/-3)
doc/examples/cloud-config-user-groups.txt (+3/-3)
doc/examples/cloud-config.txt (+12/-5)
doc/rtd/conf.py (+10/-0)
doc/rtd/index.rst (+3/-0)
doc/rtd/topics/boot.rst (+10/-3)
doc/rtd/topics/capabilities.rst (+202/-3)
doc/rtd/topics/datasources.rst (+14/-13)
doc/rtd/topics/datasources/altcloud.rst (+4/-2)
doc/rtd/topics/datasources/azure.rst (+3/-1)
doc/rtd/topics/datasources/cloudsigma.rst (+2/-0)
doc/rtd/topics/datasources/cloudstack.rst (+2/-0)
doc/rtd/topics/datasources/configdrive.rst (+6/-4)
doc/rtd/topics/datasources/digitalocean.rst (+2/-0)
doc/rtd/topics/datasources/ec2.rst (+2/-0)
doc/rtd/topics/datasources/fallback.rst (+2/-0)
doc/rtd/topics/datasources/gce.rst (+20/-0)
doc/rtd/topics/datasources/maas.rst (+2/-0)
doc/rtd/topics/datasources/nocloud.rst (+71/-0)
doc/rtd/topics/datasources/opennebula.rst (+2/-0)
doc/rtd/topics/datasources/openstack.rst (+37/-1)
doc/rtd/topics/datasources/ovf.rst (+2/-0)
doc/rtd/topics/datasources/smartos.rst (+2/-0)
doc/rtd/topics/debugging.rst (+147/-0)
doc/rtd/topics/dir_layout.rst (+7/-7)
doc/rtd/topics/examples.rst (+29/-1)
doc/rtd/topics/format.rst (+8/-6)
doc/rtd/topics/merging.rst (+199/-1)
doc/rtd/topics/modules.rst (+3/-1)
doc/rtd/topics/network-config-format-eni.rst (+20/-0)
doc/rtd/topics/network-config-format-v1.rst (+563/-0)
doc/rtd/topics/network-config-format-v2.rst (+503/-0)
doc/rtd/topics/network-config.rst (+254/-0)
doc/rtd/topics/tests.rst (+702/-0)
doc/rtd/topics/vendordata.rst (+2/-2)
integration-requirements.txt (+20/-0)
packages/bddeb (+38/-85)
packages/brpm (+14/-31)
packages/debian/control.in (+2/-13)
packages/debian/copyright (+25/-14)
packages/debian/dirs (+0/-1)
packages/debian/rules.in (+4/-1)
packages/pkg-deps.json (+85/-0)
packages/redhat/cloud-init.spec.in (+92/-84)
packages/suse/cloud-init.spec.in (+21/-33)
requirements.txt (+3/-6)
setup.py (+145/-87)
snapcraft.yaml (+20/-0)
systemd/cloud-config.service.tmpl (+1/-0)
systemd/cloud-final.service.tmpl (+8/-1)
systemd/cloud-init-generator (+37/-2)
systemd/cloud-init-local.service.tmpl (+5/-0)
systemd/cloud-init.service.tmpl (+20/-1)
systemd/cloud-init.target (+1/-1)
sysvinit/freebsd/cloudconfig (+0/-10)
sysvinit/freebsd/cloudfinal (+0/-10)
sysvinit/freebsd/cloudinit (+0/-10)
sysvinit/freebsd/cloudinitlocal (+2/-12)
sysvinit/gentoo/cloud-config (+0/-0)
sysvinit/gentoo/cloud-final (+0/-0)
sysvinit/gentoo/cloud-init (+0/-0)
sysvinit/gentoo/cloud-init-local (+0/-0)
sysvinit/redhat/cloud-config (+3/-16)
sysvinit/redhat/cloud-final (+3/-16)
sysvinit/redhat/cloud-init (+3/-16)
sysvinit/redhat/cloud-init-local (+3/-16)
sysvinit/suse/cloud-config (+113/-0)
sysvinit/suse/cloud-final (+113/-0)
sysvinit/suse/cloud-init (+114/-0)
sysvinit/suse/cloud-init-local (+113/-0)
templates/hosts.debian.tmpl (+2/-2)
templates/hosts.suse.tmpl (+8/-2)
templates/ntp.conf.opensuse.tmpl (+88/-0)
templates/ntp.conf.sles.tmpl (+0/-12)
templates/sources.list.debian.tmpl (+8/-10)
templates/timesyncd.conf.tmpl (+8/-0)
test-requirements.txt (+0/-6)
tests/cloud_tests/__init__.py (+38/-0)
tests/cloud_tests/__main__.py (+71/-0)
tests/cloud_tests/args.py (+301/-0)
tests/cloud_tests/bddeb.py (+119/-0)
tests/cloud_tests/collect.py (+205/-0)
tests/cloud_tests/config.py (+165/-0)
tests/cloud_tests/manage.py (+74/-0)
tests/cloud_tests/platforms.yaml (+70/-0)
tests/cloud_tests/platforms/__init__.py (+39/-0)
tests/cloud_tests/platforms/ec2/image.py (+99/-0)
tests/cloud_tests/platforms/ec2/instance.py (+132/-0)
tests/cloud_tests/platforms/ec2/platform.py (+258/-0)
tests/cloud_tests/platforms/ec2/snapshot.py (+66/-0)
tests/cloud_tests/platforms/images.py (+57/-0)
tests/cloud_tests/platforms/instances.py (+145/-0)
tests/cloud_tests/platforms/lxd/image.py (+193/-0)
tests/cloud_tests/platforms/lxd/instance.py (+232/-0)
tests/cloud_tests/platforms/lxd/platform.py (+108/-0)
tests/cloud_tests/platforms/lxd/snapshot.py (+53/-0)
tests/cloud_tests/platforms/nocloudkvm/image.py (+79/-0)
tests/cloud_tests/platforms/nocloudkvm/instance.py (+192/-0)
tests/cloud_tests/platforms/nocloudkvm/platform.py (+93/-0)
tests/cloud_tests/platforms/nocloudkvm/snapshot.py (+59/-0)
tests/cloud_tests/platforms/platforms.py (+96/-0)
tests/cloud_tests/platforms/snapshots.py (+45/-0)
tests/cloud_tests/releases.yaml (+261/-0)
tests/cloud_tests/run_funcs.py (+75/-0)
tests/cloud_tests/setup_image.py (+229/-0)
tests/cloud_tests/stage.py (+107/-0)
tests/cloud_tests/testcases.yaml (+43/-0)
tests/cloud_tests/testcases/__init__.py (+56/-0)
tests/cloud_tests/testcases/base.py (+137/-0)
tests/cloud_tests/testcases/bugs/README.md (+13/-0)
tests/cloud_tests/testcases/bugs/__init__.py (+8/-0)
tests/cloud_tests/testcases/bugs/lp1511485.py (+15/-0)
tests/cloud_tests/testcases/bugs/lp1511485.yaml (+11/-0)
tests/cloud_tests/testcases/bugs/lp1611074.yaml (+8/-0)
tests/cloud_tests/testcases/bugs/lp1628337.py (+23/-0)
tests/cloud_tests/testcases/bugs/lp1628337.yaml (+23/-0)
tests/cloud_tests/testcases/examples/README.md (+12/-0)
tests/cloud_tests/testcases/examples/TODO.md (+15/-0)
tests/cloud_tests/testcases/examples/__init__.py (+8/-0)
tests/cloud_tests/testcases/examples/add_apt_repositories.py (+20/-0)
tests/cloud_tests/testcases/examples/add_apt_repositories.yaml (+23/-0)
tests/cloud_tests/testcases/examples/alter_completion_message.py (+40/-0)
tests/cloud_tests/testcases/examples/alter_completion_message.yaml (+16/-0)
tests/cloud_tests/testcases/examples/configure_instance_trusted_ca_certificates.py (+27/-0)
tests/cloud_tests/testcases/examples/configure_instance_trusted_ca_certificates.yaml (+41/-0)
tests/cloud_tests/testcases/examples/configure_instances_ssh_keys.py (+31/-0)
tests/cloud_tests/testcases/examples/configure_instances_ssh_keys.yaml (+63/-0)
tests/cloud_tests/testcases/examples/including_user_groups.py (+49/-0)
tests/cloud_tests/testcases/examples/including_user_groups.yaml (+56/-0)
tests/cloud_tests/testcases/examples/install_arbitrary_packages.py (+20/-0)
tests/cloud_tests/testcases/examples/install_arbitrary_packages.yaml (+20/-0)
tests/cloud_tests/testcases/examples/install_run_chef_recipes.py (+17/-0)
tests/cloud_tests/testcases/examples/install_run_chef_recipes.yaml (+103/-0)
tests/cloud_tests/testcases/examples/run_apt_upgrade.py (+19/-0)
tests/cloud_tests/testcases/examples/run_apt_upgrade.yaml (+11/-0)
tests/cloud_tests/testcases/examples/run_commands.py (+15/-0)
tests/cloud_tests/testcases/examples/run_commands.yaml (+16/-0)
tests/cloud_tests/testcases/examples/run_commands_first_boot.py (+15/-0)
tests/cloud_tests/testcases/examples/run_commands_first_boot.yaml (+16/-0)
tests/cloud_tests/testcases/examples/setup_run_puppet.yaml (+55/-0)
tests/cloud_tests/testcases/examples/writing_out_arbitrary_files.py (+30/-0)
tests/cloud_tests/testcases/examples/writing_out_arbitrary_files.yaml (+45/-0)
tests/cloud_tests/testcases/main/README.md (+11/-0)
tests/cloud_tests/testcases/main/__init__.py (+8/-0)
tests/cloud_tests/testcases/main/command_output_simple.py (+34/-0)
tests/cloud_tests/testcases/main/command_output_simple.yaml (+13/-0)
tests/cloud_tests/testcases/modules/README.md (+12/-0)
tests/cloud_tests/testcases/modules/TODO.md (+98/-0)
tests/cloud_tests/testcases/modules/__init__.py (+8/-0)
tests/cloud_tests/testcases/modules/apt_configure_conf.py (+20/-0)
tests/cloud_tests/testcases/modules/apt_configure_conf.yaml (+21/-0)
tests/cloud_tests/testcases/modules/apt_configure_disable_suites.py (+15/-0)
tests/cloud_tests/testcases/modules/apt_configure_disable_suites.yaml (+20/-0)
tests/cloud_tests/testcases/modules/apt_configure_primary.py (+20/-0)
tests/cloud_tests/testcases/modules/apt_configure_primary.yaml (+26/-0)
tests/cloud_tests/testcases/modules/apt_configure_proxy.py (+22/-0)
tests/cloud_tests/testcases/modules/apt_configure_proxy.yaml (+18/-0)
tests/cloud_tests/testcases/modules/apt_configure_security.py (+15/-0)
tests/cloud_tests/testcases/modules/apt_configure_security.yaml (+18/-0)
tests/cloud_tests/testcases/modules/apt_configure_sources_key.py (+23/-0)
tests/cloud_tests/testcases/modules/apt_configure_sources_key.yaml (+50/-0)
tests/cloud_tests/testcases/modules/apt_configure_sources_keyserver.py (+23/-0)
tests/cloud_tests/testcases/modules/apt_configure_sources_keyserver.yaml (+23/-0)
tests/cloud_tests/testcases/modules/apt_configure_sources_list.py (+31/-0)
tests/cloud_tests/testcases/modules/apt_configure_sources_list.yaml (+28/-0)
tests/cloud_tests/testcases/modules/apt_configure_sources_ppa.py (+23/-0)
tests/cloud_tests/testcases/modules/apt_configure_sources_ppa.yaml (+29/-0)
tests/cloud_tests/testcases/modules/apt_pipelining_disable.py (+15/-0)
tests/cloud_tests/testcases/modules/apt_pipelining_disable.yaml (+15/-0)
tests/cloud_tests/testcases/modules/apt_pipelining_os.py (+15/-0)
tests/cloud_tests/testcases/modules/apt_pipelining_os.yaml (+15/-0)
tests/cloud_tests/testcases/modules/bootcmd.py (+15/-0)
tests/cloud_tests/testcases/modules/bootcmd.yaml (+13/-0)
tests/cloud_tests/testcases/modules/byobu.py (+25/-0)
tests/cloud_tests/testcases/modules/byobu.yaml (+20/-0)
tests/cloud_tests/testcases/modules/ca_certs.py (+20/-0)
tests/cloud_tests/testcases/modules/ca_certs.yaml (+52/-0)
tests/cloud_tests/testcases/modules/debug_disable.py (+16/-0)
tests/cloud_tests/testcases/modules/debug_disable.yaml (+9/-0)
tests/cloud_tests/testcases/modules/debug_enable.py (+15/-0)
tests/cloud_tests/testcases/modules/debug_enable.yaml (+9/-0)
tests/cloud_tests/testcases/modules/final_message.py (+40/-0)
tests/cloud_tests/testcases/modules/final_message.yaml (+13/-0)
tests/cloud_tests/testcases/modules/keys_to_console.py (+22/-0)
tests/cloud_tests/testcases/modules/keys_to_console.yaml (+15/-0)
tests/cloud_tests/testcases/modules/landscape.yaml (+28/-0)
tests/cloud_tests/testcases/modules/locale.py (+30/-0)
tests/cloud_tests/testcases/modules/locale.yaml (+22/-0)
tests/cloud_tests/testcases/modules/lxd_bridge.py (+26/-0)
tests/cloud_tests/testcases/modules/lxd_bridge.yaml (+32/-0)
tests/cloud_tests/testcases/modules/lxd_dir.py (+20/-0)
tests/cloud_tests/testcases/modules/lxd_dir.yaml (+19/-0)
tests/cloud_tests/testcases/modules/ntp.py (+25/-0)
tests/cloud_tests/testcases/modules/ntp.yaml (+21/-0)
tests/cloud_tests/testcases/modules/ntp_pools.py (+34/-0)
tests/cloud_tests/testcases/modules/ntp_pools.yaml (+31/-0)
tests/cloud_tests/testcases/modules/ntp_servers.py (+34/-0)
tests/cloud_tests/testcases/modules/ntp_servers.yaml (+27/-0)
tests/cloud_tests/testcases/modules/package_update_upgrade_install.py (+38/-0)
tests/cloud_tests/testcases/modules/package_update_upgrade_install.yaml (+33/-0)
tests/cloud_tests/testcases/modules/runcmd.py (+15/-0)
tests/cloud_tests/testcases/modules/runcmd.yaml (+13/-0)
tests/cloud_tests/testcases/modules/salt_minion.py (+29/-0)
tests/cloud_tests/testcases/modules/salt_minion.yaml (+34/-0)
tests/cloud_tests/testcases/modules/seed_random_command.yaml (+18/-0)
tests/cloud_tests/testcases/modules/seed_random_data.py (+15/-0)
tests/cloud_tests/testcases/modules/seed_random_data.yaml (+15/-0)
tests/cloud_tests/testcases/modules/set_hostname.py (+17/-0)
tests/cloud_tests/testcases/modules/set_hostname.yaml (+21/-0)
tests/cloud_tests/testcases/modules/set_hostname_fqdn.py (+31/-0)
tests/cloud_tests/testcases/modules/set_hostname_fqdn.yaml (+23/-0)
tests/cloud_tests/testcases/modules/set_password.py (+22/-0)
tests/cloud_tests/testcases/modules/set_password.yaml (+19/-0)
tests/cloud_tests/testcases/modules/set_password_expire.py (+23/-0)
tests/cloud_tests/testcases/modules/set_password_expire.yaml (+32/-0)
tests/cloud_tests/testcases/modules/set_password_list.py (+12/-0)
tests/cloud_tests/testcases/modules/set_password_list.yaml (+41/-0)
tests/cloud_tests/testcases/modules/set_password_list_string.py (+12/-0)
tests/cloud_tests/testcases/modules/set_password_list_string.yaml (+41/-0)
tests/cloud_tests/testcases/modules/snappy.py (+15/-0)
tests/cloud_tests/testcases/modules/snappy.yaml (+15/-0)
tests/cloud_tests/testcases/modules/ssh_auth_key_fingerprints_disable.py (+16/-0)
tests/cloud_tests/testcases/modules/ssh_auth_key_fingerprints_disable.yaml (+14/-0)
tests/cloud_tests/testcases/modules/ssh_auth_key_fingerprints_enable.py (+18/-0)
tests/cloud_tests/testcases/modules/ssh_auth_key_fingerprints_enable.yaml (+21/-0)
tests/cloud_tests/testcases/modules/ssh_import_id.py (+17/-0)
tests/cloud_tests/testcases/modules/ssh_import_id.yaml (+17/-0)
tests/cloud_tests/testcases/modules/ssh_keys_generate.py (+52/-0)
tests/cloud_tests/testcases/modules/ssh_keys_generate.yaml (+38/-0)
tests/cloud_tests/testcases/modules/ssh_keys_provided.py (+58/-0)
tests/cloud_tests/testcases/modules/ssh_keys_provided.yaml (+99/-0)
tests/cloud_tests/testcases/modules/timezone.py (+15/-0)
tests/cloud_tests/testcases/modules/timezone.yaml (+16/-0)
tests/cloud_tests/testcases/modules/user_groups.py (+49/-0)
tests/cloud_tests/testcases/modules/user_groups.yaml (+55/-0)
tests/cloud_tests/testcases/modules/write_files.py (+30/-0)
tests/cloud_tests/testcases/modules/write_files.yaml (+46/-0)
tests/cloud_tests/util.py (+494/-0)
tests/cloud_tests/verify.py (+96/-0)
tests/data/merge_sources/expected8.yaml (+1/-1)
tests/data/merge_sources/source8-1.yaml (+1/-1)
tests/unittests/__init__.py (+2/-0)
tests/unittests/test__init__.py (+61/-33)
tests/unittests/test_atomic_helper.py (+6/-2)
tests/unittests/test_builtin_handlers.py (+5/-1)
tests/unittests/test_cli.py (+244/-4)
tests/unittests/test_cs_util.py (+6/-1)
tests/unittests/test_data.py (+127/-1)
tests/unittests/test_datasource/test_aliyun.py (+76/-8)
tests/unittests/test_datasource/test_altcloud.py (+79/-91)
tests/unittests/test_datasource/test_azure.py (+698/-89)
tests/unittests/test_datasource/test_azure_helper.py (+103/-52)
tests/unittests/test_datasource/test_cloudsigma.py (+30/-7)
tests/unittests/test_datasource/test_cloudstack.py (+106/-9)
tests/unittests/test_datasource/test_common.py (+79/-0)
tests/unittests/test_datasource/test_configdrive.py (+31/-40)
tests/unittests/test_datasource/test_digitalocean.py (+77/-37)
tests/unittests/test_datasource/test_ec2.py (+638/-0)
tests/unittests/test_datasource/test_gce.py (+199/-38)
tests/unittests/test_datasource/test_maas.py (+49/-8)
tests/unittests/test_datasource/test_nocloud.py (+8/-8)
tests/unittests/test_datasource/test_opennebula.py (+190/-54)
tests/unittests/test_datasource/test_openstack.py (+24/-28)
tests/unittests/test_datasource/test_ovf.py (+275/-18)
tests/unittests/test_datasource/test_scaleway.py (+267/-0)
tests/unittests/test_datasource/test_smartos.py (+15/-23)
tests/unittests/test_distros/__init__.py (+21/-0)
tests/unittests/test_distros/test_arch.py (+45/-0)
tests/unittests/test_distros/test_create_users.py (+148/-0)
tests/unittests/test_distros/test_debian.py (+100/-0)
tests/unittests/test_distros/test_generic.py (+19/-1)
tests/unittests/test_distros/test_hostname.py (+4/-0)
tests/unittests/test_distros/test_hosts.py (+4/-0)
tests/unittests/test_distros/test_netconfig.py (+444/-8)
tests/unittests/test_distros/test_opensuse.py (+12/-0)
tests/unittests/test_distros/test_resolv.py (+7/-3)
tests/unittests/test_distros/test_sles.py (+12/-0)
tests/unittests/test_distros/test_sysconfig.py (+5/-1)
tests/unittests/test_distros/test_user_data_normalize.py (+5/-1)
tests/unittests/test_ds_identify.py (+564/-0)
tests/unittests/test_ec2_util.py (+52/-3)
tests/unittests/test_filters/test_launch_index.py (+5/-1)
tests/unittests/test_handler/test_handler_apt_conf_v1.py (+3/-1)
tests/unittests/test_handler/test_handler_apt_configure_sources_list_v1.py (+3/-1)
tests/unittests/test_handler/test_handler_apt_configure_sources_list_v3.py (+76/-22)
tests/unittests/test_handler/test_handler_apt_source_v1.py (+3/-1)
tests/unittests/test_handler/test_handler_apt_source_v3.py (+3/-1)
tests/unittests/test_handler/test_handler_bootcmd.py (+146/-0)
tests/unittests/test_handler/test_handler_ca_certs.py (+5/-1)
tests/unittests/test_handler/test_handler_chef.py (+80/-12)
tests/unittests/test_handler/test_handler_debug.py (+11/-18)
tests/unittests/test_handler/test_handler_disk_setup.py (+125/-2)
tests/unittests/test_handler/test_handler_etc_hosts.py (+69/-0)
tests/unittests/test_handler/test_handler_growpart.py (+3/-1)
tests/unittests/test_handler/test_handler_landscape.py (+130/-0)
tests/unittests/test_handler/test_handler_locale.py (+62/-18)
tests/unittests/test_handler/test_handler_lxd.py (+13/-12)
tests/unittests/test_handler/test_handler_mcollective.py (+5/-1)
tests/unittests/test_handler/test_handler_mounts.py (+5/-1)
tests/unittests/test_handler/test_handler_ntp.py (+390/-204)
tests/unittests/test_handler/test_handler_power_state.py (+8/-7)
tests/unittests/test_handler/test_handler_puppet.py (+142/-0)
tests/unittests/test_handler/test_handler_resizefs.py (+317/-0)
tests/unittests/test_handler/test_handler_rsyslog.py (+5/-1)
tests/unittests/test_handler/test_handler_runcmd.py (+108/-0)
tests/unittests/test_handler/test_handler_seed_random.py (+6/-12)
tests/unittests/test_handler/test_handler_set_hostname.py (+8/-3)
tests/unittests/test_handler/test_handler_snappy.py (+8/-4)
tests/unittests/test_handler/test_handler_spacewalk.py (+5/-1)
tests/unittests/test_handler/test_handler_timezone.py (+6/-16)
tests/unittests/test_handler/test_handler_write_files.py (+34/-5)
tests/unittests/test_handler/test_handler_yum_add_repo.py (+49/-7)
tests/unittests/test_handler/test_handler_zypper_add_repo.py (+232/-0)
tests/unittests/test_handler/test_schema.py (+404/-0)
tests/unittests/test_helpers.py (+6/-2)
tests/unittests/test_log.py (+58/-0)
tests/unittests/test_merging.py (+5/-1)
tests/unittests/test_net.py (+2280/-93)
tests/unittests/test_pathprefix2dict.py (+3/-1)
tests/unittests/test_registry.py (+5/-1)
tests/unittests/test_reporting.py (+5/-4)
tests/unittests/test_rh_subscription.py (+21/-12)
tests/unittests/test_runs/test_merge_run.py (+6/-1)
tests/unittests/test_runs/test_simple_run.py (+111/-39)
tests/unittests/test_sshutil.py (+69/-2)
tests/unittests/test_templating.py (+7/-17)
tests/unittests/test_util.py (+229/-14)
tests/unittests/test_version.py (+14/-0)
tests/unittests/test_vmware/__init__.py (+0/-0)
tests/unittests/test_vmware/test_custom_script.py (+99/-0)
tests/unittests/test_vmware_config_file.py (+261/-18)
tools/21-cloudinit.conf (+1/-1)
tools/Z99-cloud-locale-test.sh (+77/-75)
tools/Z99-cloudinit-warnings.sh (+30/-0)
tools/build-on-freebsd (+2/-7)
tools/cloud-init-per (+1/-0)
tools/cloudconfig-schema (+35/-0)
tools/ds-identify (+1397/-0)
tools/hook-dhclient (+3/-0)
tools/hook-network-manager (+2/-0)
tools/hook-rhel.sh (+2/-0)
tools/make-mime.py (+4/-2)
tools/make-tarball (+1/-1)
tools/mock-meta.py (+49/-37)
tools/motd-hook (+4/-16)
tools/net-convert.py (+84/-0)
tools/read-dependencies (+253/-24)
tools/read-version (+17/-2)
tools/render-cloudcfg (+44/-0)
tools/run-centos (+352/-0)
tools/uncloud-init (+2/-1)
tools/validate-yaml.py (+5/-3)
tools/write-ssh-key-fingerprints (+1/-0)
tools/xkvm (+664/-0)
tox.ini (+75/-20)
~rski/cloud-init:puppet_4
Server Team CI bot: Approve (continuous-integration)
cloud-init Commiters: Pending requested
Diff: 150 lines (+55/-18)
2 files modified
cloudinit/config/cc_puppet.py (+54/-17)
cloudinit/util.py (+1/-1)
Revision history for this message
Jason McClellan (jason-mcclellan-b) wrote :

Same issue here. Is there a plan to make cloud-init compatible? The simplest thing seems to make the hard coded constants configurable via the UserData attribute so that the Puppet provisioner knows where to put things and how to access the binary.

Revision history for this message
james beedy (jamesbeedy) wrote :

Same issue here!

Revision history for this message
Romanos Skiadas (rski) wrote :

This is getting rather serious, especially given how close puppet 3's EOL date is (About a month).
I looked into it, adding support for puppet 4 would've been pretty straight forward if it weren't for one thing: Some distros do not adhere to the new paths and still use /etc/puppet instead of /etc/puppetlabs, /var instead of /etc/puppetlabs etc.

Revision history for this message
Romanos Skiadas (rski) wrote :

I've started working on this so I'll assign it to myself.

Changed in cloud-init:
assignee: nobody → Romanos Skiadas (rski)
Romanos Skiadas (rski)
Changed in cloud-init:
status: New → In Progress
Revision history for this message
Robert Heinzmann (reg-x) wrote :

Why not use "puppet config set NAME VALUE --section", which hides implementation from the puppet module.

Just take care that "puppet" is in the path (e.g. /opt/puppetlabs/bin/puppet)

Scott Moser (smoser)
Changed in cloud-init:
importance: Undecided → Medium
Revision history for this message
Chad Smith (chad.smith) wrote : Fixed in Cloud-init 18.2

This bug is believed to be fixed in cloud-init in 18.2. If this is still a problem for you, please make a comment and set the state back to New

Thank you.

Changed in cloud-init:
status: In Progress → Fix Released
Revision history for this message
James Falcon (falcojr) wrote :

Tracked in Github Issues as https://github.com/canonical/cloud-init/issues/2540

To post a comment you must log in.
This report contains Public information  
Everyone can see this information.
Subscribing...

Other bug subscribers

Remote bug watches

Bug watches keep track of this bug in other bug trackers.