From b56ec61f3fef0848bd69996dda6e7b743f8c1b87 Mon Sep 17 00:00:00 2001
From: Alexander Arzhanov <aarzhanov@mirantis.com>
Date: Thu, 16 Feb 2017 16:17:28 +0300
Subject: [PATCH] Fix puppet manifest to the style guide

Fix puppet manifest to the style guide

Change-Id: I39d7d2fe0d7a441385bef9e7b61a7312d0b24327
---
 .../puppet/manifests/compute_alt_gateway.pp   | 30 +++++++-------
 .../puppet/manifests/compute_bird.pp          |  4 +-
 .../puppet/manifests/compute_dhcp_agent.pp    |  2 +-
 .../puppet/manifests/compute_felix.pp         |  4 +-
 .../puppet/manifests/compute_metadata_api.pp  |  4 +-
 .../puppet/manifests/compute_neutron_nova.pp  |  4 +-
 .../puppet/manifests/etcd_proxy.pp            |  6 +--
 .../puppet/manifests/hiera_override.pp        |  8 ++--
 .../puppet/manifests/neutron_networks.pp      | 16 ++++----
 .../puppet/manifests/neutron_server_config.pp | 40 ++++++++++---------
 .../puppet/manifests/private_gateway_check.pp |  4 +-
 .../puppet/manifests/repo_setup.pp            | 24 ++++++-----
 .../puppet/manifests/role_etcd.pp             |  6 +--
 .../puppet/manifests/role_rr.pp               |  4 +-
 .../puppet/modules/calico/manifests/bird.pp   |  4 +-
 .../calico/manifests/bird/bgp_peer_record.pp  | 14 +++----
 .../puppet/modules/calico/manifests/etcd.pp   |  8 ++--
 .../puppet/modules/calico/manifests/init.pp   |  4 +-
 .../puppet/modules/calico/manifests/params.pp |  4 +-
 .../puppet/modules/calico/tests/init.pp       |  2 +-
 20 files changed, 99 insertions(+), 93 deletions(-)

diff --git a/deployment_scripts/puppet/manifests/compute_alt_gateway.pp b/deployment_scripts/puppet/manifests/compute_alt_gateway.pp
index 4c71a17..51e8425 100644
--- a/deployment_scripts/puppet/manifests/compute_alt_gateway.pp
+++ b/deployment_scripts/puppet/manifests/compute_alt_gateway.pp
@@ -28,12 +28,12 @@ firewallchain { 'calico-alt-gw-MARK:mangle:IPv4':
 }->
 # iptables -t mangle -A PREROUTING -i tap+ -j calico-alt-gw-MARK
 firewall { '010 process traffic from VM instances to outside':
-  ensure   => present,
-  table    => 'mangle',
-  chain    => 'PREROUTING',
-  iniface  => 'tap+',
-  proto    => 'all',
-  jump     => 'calico-alt-gw-MARK',
+  ensure  => present,
+  table   => 'mangle',
+  chain   => 'PREROUTING',
+  iniface => 'tap+',
+  proto   => 'all',
+  jump    => 'calico-alt-gw-MARK',
 } ->
 #iptables -t mangle -A calico-alt-gw-MARK -d 192.168.111.0/24 -j RETURN
 firewall { '011 skip internal traffic':
@@ -46,12 +46,12 @@ firewall { '011 skip internal traffic':
 } ->
 #iptables -t mangle -A calico-alt-gw-MARK -j MARK --set-mark 0x222
 firewall { '012 mark traffic from VM instances to outside':
-  ensure      => present,
-  table       => 'mangle',
-  chain       => 'calico-alt-gw-MARK',
-  jump        => 'MARK',
-  proto       => 'all',
-  set_mark    => $calico_mark
+  ensure   => present,
+  table    => 'mangle',
+  chain    => 'calico-alt-gw-MARK',
+  jump     => 'MARK',
+  proto    => 'all',
+  set_mark => $calico_mark
 }
 
 file { '/etc/init/calico-alt-gateway.conf':
@@ -71,8 +71,8 @@ service {'calico-alt-gateway':
 # read the https://www.kernel.org/doc/Documentation/networking/ip-sysctl.txt
 # Value '2' may be better, but Calico Felix agent is not compotible with '2'
 sysctl::value {
-  'net.ipv4.conf.all.rp_filter':                      value => "0";
-  "net.ipv4.conf.${calico_alt_gateway_br}.rp_filter": value => "0";
+  'net.ipv4.conf.all.rp_filter':                      value => '0';
+  "net.ipv4.conf.${calico_alt_gateway_br}.rp_filter": value => '0';
 }
 
-# vim: set ts=2 sw=2 et :
\ No newline at end of file
+# vim: set ts=2 sw=2 et :
diff --git a/deployment_scripts/puppet/manifests/compute_bird.pp b/deployment_scripts/puppet/manifests/compute_bird.pp
index 22d7bea..80792bb 100644
--- a/deployment_scripts/puppet/manifests/compute_bird.pp
+++ b/deployment_scripts/puppet/manifests/compute_bird.pp
@@ -6,7 +6,7 @@ $network_metadata = hiera_hash('network_metadata', {})
 
 # Initial constants
 $plugin_name     = 'fuel-plugin-calico'
-$plugin_settings = hiera_hash("${plugin_name}", {})
+$plugin_settings = hiera_hash($plugin_name, {})
 $enable_ipv4 = try_get_value($plugin_settings, 'enable_ipv4', true)
 $enable_ipv6 = try_get_value($plugin_settings, 'enable_ipv6', false)
 $as_number   = try_get_value($plugin_settings, 'as_number', 65001)
@@ -26,7 +26,7 @@ firewall { '410 bird':
   proto  => 'tcp',
   action => 'accept',
 } ->
-class { 'calico::bird':
+class { '::calico::bird':
   template    => 'compute',
   as_number   => $as_number,
   enable_ipv4 => $enable_ipv4,
diff --git a/deployment_scripts/puppet/manifests/compute_dhcp_agent.pp b/deployment_scripts/puppet/manifests/compute_dhcp_agent.pp
index cb12fb8..87ad337 100644
--- a/deployment_scripts/puppet/manifests/compute_dhcp_agent.pp
+++ b/deployment_scripts/puppet/manifests/compute_dhcp_agent.pp
@@ -47,4 +47,4 @@ tweaks::ubuntu_service_override { 'calico-dhcp-agent':
 neutron_config { 'DEFAULT/use_namespaces': value => false }
 
 Neutron_config<||> ~> Service['calico-dhcp-agent']
-Neutron_dhcp_agent_config<||> ~> Service['calico-dhcp-agent']
\ No newline at end of file
+Neutron_dhcp_agent_config<||> ~> Service['calico-dhcp-agent']
diff --git a/deployment_scripts/puppet/manifests/compute_felix.pp b/deployment_scripts/puppet/manifests/compute_felix.pp
index 9d03292..b7361b1 100644
--- a/deployment_scripts/puppet/manifests/compute_felix.pp
+++ b/deployment_scripts/puppet/manifests/compute_felix.pp
@@ -1,6 +1,6 @@
 notice('MODULAR: calico/compute_felix.pp')
 
-include calico
+include ::calico
 
 # required, because neutron-dhcp-agent one of dependency of calico-compute
 package { 'neutron-dhcp-agent':
@@ -38,4 +38,4 @@ file { '/etc/calico/felix.cfg':
   ensure  => present,
   content => template('calico/felix.cfg.erb'),
 } ~>
-Service['calico-felix']
\ No newline at end of file
+Service['calico-felix']
diff --git a/deployment_scripts/puppet/manifests/compute_metadata_api.pp b/deployment_scripts/puppet/manifests/compute_metadata_api.pp
index b509c93..0e51293 100644
--- a/deployment_scripts/puppet/manifests/compute_metadata_api.pp
+++ b/deployment_scripts/puppet/manifests/compute_metadata_api.pp
@@ -5,12 +5,12 @@ notice('MODULAR: calico/compute_metadata_api.pp')
 # $network_metadata = hiera_hash('network_metadata', {})
 
 package { 'nova-api-metadata':
-  name   => 'nova-api-metadata',
   ensure => 'installed',
+  name   => 'nova-api-metadata',
 } ->
 service { 'nova-api-metadata':
+  ensure => running,
   enable => true,
-  ensure => running
 }
 
 # Package['nova-api-metadata'] -> Nova_config<||>
diff --git a/deployment_scripts/puppet/manifests/compute_neutron_nova.pp b/deployment_scripts/puppet/manifests/compute_neutron_nova.pp
index 5d5be3a..d8d16e0 100644
--- a/deployment_scripts/puppet/manifests/compute_neutron_nova.pp
+++ b/deployment_scripts/puppet/manifests/compute_neutron_nova.pp
@@ -4,13 +4,13 @@ $network_scheme = hiera_hash('network_scheme', {})
 prepare_network_config($network_scheme)
 $network_metadata = hiera_hash('network_metadata', {})
 
-include calico
+include ::calico
 include ::nova::params
 
 
 # Initial constants
 $plugin_name     = 'fuel-plugin-calico'
-$plugin_settings = hiera_hash("${plugin_name}", {})
+$plugin_settings = hiera_hash($plugin_name, {})
 
 $neutron_config          = hiera_hash('neutron_config')
 $management_vip          = hiera('management_vip')
diff --git a/deployment_scripts/puppet/manifests/etcd_proxy.pp b/deployment_scripts/puppet/manifests/etcd_proxy.pp
index 06a166c..6939d27 100644
--- a/deployment_scripts/puppet/manifests/etcd_proxy.pp
+++ b/deployment_scripts/puppet/manifests/etcd_proxy.pp
@@ -3,11 +3,11 @@ notice('MODULAR: calico/etcd_proxy.pp')
 prepare_network_config(hiera_hash('network_scheme'))
 $network_metadata = hiera_hash('network_metadata', {})
 
-include calico
+include ::calico
 
 # Initial constants
 $plugin_name     = 'fuel-plugin-calico'
-$plugin_settings = hiera_hash("${plugin_name}", {})
+$plugin_settings = hiera_hash($plugin_name, {})
 
 # Firewall initials
 class { '::firewall':}
@@ -22,7 +22,7 @@ firewall { '400 etcd':
   action => 'accept',
 } ->
 # Deploy etcd cluster member
-class { 'calico::etcd':
+class { '::calico::etcd':
   node_role     => 'proxy',
   bind_host     => $calico::params::mgmt_ip,
   bind_port     => $calico::params::etcd_port,
diff --git a/deployment_scripts/puppet/manifests/hiera_override.pp b/deployment_scripts/puppet/manifests/hiera_override.pp
index a63119e..2a2e9df 100644
--- a/deployment_scripts/puppet/manifests/hiera_override.pp
+++ b/deployment_scripts/puppet/manifests/hiera_override.pp
@@ -3,8 +3,8 @@ notice('MODULAR: calico/hiera_override.pp')
 
 # Initial constants
 $plugin_name     = 'fuel-plugin-calico'
-$plugin_settings = hiera_hash("${plugin_name}", {})
-$network_scheme  = hiera_hash("network_scheme", {})
+$plugin_settings = hiera_hash($plugin_name, {})
+$network_scheme  = hiera_hash('network_scheme', {})
 
 # Mangle network_scheme for setup new gateway
 if $plugin_settings['metadata']['enabled'] {
@@ -16,7 +16,7 @@ if $plugin_settings['metadata']['enabled'] {
   $overrides = remove_ovs_usage($network_scheme)
   file {"/etc/hiera/plugins/${plugin_name}.yaml":
     ensure  => file,
-    content => inline_template("<%= @overrides %>")
+    content => inline_template('<%= @overrides %>')
   }
 }
-# vim: set ts=2 sw=2 et :
\ No newline at end of file
+# vim: set ts=2 sw=2 et :
diff --git a/deployment_scripts/puppet/manifests/neutron_networks.pp b/deployment_scripts/puppet/manifests/neutron_networks.pp
index 20e490d..5113664 100644
--- a/deployment_scripts/puppet/manifests/neutron_networks.pp
+++ b/deployment_scripts/puppet/manifests/neutron_networks.pp
@@ -4,7 +4,7 @@ notice('MODULAR: calico/neutron_networks.pp')
 
 # Initial constants
 $plugin_name     = 'fuel-plugin-calico'
-$plugin_settings = hiera_hash("${plugin_name}", {})
+$plugin_settings = hiera_hash($plugin_name, {})
 
 $access_hash = hiera_hash('access', {})
 $tenant_name = try_get_value($access_hash, 'tenant', 'admin')
@@ -29,11 +29,11 @@ neutron_network { $net :
   tenant_name           => $tenant_name,
 } ->
 neutron_subnet { $subnet :
-  ensure           => 'present',
-  cidr             => $subnet_cidr,
-  network_name     => $net,
-  gateway_ip       => $subnet_gw,
-  enable_dhcp      => true,
-  ip_version       => '4',
-  tenant_name      => $tenant_name,
+  ensure       => 'present',
+  cidr         => $subnet_cidr,
+  network_name => $net,
+  gateway_ip   => $subnet_gw,
+  enable_dhcp  => true,
+  ip_version   => '4',
+  tenant_name  => $tenant_name,
 }
diff --git a/deployment_scripts/puppet/manifests/neutron_server_config.pp b/deployment_scripts/puppet/manifests/neutron_server_config.pp
index 3861c0e..a8fdb9f 100644
--- a/deployment_scripts/puppet/manifests/neutron_server_config.pp
+++ b/deployment_scripts/puppet/manifests/neutron_server_config.pp
@@ -2,17 +2,17 @@ notice('MODULAR: calico/neutron_server_config.pp')
 
 # stub for task-based deployment
 class neutron { }
-class { 'neutron' : }
+class { '::neutron' : }
 
 $network_scheme = hiera_hash('network_scheme', {})
 prepare_network_config($network_scheme)
 $network_metadata = hiera_hash('network_metadata', {})
 
-include calico
+include ::calico
 
 # Initial constants
 $plugin_name     = 'fuel-plugin-calico'
-$plugin_settings = hiera_hash("${plugin_name}", {})
+$plugin_settings = hiera_hash($plugin_name, {})
 
 # override neutron options
 $override_configuration = hiera_hash('configuration', {})
@@ -112,20 +112,20 @@ Package['calico-control'] -> Class['::neutron::server']
 Package['calico-control'] -> Class['::neutron::plugins::ml2']
 
 class { '::neutron::plugins::ml2':
-  type_drivers              => ['local', 'flat'],
-  tenant_network_types      => 'local',
-  mechanism_drivers         => ['calico'],
-  flat_networks             => ['*'],
+  type_drivers          => ['local', 'flat'],
+  tenant_network_types  => 'local',
+  mechanism_drivers     => ['calico'],
+  flat_networks         => ['*'],
   #network_vlan_ranges       => $network_vlan_ranges,
   #tunnel_id_ranges          => [],
   #vxlan_group               => $vxlan_group,
   #vni_ranges                => $tunnel_id_ranges,
-  path_mtu                  => $physical_net_mtu,
-  extension_drivers         => $extension_drivers,
+  path_mtu              => $physical_net_mtu,
+  extension_drivers     => $extension_drivers,
   #supported_pci_vendor_devs => $pci_vendor_devs,
-  sriov_agent_required      => false,
-  enable_security_group     => true,
-  firewall_driver           => 'neutron.agent.linux.iptables_firewall.OVSHybridIptablesFirewallDriver',
+  sriov_agent_required  => false,
+  enable_security_group => true,
+  firewall_driver       => 'neutron.agent.linux.iptables_firewall.OVSHybridIptablesFirewallDriver',
 }
 
 class { '::neutron::server':
@@ -159,9 +159,9 @@ class { '::neutron::server':
 }
 
 Package['neutron'] ~>
-augeas { "dhcp_agents_per_network":
+augeas { 'dhcp_agents_per_network':
   #context => "/files/etc/neutron/neutron.conf",
-  incl    => "/etc/neutron/neutron.conf",
+  incl    => '/etc/neutron/neutron.conf',
   lens    => 'Puppet.lns',
   changes => [
     "set DEFAULT/dhcp_agents_per_network ${calico::params::compute_nodes_count}",
@@ -169,11 +169,13 @@ augeas { "dhcp_agents_per_network":
 } ~> Service['neutron-server']
 
 include ::neutron::params
+$neutron_server_package = $neutron::params::server_package ? {
+  false   => $neutron::params::package_name,
+  default => $neutron::params::server_package,
+}
+
 tweaks::ubuntu_service_override { $::neutron::params::server_service:
-  package_name => $neutron::params::server_package ? {
-    false   => $neutron::params::package_name,
-    default => $neutron::params::server_package
-  }
+  package_name => $neutron_server_package,
 }
 
 class { '::neutron::server::notifications':
@@ -187,6 +189,6 @@ class { '::neutron::server::notifications':
 
 # Stub for Nuetron package
 package { 'neutron':
-  name   => 'binutils',
   ensure => 'installed',
+  name   => 'binutils',
 }
diff --git a/deployment_scripts/puppet/manifests/private_gateway_check.pp b/deployment_scripts/puppet/manifests/private_gateway_check.pp
index b61e609..33f0220 100644
--- a/deployment_scripts/puppet/manifests/private_gateway_check.pp
+++ b/deployment_scripts/puppet/manifests/private_gateway_check.pp
@@ -6,7 +6,7 @@ $calico_alt_gateway_br = get_network_role_property('neutron/mesh','interface')
 $calico_alt_gateway    = try_get_value($network_scheme,"endpoints/${calico_alt_gateway_br}/vendor_specific/provider_gateway")
 
 if ! is_ip_address($calico_alt_gateway) {
-  fail("Gateway for Private network does not specified or wrong !!!")
+  fail('Gateway for Private network does not specified or wrong !!!')
 }
 
-# vim: set ts=2 sw=2 et :
\ No newline at end of file
+# vim: set ts=2 sw=2 et :
diff --git a/deployment_scripts/puppet/manifests/repo_setup.pp b/deployment_scripts/puppet/manifests/repo_setup.pp
index f8ac704..7b9ec73 100644
--- a/deployment_scripts/puppet/manifests/repo_setup.pp
+++ b/deployment_scripts/puppet/manifests/repo_setup.pp
@@ -2,23 +2,27 @@ notice('MODULAR: calico/repo_setup.pp')
 
 # Initial constants
 $plugin_name     = 'fuel-plugin-calico'
-$plugin_settings = hiera_hash("${plugin_name}", {})
+$plugin_settings = hiera_hash($plugin_name, {})
 
 # Bird PPA
 apt::source { 'bird-repo':
-  location    => 'http://ppa.launchpad.net/cz.nic-labs/bird/ubuntu',
-  repos       => 'main',
-  #release     => 'trusty',
-  include     => { 'src' => false },
+  location => 'http://ppa.launchpad.net/cz.nic-labs/bird/ubuntu',
+  repos    => 'main',
+  #release  => 'trusty',
+  include  => {
+    'src' => false,
+  },
 }
 
 # Calico PPA
 apt::source { 'calico-repo':
-  #location    => "http://ppa.launchpad.net/project-calico/stable/ubuntu",
-  location    => "http://ppa.launchpad.net/project-calico/calico-1.4/ubuntu",
-  repos       => 'main',
-  #release     => 'trusty',
-  include     => { 'src' => false },
+  #location => "http://ppa.launchpad.net/project-calico/stable/ubuntu",
+  location => 'http://ppa.launchpad.net/project-calico/calico-1.4/ubuntu',
+  repos    => 'main',
+  #release  => 'trusty',
+  include  => {
+    'src' => false,
+  },
 }
 
 Apt::Source<||> ~> Exec<| title == 'apt_update' |>
diff --git a/deployment_scripts/puppet/manifests/role_etcd.pp b/deployment_scripts/puppet/manifests/role_etcd.pp
index 1e59f8c..c086769 100644
--- a/deployment_scripts/puppet/manifests/role_etcd.pp
+++ b/deployment_scripts/puppet/manifests/role_etcd.pp
@@ -3,11 +3,11 @@ notice('MODULAR: calico/etcd.pp')
 prepare_network_config(hiera_hash('network_scheme'))
 $network_metadata = hiera_hash('network_metadata', {})
 
-include calico
+include ::calico
 
 # Initial constants
 $plugin_name     = 'fuel-plugin-calico'
-$plugin_settings = hiera_hash("${plugin_name}", {})
+$plugin_settings = hiera_hash($plugin_name, {})
 $cluster_info    = hiera_hash('cluster', {})
 $cluster_token   = try_get_value($cluster_info, 'name', 'openstack-calico-cluster')
 
@@ -25,7 +25,7 @@ firewall { '400 etcd':
   action => 'accept',
 } ->
 # Deploy etcd cluster member
-class { 'calico::etcd':
+class { '::calico::etcd':
   node_role     => 'server',
   bind_host     => $calico::params::mgmt_ip,
   bind_port     => $calico::params::etcd_port,
diff --git a/deployment_scripts/puppet/manifests/role_rr.pp b/deployment_scripts/puppet/manifests/role_rr.pp
index 1aa09ae..6cabf92 100644
--- a/deployment_scripts/puppet/manifests/role_rr.pp
+++ b/deployment_scripts/puppet/manifests/role_rr.pp
@@ -6,7 +6,7 @@ $network_metadata = hiera_hash('network_metadata', {})
 
 # Initial constants
 $plugin_name     = 'fuel-plugin-calico'
-$plugin_settings = hiera_hash("${plugin_name}", {})
+$plugin_settings = hiera_hash($plugin_name, {})
 $enable_ipv4 = try_get_value($plugin_settings, 'enable_ipv4', true)
 $enable_ipv6 = try_get_value($plugin_settings, 'enable_ipv6', false)
 $as_number   = try_get_value($plugin_settings, 'as_number', 65001)
@@ -31,7 +31,7 @@ firewall { '410 bird':
   proto  => 'tcp',
   action => 'accept',
 } ->
-class { 'calico::bird':
+class { '::calico::bird':
   template    => 'rr',
   as_number   => $as_number,
   enable_ipv4 => $enable_ipv4,
diff --git a/deployment_scripts/puppet/modules/calico/manifests/bird.pp b/deployment_scripts/puppet/modules/calico/manifests/bird.pp
index e873e4c..c155b53 100644
--- a/deployment_scripts/puppet/modules/calico/manifests/bird.pp
+++ b/deployment_scripts/puppet/modules/calico/manifests/bird.pp
@@ -50,7 +50,7 @@ class calico::bird (
     mode    => '0644',
     owner   => 'root',
     group   => 'root',
-    content => template("calico/bird-calico_os-filters.conf.erb"),
+    content => template('calico/bird-calico_os-filters.conf.erb'),
   } ->
   file { '/etc/bird/bird.conf':
     ensure  => present,
@@ -92,4 +92,4 @@ class calico::bird (
   }
 
 }
-# vim: set ts=2 sw=2 et :
\ No newline at end of file
+# vim: set ts=2 sw=2 et :
diff --git a/deployment_scripts/puppet/modules/calico/manifests/bird/bgp_peer_record.pp b/deployment_scripts/puppet/modules/calico/manifests/bird/bgp_peer_record.pp
index 2eb35ab..43ae1d7 100644
--- a/deployment_scripts/puppet/modules/calico/manifests/bird/bgp_peer_record.pp
+++ b/deployment_scripts/puppet/modules/calico/manifests/bird/bgp_peer_record.pp
@@ -9,7 +9,7 @@ define calico::bird::bgp_peer_record (
 ) {
   include ::calico::params
   $peer_config_path = "/etc/bird/peers/${template}__${name}.conf"
-  file { "${peer_config_path}":
+  file { $peer_config_path:
     ensure  => $ensure,
     require => File['/etc/bird/peers'],
     before  => File['/etc/bird/bird.conf'],
@@ -17,19 +17,19 @@ define calico::bird::bgp_peer_record (
     content => template("calico/bird-peer-${template}.conf.erb"),
   }
   if $include {
-    file_line {"":
-      line      => "include ${peer_config_path};",
-      path      => '/etc/bird/bird.conf',
+    file_line {'':
+      line    => "include ${peer_config_path};",
+      path    => '/etc/bird/bird.conf',
       #after    => undef,
       #ensure   => 'present',
       #match    => undef, # /.*match/
       #multiple => undef, # 'true' or 'false'
       #name     => undef,
       #replace  => true, # 'true' or 'false'
-      require   => File['/etc/bird/bird.conf'],
-      notify    => Service['bird']
+      require => File['/etc/bird/bird.conf'],
+      notify  => Service['bird']
     }
   }
 }
 
-# vim: set ts=2 sw=2 et :
\ No newline at end of file
+# vim: set ts=2 sw=2 et :
diff --git a/deployment_scripts/puppet/modules/calico/manifests/etcd.pp b/deployment_scripts/puppet/modules/calico/manifests/etcd.pp
index eaea60b..35dcfac 100644
--- a/deployment_scripts/puppet/modules/calico/manifests/etcd.pp
+++ b/deployment_scripts/puppet/modules/calico/manifests/etcd.pp
@@ -54,9 +54,9 @@ case $node_role {
 
   file { '/var/log/etcd.log':
     ensure => present,
-    mode    => '0644',
-    owner => 'etcd',
-    group => 'etcd',
+    mode   => '0644',
+    owner  => 'etcd',
+    group  => 'etcd',
   } ->
 
   file { '/etc/init/etcd.conf':
@@ -74,4 +74,4 @@ case $node_role {
   }
 
 }
-# vim: set ts=2 sw=2 et :
\ No newline at end of file
+# vim: set ts=2 sw=2 et :
diff --git a/deployment_scripts/puppet/modules/calico/manifests/init.pp b/deployment_scripts/puppet/modules/calico/manifests/init.pp
index 9ebdf7d..73077b4 100644
--- a/deployment_scripts/puppet/modules/calico/manifests/init.pp
+++ b/deployment_scripts/puppet/modules/calico/manifests/init.pp
@@ -14,7 +14,7 @@
 
 class calico {
 
-include calico::params
+include ::calico::params
 
 }
-# vim: set ts=2 sw=2 et :
\ No newline at end of file
+# vim: set ts=2 sw=2 et :
diff --git a/deployment_scripts/puppet/modules/calico/manifests/params.pp b/deployment_scripts/puppet/modules/calico/manifests/params.pp
index c70a72b..010fd31 100644
--- a/deployment_scripts/puppet/modules/calico/manifests/params.pp
+++ b/deployment_scripts/puppet/modules/calico/manifests/params.pp
@@ -38,6 +38,6 @@ class calico::params {
   $etcd_peer_port = '2380'
   $etcd_servers = suffix(prefix($etcd_nodes_ips, 'http://'), ":${etcd_port}")
   $etcd_servers_list = join($etcd_servers, ',')
-  $etcd_servers_named_list = join(suffix(join_keys_to_values($etcd_nodes_map,"=http://"), ":${etcd_peer_port}"), ',')
+  $etcd_servers_named_list = join(suffix(join_keys_to_values($etcd_nodes_map,'=http://'), ":${etcd_peer_port}"), ',')
 }
-# vim: set ts=2 sw=2 et :
\ No newline at end of file
+# vim: set ts=2 sw=2 et :
diff --git a/deployment_scripts/puppet/modules/calico/tests/init.pp b/deployment_scripts/puppet/modules/calico/tests/init.pp
index 4e799ab..ae65485 100644
--- a/deployment_scripts/puppet/modules/calico/tests/init.pp
+++ b/deployment_scripts/puppet/modules/calico/tests/init.pp
@@ -9,4 +9,4 @@
 # Learn more about module testing here:
 # http://docs.puppetlabs.com/guides/tests_smoke.html
 #
-include calico
+include ::calico