bitswarmbox 1.0.0.pre16 → 1.0.0.pre18
Sign up to get free protection for your applications and to get access to all the features.
- checksums.yaml +4 -4
- data/Vagrantfile +53 -43
- data/builders/vagrant/debian/build-base-jessie64.sh +1 -1
- data/builders/vagrant/debian/build-base-wheezy64.sh +1 -1
- data/builders/vagrant/debian/build-puppetmaster-jessie64.sh +1 -1
- data/builders/vagrant/ubuntu/build-base-precise64.sh +1 -1
- data/builders/vagrant/ubuntu/build-base-trusty64.sh +1 -1
- data/builders/vagrant/ubuntu/build-base-wily64.sh +1 -1
- data/builders/vagrant/ubuntu/build-base-xenial64.sh +1 -1
- data/builders/vagrant/ubuntu/build-puppetmaster-trusty64.sh +1 -1
- data/builders/vagrant/ubuntu/build-puppetmaster-xenial64.sh +1 -1
- data/lib/bitswarmbox/version.rb +1 -1
- data/puppet/Puppetfile +3 -2
- data/puppet/hiera.yaml +1 -1
- data/puppet/hieradata/puppetmaster.yaml +0 -1
- data/puppet/hieradata/vagrant.yaml +4 -0
- data/puppet/modules/packer/manifests/aws.pp +1 -0
- data/puppet/modules/packer/manifests/aws/users.pp +1 -1
- data/puppet/modules/packer/manifests/vagrant.pp +10 -9
- data/scripts/prepare.sh +12 -9
- data/scripts/puppetserver-post.sh +14 -0
- data/scripts/puppetserver.sh +0 -28
- data/templates/debian/jessie64.erb +6 -2
- data/templates/debian/wheezy64.erb +6 -2
- data/templates/ubuntu/precise64.erb +6 -2
- data/templates/ubuntu/trusty64.erb +6 -2
- data/templates/ubuntu/wily64.erb +6 -2
- data/templates/ubuntu/xenial64.erb +6 -2
- metadata +2 -2
checksums.yaml
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
---
|
|
2
2
|
SHA1:
|
|
3
|
-
metadata.gz:
|
|
4
|
-
data.tar.gz:
|
|
3
|
+
metadata.gz: 322f18f262c0d22a133220f051cd8e6684f0b301
|
|
4
|
+
data.tar.gz: eda3ccc9086f48ab0b67c6fe0f6befa02b814484
|
|
5
5
|
SHA512:
|
|
6
|
-
metadata.gz:
|
|
7
|
-
data.tar.gz:
|
|
6
|
+
metadata.gz: 7688d46b96ef1e5b9da03b8a8be2a8e2a229b25c743a6d5b278e5d814cc23c95d7245dc91d6babcbead58759abc0b47c264e03158cb0cd45c9fb252dfc5e2f2c
|
|
7
|
+
data.tar.gz: 3f7092bf09851976523c5d110ad31fa05dc9f503bf5d07641f2e2f1aba18732624beb34b86aa089455a93d335f419d2faaf2a493b550461e0be06ea75cb5cc7b
|
data/Vagrantfile
CHANGED
|
@@ -45,18 +45,28 @@ Vagrant.configure(2) do |config|
|
|
|
45
45
|
|
|
46
46
|
# Provider-specific configuration so you can fine-tune various
|
|
47
47
|
# backing providers for Vagrant. These expose provider-specific options.
|
|
48
|
-
|
|
49
|
-
#
|
|
50
|
-
config.vm.provider "virtualbox" do |vb|
|
|
48
|
+
config.vm.provider "virtualbox" do |v|
|
|
51
49
|
# Display the VirtualBox GUI when booting the machine
|
|
52
|
-
#
|
|
50
|
+
#b.gui = true
|
|
53
51
|
|
|
54
52
|
# Customize the amount of memory on the VM:
|
|
55
|
-
|
|
53
|
+
v.memory = "2048"
|
|
56
54
|
|
|
57
55
|
# Customize the number of CPUs on the VM:
|
|
58
|
-
|
|
56
|
+
v.cpus = 2
|
|
59
57
|
end
|
|
58
|
+
|
|
59
|
+
config.vm.provider "vmware" do |v|
|
|
60
|
+
# Display the VirtualBox GUI when booting the machine
|
|
61
|
+
#v.gui = true
|
|
62
|
+
|
|
63
|
+
# Customize the amount of memory on the VM:
|
|
64
|
+
v.vmx["memsize"] = "2048"
|
|
65
|
+
|
|
66
|
+
# Customize the number of CPUs on the VM:
|
|
67
|
+
v.vmx["numvcpus"] = "2"
|
|
68
|
+
end
|
|
69
|
+
|
|
60
70
|
#
|
|
61
71
|
# View the documentation for the provider you are using for more
|
|
62
72
|
# information on available options.
|
|
@@ -76,41 +86,41 @@ Vagrant.configure(2) do |config|
|
|
|
76
86
|
# sudo apt-get install -y apache2
|
|
77
87
|
# SHELL
|
|
78
88
|
|
|
79
|
-
|
|
80
|
-
#
|
|
81
|
-
|
|
82
|
-
|
|
83
|
-
|
|
84
|
-
|
|
85
|
-
|
|
86
|
-
|
|
87
|
-
|
|
88
|
-
|
|
89
|
-
|
|
90
|
-
|
|
91
|
-
|
|
92
|
-
|
|
93
|
-
|
|
94
|
-
|
|
95
|
-
|
|
96
|
-
|
|
97
|
-
|
|
98
|
-
|
|
99
|
-
|
|
100
|
-
|
|
101
|
-
|
|
102
|
-
|
|
103
|
-
|
|
104
|
-
|
|
105
|
-
|
|
106
|
-
|
|
107
|
-
|
|
108
|
-
|
|
109
|
-
|
|
110
|
-
|
|
111
|
-
|
|
112
|
-
|
|
113
|
-
|
|
114
|
-
|
|
115
|
-
|
|
89
|
+
config.vm.provision "shell", inline: "cp -f /vagrant/puppet/Puppetfile /tmp/"
|
|
90
|
+
# config.vm.provision "shell", path: "scripts/puppetserver-preload.sh"
|
|
91
|
+
|
|
92
|
+
config.vm.provision "puppet" do |puppet|
|
|
93
|
+
puppet.manifest_file = "r10k_bootstrap.pp"
|
|
94
|
+
puppet.manifests_path = "puppet/manifests"
|
|
95
|
+
puppet.environment = "production"
|
|
96
|
+
puppet.environment_path = "puppet/environments"
|
|
97
|
+
puppet.hiera_config_path = "puppet/hiera.yaml"
|
|
98
|
+
|
|
99
|
+
puppet.facter = {
|
|
100
|
+
"provisioner" => "vagrant",
|
|
101
|
+
"puppetversion" => "4.0",
|
|
102
|
+
"app_project" => "bootstrap",
|
|
103
|
+
}
|
|
104
|
+
|
|
105
|
+
puppet.options = [
|
|
106
|
+
"--show_diff"
|
|
107
|
+
]
|
|
108
|
+
end
|
|
109
|
+
|
|
110
|
+
config.vm.provision "puppet" do |puppet|
|
|
111
|
+
puppet.environment = "vagrant"
|
|
112
|
+
puppet.environment_path = "puppet/environments"
|
|
113
|
+
puppet.hiera_config_path = "puppet/hiera.yaml"
|
|
114
|
+
|
|
115
|
+
puppet.facter = {
|
|
116
|
+
"provisioner" => "vagrant",
|
|
117
|
+
"puppetversion" => "4.0",
|
|
118
|
+
"app_project" => "puppetmaster",
|
|
119
|
+
"app_environment" => "production",
|
|
120
|
+
}
|
|
121
|
+
|
|
122
|
+
puppet.options = [
|
|
123
|
+
"--show_diff --verbose"
|
|
124
|
+
]
|
|
125
|
+
end
|
|
116
126
|
end
|
data/lib/bitswarmbox/version.rb
CHANGED
data/puppet/Puppetfile
CHANGED
|
@@ -2,11 +2,11 @@ forge 'http://forge.puppetlabs.com'
|
|
|
2
2
|
|
|
3
3
|
mod 'bitswarmlabs/bsl_puppet',
|
|
4
4
|
:git => 'https://github.com/bitswarmlabs/puppet-bsl_puppet.git',
|
|
5
|
-
:tag => '0.6.
|
|
5
|
+
:tag => '0.6.8'
|
|
6
6
|
|
|
7
7
|
mod 'bitswarmlabs/bsl_bootstrap',
|
|
8
8
|
:git => 'https://github.com/bitswarmlabs/puppet-bsl_bootstrap.git',
|
|
9
|
-
:tag => '0.6.
|
|
9
|
+
:tag => '0.6.8'
|
|
10
10
|
|
|
11
11
|
mod 'bitswarmlabs/aws',
|
|
12
12
|
:git => 'https://github.com/bitswarmlabs/puppetlabs-aws.git',
|
|
@@ -17,6 +17,7 @@ mod 'adrien/alternatives', '0.3.0'
|
|
|
17
17
|
mod 'arnoudj/sudo', '1.3.0'
|
|
18
18
|
mod 'bitswarmlabs/ohmyzsh', :git => 'https://github.com/bitswarmlabs/puppet-ohmyzsh.git'
|
|
19
19
|
mod 'bryana/ec2tagfacts', '0.1.18'
|
|
20
|
+
mod 'camptocamp/systemd', '0.2.2'
|
|
20
21
|
mod 'conjur/conjur', '0.0.4'
|
|
21
22
|
mod 'croddy/make', '0.0.5'
|
|
22
23
|
mod 'garethr/docker', '5.2.0'
|
data/puppet/hiera.yaml
CHANGED
|
@@ -2,7 +2,7 @@ class packer::aws::users {
|
|
|
2
2
|
include '::packer::aws'
|
|
3
3
|
$service_acct = $::packer::aws::local_service_acct_user
|
|
4
4
|
|
|
5
|
-
if $service_acct != 'ubuntu' {
|
|
5
|
+
if $service_acct != 'ubuntu' and str2bool($::packer::aws::manage_users) {
|
|
6
6
|
user { $service_acct:
|
|
7
7
|
ensure => present,
|
|
8
8
|
home => "/home/${service_acct}",
|
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
class packer::vagrant(
|
|
2
|
-
$manage_user = '
|
|
2
|
+
$manage_user = 'false',
|
|
3
3
|
$ohymzsh = 'true',
|
|
4
4
|
$manage_ssh = 'false',
|
|
5
5
|
$public_rsa_key = 'AAAAB3NzaC1yc2EAAAABIwAAAQEA6NF8iallvQVp22WDkTkyrtvp9eWW6A8YVr+kz4TjGYe7gHzIw+niNltGEFHzD8+v1I2YJ6oXevct1YeS0o9HZyN1Q9qgCgzUFtdOKLv6IedplqoPkcmF0aYet2PkEDo3MlTBckFXPITAMzF8dJSIFo9D8HfdOV0IAdx4O7PtixWKn5y2hMNG0zQPyUecp4pzC6kivAIhyfHilFR61RGL+GPXQ2MWZWFYbAGjyiYJnAmCP3NOTd0jMZEnDkbUvxhMmBYSdETk1rRgm+R4LOzFUGaHqHDLKLX+FIPKcF96hrucXzcWyLbIbEgE98OHlnVYCzRdK8jlqm8tehUc9c9WhQ==',
|
|
@@ -17,17 +17,18 @@ class packer::vagrant(
|
|
|
17
17
|
managehome => true,
|
|
18
18
|
gid => 'vagrant',
|
|
19
19
|
groups => [ 'vagrant', ],
|
|
20
|
-
shell => '/bin/bash',
|
|
21
20
|
require => Group[ 'vagrant' ],
|
|
22
21
|
}
|
|
22
|
+
}
|
|
23
23
|
|
|
24
|
-
|
|
25
|
-
|
|
26
|
-
|
|
27
|
-
|
|
28
|
-
|
|
29
|
-
|
|
30
|
-
}
|
|
24
|
+
if str2bool($ohymzsh) {
|
|
25
|
+
include ohmyzsh
|
|
26
|
+
|
|
27
|
+
# for multiple users in one shot and set their shell to zsh
|
|
28
|
+
ohmyzsh::install { 'root': set_sh => true, disable_auto_update => true }
|
|
29
|
+
ohmyzsh::install { 'vagrant': set_sh => true, disable_update_prompt => true }
|
|
30
|
+
ohmyzsh::plugins { ['root', 'vagrant']: }
|
|
31
|
+
ohmyzsh::theme { ['root', 'vagrant']: }
|
|
31
32
|
}
|
|
32
33
|
|
|
33
34
|
if str2bool($manage_ssh) {
|
data/scripts/prepare.sh
CHANGED
|
@@ -5,25 +5,28 @@ minimal_apt_get_install='apt-get install -y'
|
|
|
5
5
|
|
|
6
6
|
set -e
|
|
7
7
|
|
|
8
|
+
os_distro=$(lsb_release -is | tr '[:upper:]' '[:lower:]')
|
|
9
|
+
os_release=$(lsb_release -cs)
|
|
10
|
+
|
|
8
11
|
# update the apt cache and packages
|
|
9
|
-
case $
|
|
12
|
+
case $os_release in
|
|
10
13
|
'precise')
|
|
11
|
-
apt-
|
|
12
|
-
|
|
13
|
-
|
|
14
|
+
apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys E1DD270288B4E6030699E45FA1715D88E1DF1F24
|
|
15
|
+
echo 'deb http://ppa.launchpad.net/git-core/ppa/ubuntu precise main' | sudo tee /etc/apt/sources.list.d/git.list
|
|
16
|
+
;;
|
|
17
|
+
'trusty')
|
|
18
|
+
apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys E1DD270288B4E6030699E45FA1715D88E1DF1F24
|
|
19
|
+
echo 'deb http://ppa.launchpad.net/git-core/ppa/ubuntu trusty main' | sudo tee /etc/apt/sources.list.d/git.list
|
|
14
20
|
;;
|
|
15
21
|
*)
|
|
16
22
|
;;
|
|
17
23
|
esac
|
|
18
24
|
|
|
19
25
|
apt-get -qy update
|
|
20
|
-
apt-get -qy upgrade
|
|
21
26
|
|
|
22
|
-
$minimal_apt_get_install
|
|
27
|
+
$minimal_apt_get_install git wget curl
|
|
23
28
|
|
|
24
|
-
|
|
25
|
-
echo "## vim executable: `which vi`"
|
|
26
|
-
echo "## git executable: `which git`"
|
|
29
|
+
apt-get -qy upgrade
|
|
27
30
|
|
|
28
31
|
mkdir -p /usr/local/bin
|
|
29
32
|
mkdir -p /usr/local/sbin
|
|
@@ -6,3 +6,17 @@
|
|
|
6
6
|
#rm -rf /etc/puppetlabs/ssl/*
|
|
7
7
|
#rm -rf /etc/puppetlabs/puppetdb/ssl/*
|
|
8
8
|
|
|
9
|
+
echo "## Generated Hiera files awaiting implementation by bsl_bootstrap init script:"
|
|
10
|
+
|
|
11
|
+
set -v
|
|
12
|
+
cat /etc/puppetlabs/code/bsl_bootstrap/hiera.yaml
|
|
13
|
+
|
|
14
|
+
cat /etc/puppetlabs/code/bsl_bootstrap/hieradata/puppetmaster.yaml
|
|
15
|
+
|
|
16
|
+
echo "## Generated init.d script:"
|
|
17
|
+
cat /etc/init.d/bsl_bootstrap
|
|
18
|
+
|
|
19
|
+
echo "## Contents of rc2.d:"
|
|
20
|
+
ls -l /etc/rc2.d
|
|
21
|
+
|
|
22
|
+
exit 0
|
data/scripts/puppetserver.sh
CHANGED
|
@@ -3,34 +3,6 @@ export LC_ALL=C
|
|
|
3
3
|
export DEBIAN_FRONTEND=noninteractive
|
|
4
4
|
minimal_apt_get_install='apt-get install -y'
|
|
5
5
|
|
|
6
|
-
echo "## Installing Puppet (server)"
|
|
7
|
-
|
|
8
|
-
set -e
|
|
9
|
-
|
|
10
|
-
cd /tmp
|
|
11
|
-
|
|
12
|
-
# see: http://docs.puppetlabs.com/guides/puppetlabs_package_repositories.html
|
|
13
|
-
|
|
14
|
-
# determine the os release
|
|
15
|
-
os_distro=$(lsb_release -is | tr '[:upper:]' '[:lower:]')
|
|
16
|
-
os_release=$(lsb_release -cs)
|
|
17
|
-
|
|
18
|
-
# configure the puppet package sources
|
|
19
|
-
wget https://apt.puppetlabs.com/puppetlabs-release-pc1-$os_release.deb
|
|
20
|
-
dpkg -i puppetlabs-release-pc1-$os_release.deb
|
|
21
|
-
apt-get -q update
|
|
22
|
-
|
|
23
|
-
# install puppetserver and friends
|
|
24
|
-
$minimal_apt_get_install puppet-agent puppetserver puppetdb puppetdb-termini
|
|
25
|
-
|
|
26
|
-
echo "## Creating symlink for Puppet binaries in /usr/bin"
|
|
27
|
-
for f in $(find /opt/puppetlabs/bin -type l -or -type f); do
|
|
28
|
-
ln -svf $(readlink -f "$f") /usr/bin/$(basename "$f")
|
|
29
|
-
done
|
|
30
|
-
|
|
31
|
-
echo "## Puppet executable $(which puppet) version $(puppet --version)"
|
|
32
|
-
echo "## Puppetdb executable $(which puppetdb) version $(puppetdb --version)"
|
|
33
|
-
|
|
34
6
|
if [ -e /tmp/keys/root_rsa ]; then
|
|
35
7
|
echo '## RSA keypair preloaded'
|
|
36
8
|
mv /tmp/keys/root_rsa /root/.ssh/id_rsa
|
|
@@ -13,7 +13,8 @@
|
|
|
13
13
|
"source_ami": "<%= @aws_source_ami %>",
|
|
14
14
|
"user_data": "<%= @aws_user_data %>",
|
|
15
15
|
<%- end -%>
|
|
16
|
-
"provisioner": "<%= @provisioner %>"
|
|
16
|
+
"provisioner": "<%= @provisioner %>",
|
|
17
|
+
"environment": "<%= @app_environment || 'production' %>"
|
|
17
18
|
},
|
|
18
19
|
|
|
19
20
|
"provisioners": [
|
|
@@ -40,6 +41,7 @@
|
|
|
40
41
|
"scripts/vmtools.sh",
|
|
41
42
|
<%- end -%>
|
|
42
43
|
<%- if @puppetserver -%>
|
|
44
|
+
"scripts/puppet.sh",
|
|
43
45
|
"scripts/puppetserver.sh",
|
|
44
46
|
<%- elsif @puppet -%>
|
|
45
47
|
"scripts/puppet.sh",
|
|
@@ -92,7 +94,9 @@
|
|
|
92
94
|
"puppetversion": "4.0",
|
|
93
95
|
"app_project": "{{user `project`}}",
|
|
94
96
|
"app_creator": "{{user `created_by`}}",
|
|
95
|
-
"app_version": "{{user `version`}}"
|
|
97
|
+
"app_version": "{{user `version`}}",
|
|
98
|
+
"app_environment": "{{user `environment`}}",
|
|
99
|
+
"packer_provider": "<%= @provider %>"
|
|
96
100
|
},
|
|
97
101
|
"manifest_file": "puppet/environments/<%= @provisioner %>/manifests/base.pp",
|
|
98
102
|
"module_paths": [
|
|
@@ -13,7 +13,8 @@
|
|
|
13
13
|
"source_ami": "<%= @aws_source_ami %>",
|
|
14
14
|
"user_data": "<%= @aws_user_data %>",
|
|
15
15
|
<%- end -%>
|
|
16
|
-
"provisioner": "<%= @provisioner %>"
|
|
16
|
+
"provisioner": "<%= @provisioner %>",
|
|
17
|
+
"environment": "<%= @app_environment || 'production' %>"
|
|
17
18
|
},
|
|
18
19
|
|
|
19
20
|
"provisioners": [
|
|
@@ -40,6 +41,7 @@
|
|
|
40
41
|
"scripts/vmtools.sh",
|
|
41
42
|
<%- end -%>
|
|
42
43
|
<%- if @puppetserver -%>
|
|
44
|
+
"scripts/puppet.sh",
|
|
43
45
|
"scripts/puppetserver.sh",
|
|
44
46
|
<%- elsif @puppet -%>
|
|
45
47
|
"scripts/puppet.sh",
|
|
@@ -92,7 +94,9 @@
|
|
|
92
94
|
"puppetversion": "4.0",
|
|
93
95
|
"app_project": "{{user `project`}}",
|
|
94
96
|
"app_creator": "{{user `created_by`}}",
|
|
95
|
-
"app_version": "{{user `version`}}"
|
|
97
|
+
"app_version": "{{user `version`}}",
|
|
98
|
+
"app_environment": "{{user `environment`}}",
|
|
99
|
+
"packer_provider": "<%= @provider %>"
|
|
96
100
|
},
|
|
97
101
|
"manifest_file": "puppet/environments/<%= @provisioner %>/manifests/base.pp",
|
|
98
102
|
"module_paths": [
|
|
@@ -13,7 +13,8 @@
|
|
|
13
13
|
"source_ami": "<%= @aws_source_ami %>",
|
|
14
14
|
"user_data": "<%= @aws_user_data %>",
|
|
15
15
|
<%- end -%>
|
|
16
|
-
"provisioner": "<%= @provisioner %>"
|
|
16
|
+
"provisioner": "<%= @provisioner %>",
|
|
17
|
+
"environment": "<%= @app_environment || 'production' %>"
|
|
17
18
|
},
|
|
18
19
|
|
|
19
20
|
"provisioners": [
|
|
@@ -40,6 +41,7 @@
|
|
|
40
41
|
"scripts/vmtools.sh",
|
|
41
42
|
<%- end -%>
|
|
42
43
|
<%- if @puppetserver -%>
|
|
44
|
+
"scripts/puppet.sh",
|
|
43
45
|
"scripts/puppetserver.sh",
|
|
44
46
|
<%- elsif @puppet -%>
|
|
45
47
|
"scripts/puppet.sh",
|
|
@@ -92,7 +94,9 @@
|
|
|
92
94
|
"puppetversion": "4.0",
|
|
93
95
|
"app_project": "{{user `project`}}",
|
|
94
96
|
"app_creator": "{{user `created_by`}}",
|
|
95
|
-
"app_version": "{{user `version`}}"
|
|
97
|
+
"app_version": "{{user `version`}}",
|
|
98
|
+
"app_environment": "{{user `environment`}}",
|
|
99
|
+
"packer_provider": "<%= @provider %>"
|
|
96
100
|
},
|
|
97
101
|
"manifest_file": "puppet/environments/<%= @provisioner %>/manifests/base.pp",
|
|
98
102
|
"module_paths": [
|
|
@@ -13,7 +13,8 @@
|
|
|
13
13
|
"source_ami": "<%= @aws_source_ami %>",
|
|
14
14
|
"user_data": "<%= @aws_user_data %>",
|
|
15
15
|
<%- end -%>
|
|
16
|
-
"provisioner": "<%= @provisioner %>"
|
|
16
|
+
"provisioner": "<%= @provisioner %>",
|
|
17
|
+
"environment": "<%= @app_environment || 'production' %>"
|
|
17
18
|
},
|
|
18
19
|
|
|
19
20
|
"provisioners": [
|
|
@@ -40,6 +41,7 @@
|
|
|
40
41
|
"scripts/vmtools.sh",
|
|
41
42
|
<%- end -%>
|
|
42
43
|
<%- if @puppetserver -%>
|
|
44
|
+
"scripts/puppet.sh",
|
|
43
45
|
"scripts/puppetserver.sh",
|
|
44
46
|
<%- elsif @puppet -%>
|
|
45
47
|
"scripts/puppet.sh",
|
|
@@ -92,7 +94,9 @@
|
|
|
92
94
|
"puppetversion": "4.0",
|
|
93
95
|
"app_project": "{{user `project`}}",
|
|
94
96
|
"app_creator": "{{user `created_by`}}",
|
|
95
|
-
"app_version": "{{user `version`}}"
|
|
97
|
+
"app_version": "{{user `version`}}",
|
|
98
|
+
"app_environment": "{{user `environment`}}",
|
|
99
|
+
"packer_provider": "<%= @provider %>"
|
|
96
100
|
},
|
|
97
101
|
"manifest_file": "puppet/environments/<%= @provisioner %>/manifests/base.pp",
|
|
98
102
|
"module_paths": [
|
data/templates/ubuntu/wily64.erb
CHANGED
|
@@ -13,7 +13,8 @@
|
|
|
13
13
|
"source_ami": "<%= @aws_source_ami %>",
|
|
14
14
|
"user_data": "<%= @aws_user_data %>",
|
|
15
15
|
<%- end -%>
|
|
16
|
-
"provisioner": "<%= @provisioner %>"
|
|
16
|
+
"provisioner": "<%= @provisioner %>",
|
|
17
|
+
"environment": "<%= @app_environment || 'production' %>"
|
|
17
18
|
},
|
|
18
19
|
|
|
19
20
|
"provisioners": [
|
|
@@ -40,6 +41,7 @@
|
|
|
40
41
|
"scripts/vmtools.sh",
|
|
41
42
|
<%- end -%>
|
|
42
43
|
<%- if @puppetserver -%>
|
|
44
|
+
"scripts/puppet.sh",
|
|
43
45
|
"scripts/puppetserver.sh",
|
|
44
46
|
<%- elsif @puppet -%>
|
|
45
47
|
"scripts/puppet.sh",
|
|
@@ -92,7 +94,9 @@
|
|
|
92
94
|
"puppetversion": "4.0",
|
|
93
95
|
"app_project": "{{user `project`}}",
|
|
94
96
|
"app_creator": "{{user `created_by`}}",
|
|
95
|
-
"app_version": "{{user `version`}}"
|
|
97
|
+
"app_version": "{{user `version`}}",
|
|
98
|
+
"app_environment": "{{user `environment`}}",
|
|
99
|
+
"packer_provider": "<%= @provider %>"
|
|
96
100
|
},
|
|
97
101
|
"manifest_file": "puppet/environments/<%= @provisioner %>/manifests/base.pp",
|
|
98
102
|
"module_paths": [
|
|
@@ -13,7 +13,8 @@
|
|
|
13
13
|
"source_ami": "<%= @aws_source_ami %>",
|
|
14
14
|
"user_data": "<%= @aws_user_data %>",
|
|
15
15
|
<%- end -%>
|
|
16
|
-
"provisioner": "<%= @provisioner %>"
|
|
16
|
+
"provisioner": "<%= @provisioner %>",
|
|
17
|
+
"environment": "<%= @app_environment || 'production' %>"
|
|
17
18
|
},
|
|
18
19
|
|
|
19
20
|
"provisioners": [
|
|
@@ -40,6 +41,7 @@
|
|
|
40
41
|
"scripts/vmtools.sh",
|
|
41
42
|
<%- end -%>
|
|
42
43
|
<%- if @puppetserver -%>
|
|
44
|
+
"scripts/puppet.sh",
|
|
43
45
|
"scripts/puppetserver.sh",
|
|
44
46
|
<%- elsif @puppet -%>
|
|
45
47
|
"scripts/puppet.sh",
|
|
@@ -92,7 +94,9 @@
|
|
|
92
94
|
"puppetversion": "4.0",
|
|
93
95
|
"app_project": "{{user `project`}}",
|
|
94
96
|
"app_creator": "{{user `created_by`}}",
|
|
95
|
-
"app_version": "{{user `version`}}"
|
|
97
|
+
"app_version": "{{user `version`}}",
|
|
98
|
+
"app_environment": "{{user `environment`}}",
|
|
99
|
+
"packer_provider": "<%= @provider %>"
|
|
96
100
|
},
|
|
97
101
|
"manifest_file": "puppet/environments/<%= @provisioner %>/manifests/base.pp",
|
|
98
102
|
"module_paths": [
|
metadata
CHANGED
|
@@ -1,14 +1,14 @@
|
|
|
1
1
|
--- !ruby/object:Gem::Specification
|
|
2
2
|
name: bitswarmbox
|
|
3
3
|
version: !ruby/object:Gem::Version
|
|
4
|
-
version: 1.0.0.
|
|
4
|
+
version: 1.0.0.pre18
|
|
5
5
|
platform: ruby
|
|
6
6
|
authors:
|
|
7
7
|
- Bitswarm Labs
|
|
8
8
|
autorequire:
|
|
9
9
|
bindir: bin
|
|
10
10
|
cert_chain: []
|
|
11
|
-
date: 2016-
|
|
11
|
+
date: 2016-07-01 00:00:00.000000000 Z
|
|
12
12
|
dependencies:
|
|
13
13
|
- !ruby/object:Gem::Dependency
|
|
14
14
|
name: claide
|