vagrant-openshift 1.0.12 → 1.0.13

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.
Files changed (58) hide show
  1. checksums.yaml +4 -4
  2. data/.gitignore +1 -0
  3. data/README.asciidoc +5 -3
  4. data/lib/vagrant-openshift/action/build_openshift3.rb +30 -5
  5. data/lib/vagrant-openshift/action/{install_rhc.rb → build_openshift3_base_images.rb} +13 -11
  6. data/lib/vagrant-openshift/action/{run_openshift2_tests.rb → build_sti.rb} +28 -11
  7. data/lib/vagrant-openshift/action/clean.rb +1 -4
  8. data/lib/vagrant-openshift/action/clean_network_setup.rb +1 -1
  9. data/lib/vagrant-openshift/action/download_artifacts_openshift3.rb +4 -1
  10. data/lib/vagrant-openshift/action/{download_artifacts_openshift2.rb → download_artifacts_sti.rb} +3 -11
  11. data/lib/vagrant-openshift/action/generate_template.rb +38 -40
  12. data/lib/vagrant-openshift/action/install_openshift3.rb +5 -16
  13. data/lib/vagrant-openshift/action/{build_openshift2.rb → install_openshift3_asset_dependencies.rb} +17 -5
  14. data/lib/vagrant-openshift/action/install_openshift3_base_dependencies.rb +20 -5
  15. data/lib/vagrant-openshift/action/{local_openshift2_checkout.rb → push_openshift3_release.rb} +14 -14
  16. data/lib/vagrant-openshift/action/run_openshift3_tests.rb +38 -14
  17. data/lib/vagrant-openshift/action/run_sti_tests.rb +64 -0
  18. data/lib/vagrant-openshift/action.rb +44 -83
  19. data/lib/vagrant-openshift/command/build_openshift3.rb +9 -0
  20. data/lib/vagrant-openshift/command/{build_openshift2_base.rb → build_openshift3_base_images.rb} +5 -5
  21. data/lib/vagrant-openshift/command/{build_openshift3_infrastructure_images.rb → build_sti.rb} +10 -12
  22. data/lib/vagrant-openshift/command/checkout_repositories.rb +1 -1
  23. data/lib/vagrant-openshift/command/{install_rhc.rb → install_openshift3_assets_base.rb} +5 -5
  24. data/lib/vagrant-openshift/command/local_openshift3_setup.rb +1 -1
  25. data/lib/vagrant-openshift/command/openshift_init.rb +4 -4
  26. data/lib/vagrant-openshift/command/push_openshift3_release.rb +57 -0
  27. data/lib/vagrant-openshift/command/repo_sync_openshift3.rb +1 -13
  28. data/lib/vagrant-openshift/command/{repo_sync_openshift2.rb → repo_sync_sti.rb} +11 -19
  29. data/lib/vagrant-openshift/command/test_openshift3.rb +8 -0
  30. data/lib/vagrant-openshift/command/test_openshift3_image.rb +8 -17
  31. data/lib/vagrant-openshift/command/test_sti.rb +59 -0
  32. data/lib/vagrant-openshift/config.rb +2 -14
  33. data/lib/vagrant-openshift/constants.rb +3 -67
  34. data/lib/vagrant-openshift/helper/command_helper.rb +0 -3
  35. data/lib/vagrant-openshift/plugin.rb +24 -29
  36. data/lib/vagrant-openshift/provisioner.rb +5 -37
  37. data/lib/vagrant-openshift/templates/builder/Rakefile +0 -205
  38. data/lib/vagrant-openshift/templates/command/init-openshift/box_info.yaml +34 -49
  39. data/lib/vagrant-openshift/version.rb +1 -1
  40. metadata +33 -48
  41. data/lib/vagrant-openshift/action/build_openshift3_images.rb +0 -54
  42. data/lib/vagrant-openshift/action/build_openshift3_infrastructure_images.rb +0 -50
  43. data/lib/vagrant-openshift/action/checkout_openshift2_tests.rb +0 -57
  44. data/lib/vagrant-openshift/action/create_openshift2_puppet_file.rb +0 -84
  45. data/lib/vagrant-openshift/action/create_openshift2_test_users.rb +0 -36
  46. data/lib/vagrant-openshift/action/idle_all_gears_openshift2.rb +0 -36
  47. data/lib/vagrant-openshift/action/install_openshift2_base_dependencies.rb +0 -50
  48. data/lib/vagrant-openshift/action/install_openshift2_build_dependencies.rb +0 -48
  49. data/lib/vagrant-openshift/action/preserve_mcollective_logs.rb +0 -48
  50. data/lib/vagrant-openshift/action/setup_builder_files.rb +0 -57
  51. data/lib/vagrant-openshift/action/uninstall_openshift2_rpms.rb +0 -37
  52. data/lib/vagrant-openshift/command/build_openshift3_images.rb +0 -68
  53. data/lib/vagrant-openshift/command/local_openshift2_setup.rb +0 -62
  54. data/lib/vagrant-openshift/command/test_openshift2.rb +0 -108
  55. data/lib/vagrant-openshift/templates/builder/lib/rpm.rb +0 -248
  56. data/lib/vagrant-openshift/templates/builder/lib/test.rb +0 -432
  57. data/lib/vagrant-openshift/templates/builder/yum-listbuilddep +0 -124
  58. data/lib/vagrant-openshift/templates/command/init-openshift/Vagrantfile.erb +0 -171
data/lib/vagrant-openshift/templates/command/init-openshift/box_info.yaml CHANGED
@@ -1,54 +1,48 @@
1
1
  ---
2
- :centos6:
2
+ :centos7:
3
3
  :os:
4
4
  :virtualbox:
5
- :box_name: centos_65_virtualbox_base
6
- :box_url: http://mirror.openshift.com/pub/vagrant/boxes/centos_65_virtualbox_base.box
5
+ :box_name: centos_7_virtualbox_base
6
+ :box_url: http://mirror.openshift.com/pub/vagrant/boxes/centos_7_virtualbox_base.box
7
7
  :vmware:
8
- :box_name: centos_65_vmware_base
9
- :box_url: http://mirror.openshift.com/pub/vagrant/boxes/centos_65_vmware_base.box
8
+ :box_name: n/a
9
+ :box_url: n/a
10
10
  :aws:
11
- :ami: ami-8f9d81e6
11
+ :ami: <AMI_ID>
12
12
  :ami_region: us-east-1
13
- :ssh_user: root
14
- :machine_name: origin-centos-65-base
13
+ :ssh_user: centos
14
+ :machine_name: origin-centos-7-base
15
15
  :ebs_volume_size: 25
16
- :openstack:
17
- :image: centos-6.5-20140117.0.x86_64
18
- :ssh_username: cloud-user
16
+ :ami_tag_prefix: openshift-centos7_
19
17
  :deps:
20
18
  :virtualbox:
21
- :box_name: centos_65_virtualbox_deps
22
- :box_url: http://mirror.openshift.com/pub/vagrant/boxes/centos_65_virtualbox_deps.box
19
+ :box_name: centos_7_virtualbox_deps
20
+ :box_url: http://mirror.openshift.com/pub/vagrant/boxes/centos_7_virtualbox_deps.box
23
21
  :vmware:
24
- :box_name: centos_65_vmware_deps
25
- :box_url: http://mirror.openshift.com/pub/vagrant/boxes/centos_65_vmware_deps.box
22
+ :box_name: n/a
23
+ :box_url: n/a
26
24
  :aws:
27
- :ami: ami-100ec478
28
- :ami_tag_prefix: origin-centos-65-deps_
25
+ :ami: <AMI_ID>
26
+ :ami_tag_prefix: origin-centos-7-deps_
29
27
  :ami_region: us-east-1
30
- :ssh_user: root
31
- :machine_name: origin-centos-65-deps
28
+ :ssh_user: centos
29
+ :machine_name: origin-centos-7-deps
32
30
  :ebs_volume_size: 25
33
- :openstack:
34
- :image: n/a
35
- :ssh_username: cloud-user
31
+ :ami_tag_prefix: devenv-centos7-base_
36
32
  :inst:
37
33
  :virtualbox:
38
- :box_name: n/a
39
- :box_url: n/a
34
+ :box_name: centos_7_virtualbox_inst
35
+ :box_url: http://mirror.openshift.com/pub/vagrant/boxes/centos_7_virtualbox_inst.box
40
36
  :vmware:
41
37
  :box_name: n/a
42
38
  :box_url: n/a
43
39
  :aws:
44
40
  :ami: <AMI_ID>
45
41
  :ami_region: us-east-1
46
- :ssh_user: root
42
+ :ssh_user: centos
47
43
  :machine_name: <AMI_NAME>
48
44
  :ebs_volume_size: 25
49
- :openstack:
50
- :image: n/a
51
- :ssh_username: cloud-user
45
+ :ami_tag_prefix: devenv-centos7_
52
46
  :fedora:
53
47
  :os:
54
48
  :virtualbox:
@@ -57,16 +51,16 @@
57
51
  :vmware:
58
52
  :box_name: fedora_base
59
53
  :box_url: https://mirror.openshift.com/pub/vagrant/boxes/openshift3/fedora_20_vmware_os.box
54
+ :libvirt:
55
+ :box_name: fedora_base
56
+ :box_url: https://mirror.openshift.com/pub/vagrant/boxes/openshift3/fedora_20_libvirt_os.box
60
57
  :aws:
61
- :ami: ami-9c9376f4
58
+ :ami: <AMI_ID>
62
59
  :ami_region: us-east-1
63
60
  :ssh_user: fedora
64
61
  :machine_name: openshift-fedora
65
62
  :ebs_volume_size: 25
66
63
  :ami_tag_prefix: openshift-fedora_
67
- :openstack:
68
- :image: "Fedora 20 official release"
69
- :ssh_username: fedora
70
64
  :deps:
71
65
  :virtualbox:
72
66
  :box_name: fedora_deps
@@ -74,16 +68,16 @@
74
68
  :vmware:
75
69
  :box_name: fedora_deps
76
70
  :box_url: https://mirror.openshift.com/pub/vagrant/boxes/openshift3/fedora_20_vmware_deps.box
71
+ :libvirt:
72
+ :box_name: fedora_deps
73
+ :box_url: https://mirror.openshift.com/pub/vagrant/boxes/openshift3/fedora_20_libvirt_deps.box
77
74
  :aws:
78
- :ami: ami-a8a94fc0
75
+ :ami: <AMI_ID>
79
76
  :ami_region: us-east-1
80
77
  :ssh_user: fedora
81
78
  :machine_name: devenv-fedora-base
82
79
  :ebs_volume_size: 25
83
80
  :ami_tag_prefix: devenv-fedora-base_
84
- :openstack:
85
- :image: n/a
86
- :ssh_username: fedora
87
81
  :inst:
88
82
  :virtualbox:
89
83
  :box_name: fedora_inst
@@ -91,6 +85,9 @@
91
85
  :vmware:
92
86
  :box_name: fedora_inst
93
87
  :box_url: https://mirror.openshift.com/pub/vagrant/boxes/openshift3/fedora_20_vmware_inst.box
88
+ :libvirt:
89
+ :box_name: fedora_inst
90
+ :box_url: https://mirror.openshift.com/pub/vagrant/boxes/openshift3/fedora_20_libvirt_inst.box
94
91
  :aws:
95
92
  :ami: <AMI_ID>
96
93
  :ami_region: us-east-1
@@ -98,10 +95,7 @@
98
95
  :machine_name: <AMI_NAME>
99
96
  :ebs_volume_size: 25
100
97
  :ami_tag_prefix: devenv-fedora_
101
- :openstack:
102
- :image: n/a
103
- :ssh_username: fedora
104
- :rhel6:
98
+ :rhel7:
105
99
  :os:
106
100
  :virtualbox:
107
101
  :box_name: n/a
@@ -115,9 +109,6 @@
115
109
  :ssh_user: root
116
110
  :machine_name: <AMI_NAME>
117
111
  :ebs_volume_size: 25
118
- :openstack:
119
- :image: rhel-guest-image-6.5-20140603.0
120
- :ssh_username: cloud-user
121
112
  :deps:
122
113
  :virtualbox:
123
114
  :box_name: n/a
@@ -131,9 +122,6 @@
131
122
  :ssh_user: root
132
123
  :machine_name: <AMI_NAME>
133
124
  :ebs_volume_size: 25
134
- :openstack:
135
- :image: n/a
136
- :ssh_username: cloud-user
137
125
  :inst:
138
126
  :virtualbox:
139
127
  :box_name: n/a
@@ -147,6 +135,3 @@
147
135
  :ssh_user: root
148
136
  :machine_name: <AMI_NAME>
149
137
  :ebs_volume_size: 25
150
- :openstack:
151
- :image: n/a
152
- :ssh_username: cloud-user
data/lib/vagrant-openshift/version.rb CHANGED
@@ -16,6 +16,6 @@
16
16
 
17
17
  module Vagrant
18
18
  module Openshift
19
- VERSION = "1.0.12"
19
+ VERSION = "1.0.13"
20
20
  end
21
21
  end
metadata CHANGED
@@ -1,111 +1,111 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: vagrant-openshift
3
3
  version: !ruby/object:Gem::Version
4
- version: 1.0.12
4
+ version: 1.0.13
5
5
  platform: ruby
6
6
  authors:
7
7
  - Red Hat
8
8
  autorequire:
9
9
  bindir: bin
10
10
  cert_chain: []
11
- date: 2014-11-05 00:00:00.000000000 Z
11
+ date: 2015-01-27 00:00:00.000000000 Z
12
12
  dependencies:
13
13
  - !ruby/object:Gem::Dependency
14
14
  name: rake
15
15
  requirement: !ruby/object:Gem::Requirement
16
16
  requirements:
17
- - - '>='
17
+ - - ">="
18
18
  - !ruby/object:Gem::Version
19
19
  version: '0'
20
20
  type: :development
21
21
  prerelease: false
22
22
  version_requirements: !ruby/object:Gem::Requirement
23
23
  requirements:
24
- - - '>='
24
+ - - ">="
25
25
  - !ruby/object:Gem::Version
26
26
  version: '0'
27
27
  - !ruby/object:Gem::Dependency
28
28
  name: thor
29
29
  requirement: !ruby/object:Gem::Requirement
30
30
  requirements:
31
- - - '>='
31
+ - - ">="
32
32
  - !ruby/object:Gem::Version
33
33
  version: '0'
34
34
  type: :development
35
35
  prerelease: false
36
36
  version_requirements: !ruby/object:Gem::Requirement
37
37
  requirements:
38
- - - '>='
38
+ - - ">="
39
39
  - !ruby/object:Gem::Version
40
40
  version: '0'
41
41
  - !ruby/object:Gem::Dependency
42
42
  name: pry
43
43
  requirement: !ruby/object:Gem::Requirement
44
44
  requirements:
45
- - - '>='
45
+ - - ">="
46
46
  - !ruby/object:Gem::Version
47
47
  version: '0'
48
48
  type: :runtime
49
49
  prerelease: false
50
50
  version_requirements: !ruby/object:Gem::Requirement
51
51
  requirements:
52
- - - '>='
52
+ - - ">="
53
53
  - !ruby/object:Gem::Version
54
54
  version: '0'
55
55
  - !ruby/object:Gem::Dependency
56
56
  name: fog
57
57
  requirement: !ruby/object:Gem::Requirement
58
58
  requirements:
59
- - - '>='
59
+ - - ">="
60
60
  - !ruby/object:Gem::Version
61
61
  version: '0'
62
62
  type: :runtime
63
63
  prerelease: false
64
64
  version_requirements: !ruby/object:Gem::Requirement
65
65
  requirements:
66
- - - '>='
66
+ - - ">="
67
67
  - !ruby/object:Gem::Version
68
68
  version: '0'
69
69
  - !ruby/object:Gem::Dependency
70
70
  name: unf
71
71
  requirement: !ruby/object:Gem::Requirement
72
72
  requirements:
73
- - - '>='
73
+ - - ">="
74
74
  - !ruby/object:Gem::Version
75
75
  version: '0'
76
76
  type: :runtime
77
77
  prerelease: false
78
78
  version_requirements: !ruby/object:Gem::Requirement
79
79
  requirements:
80
- - - '>='
80
+ - - ">="
81
81
  - !ruby/object:Gem::Version
82
82
  version: '0'
83
83
  - !ruby/object:Gem::Dependency
84
84
  name: xml-simple
85
85
  requirement: !ruby/object:Gem::Requirement
86
86
  requirements:
87
- - - '>='
87
+ - - ">="
88
88
  - !ruby/object:Gem::Version
89
89
  version: '0'
90
90
  type: :runtime
91
91
  prerelease: false
92
92
  version_requirements: !ruby/object:Gem::Requirement
93
93
  requirements:
94
- - - '>='
94
+ - - ">="
95
95
  - !ruby/object:Gem::Version
96
96
  version: '0'
97
97
  - !ruby/object:Gem::Dependency
98
98
  name: vagrant-aws
99
99
  requirement: !ruby/object:Gem::Requirement
100
100
  requirements:
101
- - - '>='
101
+ - - ">="
102
102
  - !ruby/object:Gem::Version
103
103
  version: '0'
104
104
  type: :runtime
105
105
  prerelease: false
106
106
  version_requirements: !ruby/object:Gem::Requirement
107
107
  requirements:
108
- - - '>='
108
+ - - ">="
109
109
  - !ruby/object:Gem::Version
110
110
  version: '0'
111
111
  description: Vagrant plugin to manage OpenShift Origin environments
@@ -114,76 +114,65 @@ executables: []
114
114
  extensions: []
115
115
  extra_rdoc_files: []
116
116
  files:
117
- - .gitattributes
118
- - .gitignore
117
+ - ".gitattributes"
118
+ - ".gitignore"
119
119
  - Gemfile
120
120
  - LICENSE.txt
121
121
  - README.asciidoc
122
122
  - Rakefile
123
123
  - lib/vagrant-openshift.rb
124
124
  - lib/vagrant-openshift/action.rb
125
- - lib/vagrant-openshift/action/build_openshift2.rb
126
125
  - lib/vagrant-openshift/action/build_openshift3.rb
127
- - lib/vagrant-openshift/action/build_openshift3_images.rb
128
- - lib/vagrant-openshift/action/build_openshift3_infrastructure_images.rb
129
- - lib/vagrant-openshift/action/checkout_openshift2_tests.rb
126
+ - lib/vagrant-openshift/action/build_openshift3_base_images.rb
127
+ - lib/vagrant-openshift/action/build_sti.rb
130
128
  - lib/vagrant-openshift/action/checkout_repositories.rb
131
129
  - lib/vagrant-openshift/action/clean.rb
132
130
  - lib/vagrant-openshift/action/clean_network_setup.rb
133
131
  - lib/vagrant-openshift/action/clone_upstream_repositories.rb
134
132
  - lib/vagrant-openshift/action/create_ami.rb
135
133
  - lib/vagrant-openshift/action/create_bare_repo_placeholders.rb
136
- - lib/vagrant-openshift/action/create_openshift2_puppet_file.rb
137
- - lib/vagrant-openshift/action/create_openshift2_test_users.rb
138
134
  - lib/vagrant-openshift/action/create_yum_repositories.rb
139
- - lib/vagrant-openshift/action/download_artifacts_openshift2.rb
140
135
  - lib/vagrant-openshift/action/download_artifacts_openshift3.rb
136
+ - lib/vagrant-openshift/action/download_artifacts_sti.rb
141
137
  - lib/vagrant-openshift/action/generate_template.rb
142
- - lib/vagrant-openshift/action/idle_all_gears_openshift2.rb
143
- - lib/vagrant-openshift/action/install_openshift2_base_dependencies.rb
144
- - lib/vagrant-openshift/action/install_openshift2_build_dependencies.rb
145
138
  - lib/vagrant-openshift/action/install_openshift3.rb
139
+ - lib/vagrant-openshift/action/install_openshift3_asset_dependencies.rb
146
140
  - lib/vagrant-openshift/action/install_openshift3_base_dependencies.rb
147
141
  - lib/vagrant-openshift/action/install_openshift3_images.rb
148
- - lib/vagrant-openshift/action/install_rhc.rb
149
- - lib/vagrant-openshift/action/local_openshift2_checkout.rb
150
142
  - lib/vagrant-openshift/action/local_openshift3_checkout.rb
151
143
  - lib/vagrant-openshift/action/modify_ami.rb
152
144
  - lib/vagrant-openshift/action/modify_instance.rb
153
145
  - lib/vagrant-openshift/action/prepare_ssh_config.rb
154
- - lib/vagrant-openshift/action/preserve_mcollective_logs.rb
155
- - lib/vagrant-openshift/action/run_openshift2_tests.rb
146
+ - lib/vagrant-openshift/action/push_openshift3_release.rb
156
147
  - lib/vagrant-openshift/action/run_openshift3_tests.rb
148
+ - lib/vagrant-openshift/action/run_sti_tests.rb
157
149
  - lib/vagrant-openshift/action/set_host_name.rb
158
150
  - lib/vagrant-openshift/action/setup_bind_dns_key.rb
159
151
  - lib/vagrant-openshift/action/setup_bind_host.rb
160
- - lib/vagrant-openshift/action/setup_builder_files.rb
161
152
  - lib/vagrant-openshift/action/sync_local_repository.rb
162
153
  - lib/vagrant-openshift/action/sync_upstream_repository.rb
163
154
  - lib/vagrant-openshift/action/test_exit_code.rb
164
155
  - lib/vagrant-openshift/action/try_restart_openshift3.rb
165
- - lib/vagrant-openshift/action/uninstall_openshift2_rpms.rb
166
156
  - lib/vagrant-openshift/action/yum_update.rb
167
- - lib/vagrant-openshift/command/build_openshift2_base.rb
168
157
  - lib/vagrant-openshift/command/build_openshift3.rb
169
158
  - lib/vagrant-openshift/command/build_openshift3_base.rb
170
- - lib/vagrant-openshift/command/build_openshift3_images.rb
171
- - lib/vagrant-openshift/command/build_openshift3_infrastructure_images.rb
159
+ - lib/vagrant-openshift/command/build_openshift3_base_images.rb
160
+ - lib/vagrant-openshift/command/build_sti.rb
172
161
  - lib/vagrant-openshift/command/checkout_repositories.rb
173
162
  - lib/vagrant-openshift/command/clone_upstream_repositories.rb
174
163
  - lib/vagrant-openshift/command/create_ami.rb
175
164
  - lib/vagrant-openshift/command/install_openshift3.rb
176
- - lib/vagrant-openshift/command/install_rhc.rb
177
- - lib/vagrant-openshift/command/local_openshift2_setup.rb
165
+ - lib/vagrant-openshift/command/install_openshift3_assets_base.rb
178
166
  - lib/vagrant-openshift/command/local_openshift3_setup.rb
179
167
  - lib/vagrant-openshift/command/modify_ami.rb
180
168
  - lib/vagrant-openshift/command/modify_instance.rb
181
169
  - lib/vagrant-openshift/command/openshift_init.rb
182
- - lib/vagrant-openshift/command/repo_sync_openshift2.rb
170
+ - lib/vagrant-openshift/command/push_openshift3_release.rb
183
171
  - lib/vagrant-openshift/command/repo_sync_openshift3.rb
184
- - lib/vagrant-openshift/command/test_openshift2.rb
172
+ - lib/vagrant-openshift/command/repo_sync_sti.rb
185
173
  - lib/vagrant-openshift/command/test_openshift3.rb
186
174
  - lib/vagrant-openshift/command/test_openshift3_image.rb
175
+ - lib/vagrant-openshift/command/test_sti.rb
187
176
  - lib/vagrant-openshift/command/try_restart_openshift3.rb
188
177
  - lib/vagrant-openshift/config.rb
189
178
  - lib/vagrant-openshift/constants.rb
@@ -192,10 +181,6 @@ files:
192
181
  - lib/vagrant-openshift/provisioner.rb
193
182
  - lib/vagrant-openshift/templates/builder/Rakefile
194
183
  - lib/vagrant-openshift/templates/builder/lib/.gitkeep
195
- - lib/vagrant-openshift/templates/builder/lib/rpm.rb
196
- - lib/vagrant-openshift/templates/builder/lib/test.rb
197
- - lib/vagrant-openshift/templates/builder/yum-listbuilddep
198
- - lib/vagrant-openshift/templates/command/init-openshift/Vagrantfile.erb
199
184
  - lib/vagrant-openshift/templates/command/init-openshift/box_info.yaml
200
185
  - lib/vagrant-openshift/version.rb
201
186
  - vagrant-openshift.gemspec
@@ -208,17 +193,17 @@ require_paths:
208
193
  - lib
209
194
  required_ruby_version: !ruby/object:Gem::Requirement
210
195
  requirements:
211
- - - '>='
196
+ - - ">="
212
197
  - !ruby/object:Gem::Version
213
198
  version: '0'
214
199
  required_rubygems_version: !ruby/object:Gem::Requirement
215
200
  requirements:
216
- - - '>='
201
+ - - ">="
217
202
  - !ruby/object:Gem::Version
218
203
  version: '0'
219
204
  requirements: []
220
205
  rubyforge_project:
221
- rubygems_version: 2.1.11
206
+ rubygems_version: 2.2.2
222
207
  signing_key:
223
208
  specification_version: 4
224
209
  summary: Vagrant plugin to manage OpenShift Origin environments
data/lib/vagrant-openshift/action/build_openshift3_images.rb DELETED
@@ -1,54 +0,0 @@
1
- #--
2
- # Copyright 2014 Red Hat, Inc.
3
- #
4
- # Licensed under the Apache License, Version 2.0 (the "License");
5
- # you may not use this file except in compliance with the License.
6
- # You may obtain a copy of the License at
7
- #
8
- # http://www.apache.org/licenses/LICENSE-2.0
9
- #
10
- # Unless required by applicable law or agreed to in writing, software
11
- # distributed under the License is distributed on an "AS IS" BASIS,
12
- # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
13
- # See the License for the specific language governing permissions and
14
- # limitations under the License.
15
- #++
16
-
17
- module Vagrant
18
- module Openshift
19
- module Action
20
- class BuildOpenshift3Images
21
- include CommandHelper
22
-
23
- def initialize(app, env, options)
24
- @app = app
25
- @env = env
26
- @options = options
27
- end
28
-
29
- def call(env)
30
- # FIXME: Measure what would be the appropriate timeout here as the
31
- # docker build command can take quite a long time...
32
- #
33
- @options[:openshift3_images].each do |openshift3_image, _|
34
- docker_image_name = "openshift/#{openshift3_image}"
35
- docker_file_path = "#{Constants.build_dir}#{openshift3_image}"
36
- build_cmd = %{
37
- echo "Building #{docker_image_name} image"
38
- pushd #{docker_file_path}
39
- docker build --rm #{@options[:force] ? "--no-cache" : ""} -t #{docker_image_name} .
40
- popd
41
- }
42
- if @options[:force]
43
- sudo(env[:machine], build_cmd, { :timeout => 60*20, :verbose => false })
44
- else
45
- sudo(env[:machine], sync_bash_command(openshift3_image, build_cmd), { :timeout => 60*20, :verbose => false })
46
- end
47
- end
48
- @app.call(env)
49
- end
50
-
51
- end
52
- end
53
- end
54
- end
data/lib/vagrant-openshift/action/build_openshift3_infrastructure_images.rb DELETED
@@ -1,50 +0,0 @@
1
- #--
2
- # Copyright 2014 Red Hat, Inc.
3
- #
4
- # Licensed under the Apache License, Version 2.0 (the "License");
5
- # you may not use this file except in compliance with the License.
6
- # You may obtain a copy of the License at
7
- #
8
- # http://www.apache.org/licenses/LICENSE-2.0
9
- #
10
- # Unless required by applicable law or agreed to in writing, software
11
- # distributed under the License is distributed on an "AS IS" BASIS,
12
- # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
13
- # See the License for the specific language governing permissions and
14
- # limitations under the License.
15
- #++
16
-
17
- module Vagrant
18
- module Openshift
19
- module Action
20
- class BuildOpenshift3InfrastructureImages
21
- include CommandHelper
22
-
23
- def initialize(app, env, options)
24
- @app = app
25
- @env = env
26
- @options = options
27
- end
28
-
29
- def call(env)
30
- # FIXME: Measure what would be the appropriate timeout here as the
31
- # docker build command can take quite a long time...
32
- #
33
- @options[:openshift3_infrastructure_images].each do |openshift3_image, _|
34
- docker_image_name = "openshift/#{openshift3_image}"
35
- docker_file_path = "#{Constants.build_dir}#{Vagrant::Openshift::Constants.openshift3_infrastructure_images[openshift3_image]}"
36
- build_cmd = %{
37
- echo "Building #{docker_image_name} image"
38
- pushd #{docker_file_path}
39
- docker build --rm #{@options[:force] ? "--no-cache" : ""} -t #{docker_image_name} .
40
- popd
41
- }
42
- sudo(env[:machine], build_cmd, { :timeout => 60*20, :verbose => false })
43
- end
44
- @app.call(env)
45
- end
46
-
47
- end
48
- end
49
- end
50
- end
data/lib/vagrant-openshift/action/checkout_openshift2_tests.rb DELETED
@@ -1,57 +0,0 @@
1
- #--
2
- # Copyright 2013 Red Hat, Inc.
3
- #
4
- # Licensed under the Apache License, Version 2.0 (the "License");
5
- # you may not use this file except in compliance with the License.
6
- # You may obtain a copy of the License at
7
- #
8
- # http://www.apache.org/licenses/LICENSE-2.0
9
- #
10
- # Unless required by applicable law or agreed to in writing, software
11
- # distributed under the License is distributed on an "AS IS" BASIS,
12
- # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
13
- # See the License for the specific language governing permissions and
14
- # limitations under the License.
15
- #++
16
-
17
- module Vagrant
18
- module Openshift
19
- module Action
20
- class CheckoutOpenshift2Tests
21
- include CommandHelper
22
-
23
- def initialize(app, env)
24
- @app = app
25
- @env = env
26
- end
27
-
28
- def call(env)
29
- is_fedora = env[:machine].communicate.test("test -e /etc/fedora-release")
30
- sudo env[:machine], "cd #{Constants.build_dir}/builder; #{scl_wrapper(is_fedora,'rake checkout_tests')}"
31
-
32
- sudo env[:machine], "mkdir -p /var/www/html/binaryartifacts"
33
- sudo env[:machine], "restorecon /var/www/html/binaryartifacts"
34
-
35
- remote_write(env[:machine], "/etc/httpd/conf.d/binaryartifacts.conf", "root:root", "0644") {
36
- %{#
37
- # This configuration is to host the binary artifacts for use during testing.
38
- # Currently the apache only hosts on https and with a cert that is not signed
39
- # so curl requires -k. To get around this in testing just host it over non-ssl
40
- # and test test copies the tgz file to the /var/www/html/binaryartifacts folder.
41
- #
42
-
43
- Listen 81
44
-
45
- <VirtualHost *:81>
46
- ServerName localhost
47
- ServerAdmin root@localhost
48
- DocumentRoot /var/www/html/binaryartifacts
49
- </VirtualHost>}}
50
- sudo env[:machine], "restorecon -v /etc/httpd/conf.d/binaryartifacts.conf"
51
- sudo env[:machine], "service httpd restart"
52
- @app.call(env)
53
- end
54
- end
55
- end
56
- end
57
- end
data/lib/vagrant-openshift/action/create_openshift2_puppet_file.rb DELETED
@@ -1,84 +0,0 @@
1
- #--
2
- # Copyright 2013 Red Hat, Inc.
3
- #
4
- # Licensed under the Apache License, Version 2.0 (the "License");
5
- # you may not use this file except in compliance with the License.
6
- # You may obtain a copy of the License at
7
- #
8
- # http://www.apache.org/licenses/LICENSE-2.0
9
- #
10
- # Unless required by applicable law or agreed to in writing, software
11
- # distributed under the License is distributed on an "AS IS" BASIS,
12
- # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
13
- # See the License for the specific language governing permissions and
14
- # limitations under the License.
15
- #++
16
-
17
- module Vagrant
18
- module Openshift
19
- module Action
20
- class CreateOpenshift2PuppetFile
21
- include CommandHelper
22
-
23
- def initialize(app, env)
24
- @app = app
25
- @env = env
26
- end
27
-
28
- def call(env)
29
- hostname = env[:machine].config.vm.hostname
30
- domain = env[:machine].config.openshift.cloud_domain
31
- key,_ = sudo(env[:machine], "cat /var/named/K#{domain}.*.key")
32
- key = key.first.strip.split(' ')
33
- key = "#{key[6]}#{key[7]}"
34
-
35
- links,_ = sudo(env[:machine], "ip link")
36
- links = links.map!{ |l| l.split("\n") }.flatten
37
-
38
- links.map! do |link|
39
- m = link.match(/[0-9]+: ([a-z0-9]+):/)
40
- m.nil?? "lo" : m[1]
41
- end
42
- links.delete "lo"
43
-
44
- remote_write(env[:machine], "#{Constants.build_dir}/configure_origin.pp") {
45
- config = "
46
- class { 'openshift_origin' :
47
- domain => '#{domain}',
48
- broker_hostname => '#{hostname}',
49
- node_hostname => '#{hostname}',
50
- nameserver_hostname => '#{hostname}',
51
- datastore_hostname => '#{hostname}',
52
- msgserver_hostname => '#{hostname}',
53
- openshift_user1 => 'admin',
54
- openshift_password1 => 'admin',
55
- bind_key => '#{key}',
56
- override_install_repo => 'file://#{Constants.build_dir}/origin-rpms',
57
- development_mode => true,
58
- conf_node_external_eth_dev => '#{links.first}',
59
- register_host_with_nameserver => true,
60
- broker_auth_plugin => 'htpasswd',
61
- conf_broker_auth_salt => 'salt salt salt',
62
- conf_broker_multi_haproxy_per_node => true,
63
- conf_valid_gear_sizes => ['small','medium'],
64
- node_frontend_plugins => ['apache-mod-rewrite','nodejs-websocket','haproxy-sni-proxy'],
65
- node_unmanaged_users => ['#{env[:machine].ssh_info[:username]}'],
66
- node_container_plugin => '#{env[:machine].config.openshift.container}',"
67
- env[:machine].config.openshift.advanced_puppet_values.each do |k,v|
68
- config += %{ #{k} => '#{v}',\n}
69
- end
70
- config += "\n repos_base => '#{env[:machine].config.openshift.repos_base}'," unless env[:machine].config.openshift.repos_base.nil?
71
- config += "\n os_repo => '#{env[:machine].config.openshift.os_repo}'," unless env[:machine].config.openshift.os_repo.nil?
72
- config += "\n os_updates_repo => '#{env[:machine].config.openshift.os_updates_repo}'," unless env[:machine].config.openshift.os_updates_repo.nil?
73
- config += "\n jenkins_repo_base => '#{env[:machine].config.openshift.jenkins_repo_base }'," unless env[:machine].config.openshift.jenkins_repo_base.nil?
74
- config += "\n optional_repo => '#{env[:machine].config.openshift.optional_repo}'," unless env[:machine].config.openshift.optional_repo.nil?
75
- config += "\n}\n"
76
- config
77
- }
78
-
79
- @app.call(env)
80
- end
81
- end
82
- end
83
- end
84
- end