conan_deploy_stackato3 0.1.17 → 0.1.18

Sign up to get free protection for your applications and to get access to all the features.
checksums.yaml CHANGED
@@ -1,15 +1,15 @@
1
1
  ---
2
2
  !binary "U0hBMQ==":
3
3
  metadata.gz: !binary |-
4
- M2QyODJkNDUwOGFhNWU4NGZiZmMyZDQ1MmYwMzM5MGYwMjEwYTU2NQ==
4
+ NjNjNDI1ZTE3ZjJlYmRiYTYzZWVmMzgzZDk0N2RkOTAyNzYzYzQzZA==
5
5
  data.tar.gz: !binary |-
6
- MTc2NzJjZjc3Mjk3OGRhNWEyMGUzYWE1YjQ0Zjg3MjI3MzEzYmE2Yg==
6
+ ZmM1MjZlMmMyYWViZjZjOGFlYWYzNDI0MGM2ZjUzMzEyMjcwNmM0MA==
7
7
  SHA512:
8
8
  metadata.gz: !binary |-
9
- MTkyNGUzZjQ1ODYyYTllYmE4YzAzNGM1MDQ1ZTJlOWY5ZjVjMWVjOWNkMWUy
10
- ZGM0OTI1MDM3Njc1NmVlODBmMGU1ZDUwM2ZlMjQ1NTBjNGE0MDVhMjRmNDky
11
- NmZmOWQ2OWQyNDYwNjVmYjc0NjQwZDk5YTFhMjJhYTY2MzU4NTg=
9
+ ZWRjYzRmNjUwNDY1NzA2MWMzNThiNjY5YzljYTJiNzJjMDRmNjI0ZjlkZjEw
10
+ MWJhZGI2ZDJiODRlMjQ4NGE3N2M0ZWY0OWY2YTJmNmExZmZkMzBhNzAxMGRj
11
+ NmRiZDVmM2M3Njc1Y2Y5NmU4NDU1N2Y1OGVhZGFjZmMwY2YyZmI=
12
12
  data.tar.gz: !binary |-
13
- MmUxNWY3OWRlZDI1MjI1YzI1MjRhYjhkNjRmNjYxMDU5M2Y3NTc2ZTlmYzZi
14
- ODBhOThjZDU1MjJiZWJlMWRjYjlhYzFkMGJmYmMyMjRlMDBkZjBhNWExNzMw
15
- MTBkNjM4YWUxNjA4YTY0MmM3OTcxODdjMWJiMWY1NjM4OWNjY2E=
13
+ MTM5YWUyNDU1MjhmMDRlMGU3YzdjOGIxMDZjYmQ2MzhiMThiOTc5MmExZjI2
14
+ ODUzMjYxMmJhYjgzYWI3MjU0OGM5YTI4ZjZkMjFhZWU2ZDA2ZTM0MWI3NjY2
15
+ ZDVmZjAzOGEwNWUxYjc4ZTJjYzkyM2RmNGZlMTQ5YmZjMGQwYTU=
@@ -49,24 +49,30 @@ class Deployment < HasOptions
49
49
  "#{name(app)}-#{@randomid}"
50
50
  end
51
51
 
52
- def dns_name(app)
52
+ def dns_names(app)
53
53
  if @ship == "central"
54
- "#{@environment.id}-#{app.url_segment}.paasv2.#{@ship}.#{@org}.mtnsatcloud.com"
54
+ [ "#{@environment.id}-#{app.url_segment}.paasv2.#{@ship}.#{@org}.mtnsatcloud.com",
55
+ "#{@environment.id}.#{app.url_segment}.#{@ship}.#{@org}.mtnsatcloud.com" ]
55
56
  else
56
- "#{app.url_segment}.#{@ship}.#{@org}.mtnsatcloud.com"
57
+ [ "#{app.url_segment}.#{@ship}.#{@org}.mtnsatcloud.com" ]
57
58
  end
58
59
  end
59
60
 
60
- def agnostic_dns_name(app)
61
+ def dns_name(app)
62
+ dns_names(app)[0]
63
+ end
64
+
65
+ def agnostic_dns_names(app)
61
66
  if @ship == "central"
62
- "#{@environment.id}.#{app.url_segment}.mtnsat.io"
67
+ [ "#{@environment.id}.#{app.url_segment}.mtnsat.io",
68
+ "#{@environment.id}.#{app.url_segment}.mtnsatcloud.com" ]
63
69
  else
64
- "#{app.url_segment}.mtnsat.io"
70
+ [ "#{app.url_segment}.mtnsat.io" ]
65
71
  end
66
72
  end
67
73
 
68
74
  def active_urls(app)
69
- [ dns_name(app), agnostic_dns_name(app) ] + @additional_mappings
75
+ dns_names(app) + agnostic_dns_names(app) + @additional_mappings
70
76
  end
71
77
 
72
78
  def inactive_urls(app)
data/lib/conan/version.rb CHANGED
@@ -1,3 +1,3 @@
1
1
  module Conan
2
- VERSION = "0.1.17"
2
+ VERSION = "0.1.18"
3
3
  end
metadata CHANGED
@@ -1,7 +1,7 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: conan_deploy_stackato3
3
3
  version: !ruby/object:Gem::Version
4
- version: 0.1.17
4
+ version: 0.1.18
5
5
  platform: ruby
6
6
  authors:
7
7
  - Mike Reardon
@@ -9,7 +9,7 @@ authors:
9
9
  autorequire:
10
10
  bindir: bin
11
11
  cert_chain: []
12
- date: 2015-01-30 00:00:00.000000000 Z
12
+ date: 2015-02-13 00:00:00.000000000 Z
13
13
  dependencies:
14
14
  - !ruby/object:Gem::Dependency
15
15
  name: daphne_util