Add .gitreview file and update puppet coding style
create .gitreview file in devstack-vagrant project. All of the fat comma arrows (=|=>) in a resource’s attribute/value list should be aligned. Put a trailing comma after the final resource parameter. Change-Id: Ib94efc424180c26b7eb6348baff0eb2385545dcb Closes-Bug: #1334764
This commit is contained in:
Longgeek
parent
2a1e2ee1ff
commit
516639d676
|
|
@ -0,0 +1,4 @@
|
|||
[gerrit]
|
||||
host=review.openstack.org
|
||||
port=29418
|
||||
project=openstack-dev/devstack-vagrant.git
|
||||
|
|
@ -1,19 +1,19 @@
|
|||
node default {
|
||||
$dir = '/home/stack/devstack'
|
||||
|
||||
file {"/etc/hostname":
|
||||
file { '/etc/hostname':
|
||||
ensure => absent
|
||||
}
|
||||
|
||||
file {"/etc/udev/rules.d/70-persistent-net.rules":
|
||||
file { '/etc/udev/rules.d/70-persistent-net.rules':
|
||||
ensure => absent
|
||||
}
|
||||
|
||||
exec {"clean.sh":
|
||||
cwd => $dir,
|
||||
path => "/bin:/sbin:/usr/bin:/usr/sbin:/usr/local/bin:.",
|
||||
user => 'stack',
|
||||
command => "$dir/clean.sh",
|
||||
logoutput => "on_failure",
|
||||
exec { 'clean.sh':
|
||||
cwd => $dir,
|
||||
path => '/bin:/sbin:/usr/bin:/usr/sbin:/usr/local/bin:.',
|
||||
user => 'stack',
|
||||
command => "${dir}/clean.sh",
|
||||
logoutput => 'on_failure',
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,10 +1,10 @@
|
|||
node default {
|
||||
include base
|
||||
include user::stack
|
||||
if $setup_mode == "grenade" {
|
||||
if $setup_mode == 'grenade' {
|
||||
include grenade
|
||||
}
|
||||
if $setup_mode == "devstack" {
|
||||
if $setup_mode == 'devstack' {
|
||||
include devstack
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,27 +1,30 @@
|
|||
# == Class: base
|
||||
#
|
||||
|
||||
class base {
|
||||
|
||||
$vim = $operatingsystem ? {
|
||||
/RedHat|Fedora|Centos/ => "vim-enhanced",
|
||||
default => "vim"
|
||||
$vim = $::operatingsystem ? {
|
||||
/RedHat|Fedora|Centos/ => 'vim-enhanced',
|
||||
default => 'vim',
|
||||
}
|
||||
|
||||
$editors = ["joe", $vim]
|
||||
$vcs = ["git"]
|
||||
$editors = ['joe', $vim]
|
||||
$vcs = ['git']
|
||||
|
||||
package {$editors:
|
||||
package { $editors:
|
||||
ensure => latest
|
||||
}
|
||||
|
||||
package {$vcs:
|
||||
package { $vcs:
|
||||
ensure => latest
|
||||
}
|
||||
|
||||
file { "/usr/local/bin/git_clone.sh":
|
||||
owner => "root",
|
||||
group => "root",
|
||||
mode => 755,
|
||||
source => "puppet:///modules/base/git_clone.sh",
|
||||
require => Package[$vcs]
|
||||
file { '/usr/local/bin/git_clone.sh':
|
||||
owner => 'root',
|
||||
group => 'root',
|
||||
mode => '0755',
|
||||
source => 'puppet:///modules/base/git_clone.sh',
|
||||
require => Package[$vcs],
|
||||
}
|
||||
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,3 +1,6 @@
|
|||
# == Class: devstack
|
||||
#
|
||||
|
||||
class devstack(
|
||||
$dir = '/home/stack/devstack'
|
||||
)
|
||||
|
|
@ -16,42 +19,42 @@ class devstack(
|
|||
$branch = 'master'
|
||||
}
|
||||
|
||||
exec { "devstack_clone":
|
||||
require => File["/usr/local/bin/git_clone.sh"],
|
||||
path => "/bin:/sbin:/usr/bin:/usr/sbin:/usr/local/bin:.",
|
||||
exec { 'devstack_clone':
|
||||
require => File['/usr/local/bin/git_clone.sh'],
|
||||
path => '/bin:/sbin:/usr/bin:/usr/sbin:/usr/local/bin:.',
|
||||
environment => "HOME=/home/$user",
|
||||
user => 'stack',
|
||||
group => 'stack',
|
||||
command => "/usr/local/bin/git_clone.sh ${source} ${branch} ${dir}",
|
||||
logoutput => true,
|
||||
timeout => 1200
|
||||
user => 'stack',
|
||||
group => 'stack',
|
||||
command => "/usr/local/bin/git_clone.sh ${source} ${branch} ${dir}",
|
||||
logoutput => true,
|
||||
timeout => 1200,
|
||||
}
|
||||
|
||||
file { "$dir/local.sh":
|
||||
owner => $user,
|
||||
group => $user,
|
||||
mode => 755,
|
||||
source => "puppet:///modules/devstack/local.sh",
|
||||
require => Exec[ "devstack_clone" ]
|
||||
owner => $user,
|
||||
group => $user,
|
||||
mode => '0755',
|
||||
source => 'puppet:///modules/devstack/local.sh',
|
||||
require => Exec['devstack_clone'],
|
||||
}
|
||||
|
||||
file { "$dir/local.conf":
|
||||
owner => $user,
|
||||
group => $user,
|
||||
mode => 644,
|
||||
owner => $user,
|
||||
group => $user,
|
||||
mode => '0644',
|
||||
content => template('devstack/local.erb'),
|
||||
require => File["$dir/local.sh"]
|
||||
require => File["$dir/local.sh"],
|
||||
}
|
||||
|
||||
exec {"stack.sh":
|
||||
require => [ File["$dir/local.conf"], File["$dir/local.sh"] ],
|
||||
cwd => $dir,
|
||||
path => "/bin:/sbin:/usr/bin:/usr/sbin:/usr/local/bin:.",
|
||||
exec { 'stack.sh':
|
||||
require => [File["$dir/local.conf"], File["$dir/local.sh"]],
|
||||
cwd => $dir,
|
||||
path => '/bin:/sbin:/usr/bin:/usr/sbin:/usr/local/bin:.',
|
||||
environment => "HOME=/home/$user",
|
||||
user => 'stack',
|
||||
group => 'stack',
|
||||
command => "$dir/stack.sh",
|
||||
logoutput => true,
|
||||
timeout => 0
|
||||
user => 'stack',
|
||||
group => 'stack',
|
||||
command => "$dir/stack.sh",
|
||||
logoutput => true,
|
||||
timeout => 0,
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,3 +1,6 @@
|
|||
# == Class: grenade
|
||||
#
|
||||
|
||||
class grenade(
|
||||
$dir = '/home/stack/grenade'
|
||||
)
|
||||
|
|
@ -16,15 +19,15 @@ class grenade(
|
|||
$branch = 'master'
|
||||
}
|
||||
|
||||
exec { "grenade_clone":
|
||||
require => File["/usr/local/bin/git_clone.sh"],
|
||||
path => "/bin:/sbin:/usr/bin:/usr/sbin:/usr/local/bin:.",
|
||||
exec { 'grenade_clone':
|
||||
require => File['/usr/local/bin/git_clone.sh'],
|
||||
path => '/bin:/sbin:/usr/bin:/usr/sbin:/usr/local/bin:.',
|
||||
environment => "HOME=/home/$user",
|
||||
user => 'stack',
|
||||
group => 'stack',
|
||||
command => "/usr/local/bin/git_clone.sh ${source} ${branch} ${dir}",
|
||||
logoutput => true,
|
||||
timeout => 1200
|
||||
user => 'stack',
|
||||
group => 'stack',
|
||||
command => "/usr/local/bin/git_clone.sh ${source} ${branch} ${dir}",
|
||||
logoutput => true,
|
||||
timeout => 1200,
|
||||
}
|
||||
|
||||
# file { "$dir/localrc":
|
||||
|
|
@ -35,15 +38,15 @@ class grenade(
|
|||
# require => File["$dir/local.sh"]
|
||||
# }
|
||||
|
||||
exec {"grenade.sh":
|
||||
require => [ Exec["grenade_clone"] ],
|
||||
cwd => $dir,
|
||||
path => "/bin:/sbin:/usr/bin:/usr/sbin:/usr/local/bin:.",
|
||||
exec { 'grenade.sh':
|
||||
require => Exec['grenade_clone'],
|
||||
cwd => $dir,
|
||||
path => '/bin:/sbin:/usr/bin:/usr/sbin:/usr/local/bin:.',
|
||||
environment => "HOME=/home/$user",
|
||||
user => 'stack',
|
||||
group => 'stack',
|
||||
command => "$dir/grenade.sh",
|
||||
logoutput => true,
|
||||
timeout => 1200
|
||||
user => 'stack',
|
||||
group => 'stack',
|
||||
command => "$dir/grenade.sh",
|
||||
logoutput => true,
|
||||
timeout => 1200
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,10 +1,13 @@
|
|||
# == Class: user::create
|
||||
#
|
||||
|
||||
define user::create (
|
||||
$user = "",
|
||||
$pass = "",
|
||||
$key = "",
|
||||
$key_type = "rsa",
|
||||
$home = "/home/${user}",
|
||||
$is_admin = false
|
||||
$user = '',
|
||||
$pass = '',
|
||||
$key = '',
|
||||
$key_type = 'rsa',
|
||||
$home = "/home/${user}",
|
||||
$is_admin = false,
|
||||
)
|
||||
{
|
||||
if $is_admin == true {
|
||||
|
|
@ -14,49 +17,49 @@ define user::create (
|
|||
$extra_groups = ['dialout']
|
||||
}
|
||||
|
||||
group {$extra_groups:
|
||||
group { $extra_groups:
|
||||
ensure => present,
|
||||
} ->
|
||||
|
||||
group {$user:
|
||||
group { $user:
|
||||
ensure => present,
|
||||
} ->
|
||||
|
||||
user {$user:
|
||||
gid => $user,
|
||||
user { $user:
|
||||
ensure => present,
|
||||
gid => $user,
|
||||
password => $pass,
|
||||
home => $home,
|
||||
groups => $extra_groups,
|
||||
ensure => present,
|
||||
shell => "/bin/bash"
|
||||
home => $home,
|
||||
groups => $extra_groups,
|
||||
shell => '/bin/bash'
|
||||
} ->
|
||||
|
||||
file { $home:
|
||||
owner => $user,
|
||||
group => $user,
|
||||
mode => 755,
|
||||
ensure => directory,
|
||||
owner => $user,
|
||||
group => $user,
|
||||
mode => '0755',
|
||||
} ->
|
||||
|
||||
file { "${home}/bin":
|
||||
owner => $user,
|
||||
group => $user,
|
||||
mode => 755,
|
||||
ensure => directory,
|
||||
owner => $user,
|
||||
group => $user,
|
||||
mode => '0755',
|
||||
} ->
|
||||
|
||||
file { "${home}/.ssh":
|
||||
owner => $user,
|
||||
group => $user,
|
||||
mode => 700,
|
||||
ensure => directory,
|
||||
owner => $user,
|
||||
group => $user,
|
||||
mode => '0700',
|
||||
} ->
|
||||
|
||||
ssh_authorized_key { $user:
|
||||
key => $key,
|
||||
user => $user,
|
||||
type => $key_type,
|
||||
ensure => present
|
||||
ensure => present,
|
||||
key => $key,
|
||||
user => $user,
|
||||
type => $key_type,
|
||||
}
|
||||
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,32 +1,35 @@
|
|||
# == Class: user::stack
|
||||
#
|
||||
|
||||
class user::stack(
|
||||
$username = 'stack'
|
||||
)
|
||||
{
|
||||
|
||||
notify {'after':
|
||||
notify { 'after':
|
||||
message => "User params: u => $username, p => $stack_pass, k => $stack_sshkey"
|
||||
}
|
||||
|
||||
|
||||
file {'/etc/sudoers.d/stack':
|
||||
owner => "root",
|
||||
group => "root",
|
||||
mode => 440,
|
||||
source => "puppet:///modules/user/stack_sudoers"
|
||||
file { '/etc/sudoers.d/stack':
|
||||
owner => 'root',
|
||||
group => 'root',
|
||||
mode => '0440',
|
||||
source => 'puppet:///modules/user/stack_sudoers',
|
||||
} ->
|
||||
|
||||
user::create {'stack':
|
||||
user => $username,
|
||||
pass => $stack_pass,
|
||||
key => $stack_sshkey,
|
||||
user::create { 'stack':
|
||||
user => $username,
|
||||
pass => $stack_pass,
|
||||
key => $stack_sshkey,
|
||||
is_admin => true,
|
||||
} ->
|
||||
|
||||
file {'/home/stack/.bashrc':
|
||||
owner => $username,
|
||||
group => $username,
|
||||
mode => 644,
|
||||
source => "puppet:///modules/user/stack_bashrc"
|
||||
owner => $username,
|
||||
group => $username,
|
||||
mode => '0644',
|
||||
source => 'puppet:///modules/user/stack_bashrc',
|
||||
}
|
||||
|
||||
}
|
||||
|
|
|
|||
Loading…
Reference in New Issue