userdata/default.erb in awstool-0.1.1 vs userdata/default.erb in awstool-0.1.2

- old
+ new

@@ -1,45 +1,45 @@ #cloud-config bootcmd: - - echo <%= options['hostname'] %> > /etc/hostname + - echo <%= @options['hostname'] %> > /etc/hostname - hostname -F /etc/hostname -hostname: <%= options['hostname'] %> -fqdn: <%= options['hostname'] %> +hostname: <%= @options['hostname'] %> +fqdn: <%= @options['hostname'] %> manage_etc_hosts: true package_upgrade: true package_reboot_if_required: true write_files: -<% if options['puppet_install']['csr_attributes'] %> +<% if @options['puppet_install']['csr_attributes'] %> - content: | --- custom_attributes: - 1.2.840.113549.1.9.7: <%= options['puppet_install']['csr_attributes'] %> + 1.2.840.113549.1.9.7: <%= @options['puppet_install']['csr_attributes'] %> path: /etc/puppetlabs/puppet/csr_attributes.yaml permissions: 0600 <% end %> -<% options['facts'].each do |fact, value| %> +<% @options['facts'].each do |fact, value| %> - content: | --- <%= fact %>: <%= value %> path: /opt/puppetlabs/facter/facts.d/<%= fact %>.yaml permissions: '0644' <% end %> -<% if options['puppet_install'] %> +<% if @options['puppet_install'] %> runcmd: - <% if options['puppet_install']['package_manager'] == 'apt-get' %> - - wget https://apt.puppetlabs.com/<%= options['puppet_install']['repo_package'] %> - - dpkg -i /<%= options['puppet_install']['repo_package'] %> + <% if @options['puppet_install']['package_manager'] == 'apt-get' %> + - wget https://apt.puppetlabs.com/<%= @options['puppet_install']['repo_package'] %> + - dpkg -i /<%= @options['puppet_install']['repo_package'] %> - apt-get update - apt-get -y install puppet-agent - <% elsif options['puppet_install']['package_manager'] == 'yum' %> - - rpm -ivh https://yum.puppetlabs.com/<%= options['puppet_install']['repo_package'] %> + <% elsif @options['puppet_install']['package_manager'] == 'yum' %> + - rpm -ivh https://yum.puppetlabs.com/<%= @options['puppet_install']['repo_package'] %> - yum -y install puppet-agent <% end %> - - /opt/puppetlabs/bin/puppet agent -t --waitforcert 5 --server <%= options['puppet_install']['server'] %> <% if options['puppet_install']['environment'] %> --environment <%= options['puppet_install']['environment'] %><% end %> + - /opt/puppetlabs/bin/puppet agent -t --waitforcert 5 --server <%= @options['puppet_install']['server'] %> <% if @options['puppet_install']['environment'] %> --environment <%= @options['puppet_install']['environment'] %><% end %> - /opt/puppetlabs/bin/puppet agent -t <% else %> <% end %>