avst-cloud 0.1.31 → 0.1.32

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA256:
3
- metadata.gz: 7cad9e4dc98b83ba6e613a270ca130fa900e7bae7d1505c81a9a8af2f77271e1
4
- data.tar.gz: 477338b913d229c8a92c7d310aef13aa893974aeb78d1a70b9682f7aac5a4f0f
3
+ metadata.gz: 78c2594a42f7a68a61eb24543dc369bfc27b02796f37e80ad29c66ca00bf18f7
4
+ data.tar.gz: bcb3e6ad15450db234086533de8115df9c6f70af29c254e0ff3eee249ddf7876
5
5
  SHA512:
6
- metadata.gz: 23da11cf970a260583b226e24051a2d519f9fe76101aa466963129bc9effb72dacc167221208cc0f6b6a089fc20806e53ed34ee462f8c579875051dfee7f79ae
7
- data.tar.gz: 3be32f47fca6e6689a9c614579db49c60a1f18d4d2a9905d32b21f4c2737a9d95cabcb15408e77124309a72b77d38a60867f8fcb3b8fd2597f86fc6c398e0781
6
+ metadata.gz: 556be45093bfe379d965ee19c3986a3cefa3d671d76f58ece5f7362df0ecf722f098be4ef4b596539fb3dfb210f535180a6232182719f46c547a8be5ece07a44
7
+ data.tar.gz: 36ff0c72ac07c240fb793b9db4cf49cfd3d63adb2fd64c396c270e404a082b49c3623f8c057f4c2c76da18dadbacf36d06b7b5c4287bcd529319cefb7273a89d
@@ -4,7 +4,7 @@ $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
4
4
 
5
5
  Gem::Specification.new do |spec|
6
6
  spec.name = "avst-cloud"
7
- spec.version = '0.1.31'
7
+ spec.version = '0.1.32'
8
8
  spec.authors = ["Martin Brehovsky", "Jon Bevan", "Matthew Hope"]
9
9
  spec.email = ["mbrehovsky@adaptavist.com", "jbevan@adaptavist.com", "mhope@adaptavist.com"]
10
10
  spec.summary = %q{Automated creation, bootstrapping and provisioning of servers }
@@ -33,15 +33,14 @@ module AvstCloud
33
33
  AvstCloud::AwsServer.new(server, server_name, server.public_ip_address, root_user, root_password)
34
34
  end
35
35
 
36
- def create_server(server_name, flavour, os, key_name, ssh_key, subnet_id, security_group_ids, ebs_size, hdd_device_path, ami_image_id, availability_zone, additional_hdds={}, vpc=nil, created_by=nil, custom_tags={})
37
-
36
+ def create_server(server_name, flavour, os, key_name, ssh_key, subnet_id, security_group_ids, ebs_size, hdd_device_path, ami_image_id, availability_zone, additional_hdds={}, vpc=nil, created_by=nil, custom_tags={}, root_username=nil)
38
37
  # Permit named instances from DEFAULT_FLAVOURS
39
38
  flavour = flavour || "t2.micro"
40
39
  os = os || "ubuntu-14"
41
40
  ami_image_id = ami_image_id || "ami-f0b11187"
42
41
  device_name = hdd_device_path || '/dev/sda1'
43
42
 
44
- root_user = user_from_os(os)
43
+ root_user = root_username || user_from_os(os)
45
44
  unless File.file?(ssh_key)
46
45
  logger.error "Could not find local SSH key '#{ssh_key}'".red
47
46
  raise "Could not find local SSH key '#{ssh_key}'"
@@ -79,6 +78,7 @@ module AvstCloud
79
78
  logger.debug "flavour - #{flavour}"
80
79
  logger.debug "key_name - #{key_name}"
81
80
  logger.debug "ssh_key - #{ssh_key}"
81
+ logger.debug "root user - #{root_user}"
82
82
  logger.debug "subnet_id - #{subnet_id}"
83
83
  logger.debug "security_group_ids - #{security_group_ids}"
84
84
  logger.debug "region - #{@region}"
@@ -21,7 +21,7 @@ task :prepare_puppet_and_execute do
21
21
  SSHKit.config.command_map[:link_hiera] = "sudo su -c 'cd /etc && sudo rm -f hiera.yaml && sudo ln -sf /var/opt/puppet/current/hiera.yaml .'"
22
22
  SSHKit.config.command_map[:clear_puppet] = "sudo su -c 'rm -fr /etc/puppet'"
23
23
  SSHKit.config.command_map[:create_puppet_files] = "sudo su -c 'if [ ! -d /var/opt/puppet/current/files ]; then mkdir /var/opt/puppet/current/files; fi'"
24
- SSHKit.config.command_map[:r10k] = "source /usr/local/rvm/scripts/rvm; r10k puppetfile install"
24
+ SSHKit.config.command_map[:r10k] = "sudo su -c 'source /usr/local/rvm/scripts/rvm; r10k puppetfile install'"
25
25
  SSHKit.config.command_map[:execute_puppet_runner] = "sudo su -c 'source /usr/local/rvm/scripts/rvm; #{ENV["puppet_runner"]}'"
26
26
  SSHKit.config.command_map[:cleanup_configs_from_hiera_configs] = "sudo su -c 'find /var/opt/puppet/current/hiera-configs -maxdepth 1 -type f ! -name \'puppetfile_dictionary_v4.yaml\' ! -name \'puppetfile_dictionary.yaml\' ! -name \'#{ENV["server_name"]}.yaml\' ! -name \'#{ENV["server_name"]}_facts.yaml\' -exec rm -f {} + '"
27
27
 
metadata CHANGED
@@ -1,7 +1,7 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: avst-cloud
3
3
  version: !ruby/object:Gem::Version
4
- version: 0.1.31
4
+ version: 0.1.32
5
5
  platform: ruby
6
6
  authors:
7
7
  - Martin Brehovsky
@@ -10,7 +10,7 @@ authors:
10
10
  autorequire:
11
11
  bindir: bin
12
12
  cert_chain: []
13
- date: 2018-06-15 00:00:00.000000000 Z
13
+ date: 2018-06-21 00:00:00.000000000 Z
14
14
  dependencies:
15
15
  - !ruby/object:Gem::Dependency
16
16
  name: bundler