vagrant-skytap 0.1.11 → 0.2.0

Sign up to get free protection for your applications and to get access to all the features.
Files changed (342) hide show
  1. checksums.yaml +4 -4
  2. data/.byebug_history +242 -19
  3. data/CHANGELOG.md +9 -0
  4. data/README.md +30 -8
  5. data/Vagrantfile.rej +83 -0
  6. data/_patches-20160112/0 +388 -0
  7. data/_patches-20160112/1 +82 -0
  8. data/_patches-20160112/2 +239 -0
  9. data/_patches-20160112/COMPLETED-ABOVE-THIS-LINE +4 -0
  10. data/_patches-20160112/COMPLETED-BELOW-THIS-LINE +4 -0
  11. data/_patches-20160112/CR-ABOVE-THIS-LINE +4 -0
  12. data/_patches-20160112/CR-BELOW-THIS-LINE +4 -0
  13. data/_patches-20160112/WIP-ABOVE-THIS-LINE +4 -0
  14. data/_patches-20160112/WIP-BELOW-THIS-LINE +4 -0
  15. data/_patches-20160112/acceptance-test-runner +29 -0
  16. data/_patches-20160112/ansible-1 +92 -0
  17. data/_patches-20160112/cache-api-client-in-up +40 -0
  18. data/_patches-20160112/dead-code-in-actions +44 -0
  19. data/_patches-20160112/debug-changes +42 -0
  20. data/_patches-20160112/demo-rails-app +1276 -0
  21. data/_patches-20160112/eng-10166-halt-spec +40 -0
  22. data/_patches-20160112/eng-10256 +527 -0
  23. data/_patches-20160112/eng-10256-2 +162 -0
  24. data/_patches-20160112/eng-10256-ubuntu-testing +88 -0
  25. data/_patches-20160112/eng-10269-test-stuff +87 -0
  26. data/_patches-20160112/eng-10269-wtf +119 -0
  27. data/_patches-20160112/eng-10369 +143 -0
  28. data/_patches-20160112/eng-10369-tmp +60 -0
  29. data/_patches-20160112/eng-10919 +56 -0
  30. data/_patches-20160112/eng-11177-fix-actions-requires +44 -0
  31. data/_patches-20160112/eng-11442 +4 -0
  32. data/_patches-20160112/eng-11616 +403 -0
  33. data/_patches-20160112/eng-11616-2 +67 -0
  34. data/_patches-20160112/eng-11616-actual +184 -0
  35. data/_patches-20160112/eng-11625a +4 -0
  36. data/_patches-20160112/eng-11711 +85 -0
  37. data/_patches-20160112/eng-12232-command-spec +236 -0
  38. data/_patches-20160112/eng-12235 +83 -0
  39. data/_patches-20160112/eng-12235-override-refactor +140 -0
  40. data/_patches-20160112/eng-12240 +103 -0
  41. data/_patches-20160112/eng-12249 +40 -0
  42. data/_patches-20160112/eng-12301 +50 -0
  43. data/_patches-20160112/eng-12843 +95 -0
  44. data/_patches-20160112/env-source +112 -0
  45. data/_patches-20160112/frickin-vagrant-spec +163 -0
  46. data/_patches-20160112/gem-pre-version +14 -0
  47. data/_patches-20160112/gems-old +9 -0
  48. data/_patches-20160112/googles-specs +713 -0
  49. data/_patches-20160112/local-configs-ignore +61 -0
  50. data/_patches-20160112/misc +79 -0
  51. data/_patches-20160112/network-unreachable +31 -0
  52. data/_patches-20160112/new-boxfile +288 -0
  53. data/_patches-20160112/parallelization-maybe +198 -0
  54. data/_patches-20160112/read-state +23 -0
  55. data/_patches-20160112/refactor-to-use-public_address-cap +25 -0
  56. data/_patches-20160112/series +60 -0
  57. data/_patches-20160112/status +12 -0
  58. data/_patches-20160112/test-move-env-data +231 -0
  59. data/_patches-20160112/test-vagrantfile-vm1 +167 -0
  60. data/_patches-20160112/the_version_in_0.1.13.pre1 +598 -0
  61. data/_patches-20160112/vagrant-spec-mock-api +137 -0
  62. data/_patches-20160112/vagrant-vmware-plugin +233 -0
  63. data/_patches-20160112/vagrantfile +403 -0
  64. data/_patches-20160112/vagrantfile-for-acceptance-tests +29 -0
  65. data/_patches-20160112/vagrantfile-for-nick +95 -0
  66. data/_patches-20160112/vagrantfiles-to-forget-what-they-are-for +134 -0
  67. data/_patches-20160112/vm-vanished +42 -0
  68. data/_patches-20160112a/01 +148 -0
  69. data/_patches-20160112a/2 +239 -0
  70. data/_patches-20160112a/COMPLETED-ABOVE-THIS-LINE +4 -0
  71. data/_patches-20160112a/COMPLETED-BELOW-THIS-LINE +4 -0
  72. data/_patches-20160112a/CR-ABOVE-THIS-LINE +4 -0
  73. data/_patches-20160112a/CR-BELOW-THIS-LINE +4 -0
  74. data/_patches-20160112a/WIP-ABOVE-THIS-LINE +4 -0
  75. data/_patches-20160112a/WIP-BELOW-THIS-LINE +4 -0
  76. data/_patches-20160112a/acceptance-test-runner +29 -0
  77. data/_patches-20160112a/ansible-1 +92 -0
  78. data/_patches-20160112a/cache-api-client-in-up +40 -0
  79. data/_patches-20160112a/dead-code-in-actions +44 -0
  80. data/_patches-20160112a/debug-changes +42 -0
  81. data/_patches-20160112a/demo-rails-app +1276 -0
  82. data/_patches-20160112a/eng-10166-halt-spec +40 -0
  83. data/_patches-20160112a/eng-10256-ubuntu-testing +88 -0
  84. data/_patches-20160112a/eng-10269-test-stuff +87 -0
  85. data/_patches-20160112a/eng-10269-wtf +119 -0
  86. data/_patches-20160112a/eng-10369 +143 -0
  87. data/_patches-20160112a/eng-10369-tmp +60 -0
  88. data/_patches-20160112a/eng-10919 +56 -0
  89. data/_patches-20160112a/eng-11177-fix-actions-requires +44 -0
  90. data/_patches-20160112a/eng-11442 +4 -0
  91. data/_patches-20160112a/eng-11616 +403 -0
  92. data/_patches-20160112a/eng-11616-2 +67 -0
  93. data/_patches-20160112a/eng-11616-actual +184 -0
  94. data/_patches-20160112a/eng-11625a +4 -0
  95. data/_patches-20160112a/eng-11711 +85 -0
  96. data/_patches-20160112a/eng-12232-command-spec +236 -0
  97. data/_patches-20160112a/eng-12235 +83 -0
  98. data/_patches-20160112a/eng-12235-override-refactor +140 -0
  99. data/_patches-20160112a/eng-12240 +103 -0
  100. data/_patches-20160112a/eng-12249 +40 -0
  101. data/_patches-20160112a/eng-12301 +50 -0
  102. data/_patches-20160112a/eng-12843 +95 -0
  103. data/_patches-20160112a/env-source +112 -0
  104. data/_patches-20160112a/frickin-vagrant-spec +163 -0
  105. data/_patches-20160112a/gem-pre-version +14 -0
  106. data/_patches-20160112a/gems-old +9 -0
  107. data/_patches-20160112a/googles-specs +713 -0
  108. data/_patches-20160112a/local-configs-ignore +61 -0
  109. data/_patches-20160112a/misc +79 -0
  110. data/_patches-20160112a/network-unreachable +31 -0
  111. data/_patches-20160112a/new-boxfile +288 -0
  112. data/_patches-20160112a/parallelization-maybe +198 -0
  113. data/_patches-20160112a/read-state +23 -0
  114. data/_patches-20160112a/refactor-to-use-public_address-cap +25 -0
  115. data/_patches-20160112a/series +58 -0
  116. data/_patches-20160112a/status +14 -0
  117. data/_patches-20160112a/test-move-env-data +231 -0
  118. data/_patches-20160112a/test-vagrantfile-vm1 +167 -0
  119. data/_patches-20160112a/the_version_in_0.1.13.pre1 +612 -0
  120. data/_patches-20160112a/then-copy-the-newer-files +632 -0
  121. data/_patches-20160112a/vagrant-spec-mock-api +137 -0
  122. data/_patches-20160112a/vagrant-vmware-plugin +233 -0
  123. data/_patches-20160112a/vagrantfile +403 -0
  124. data/_patches-20160112a/vagrantfile-for-acceptance-tests +29 -0
  125. data/_patches-20160112a/vagrantfile-for-nick +95 -0
  126. data/_patches-20160112a/vagrantfiles-to-forget-what-they-are-for +134 -0
  127. data/_patches-20160112a/vm-vanished +42 -0
  128. data/_patches-20160113/COMPLETED-ABOVE-THIS-LINE +4 -0
  129. data/_patches-20160113/COMPLETED-BELOW-THIS-LINE +4 -0
  130. data/_patches-20160113/CR-ABOVE-THIS-LINE +4 -0
  131. data/_patches-20160113/CR-BELOW-THIS-LINE +4 -0
  132. data/_patches-20160113/WIP-ABOVE-THIS-LINE +4 -0
  133. data/_patches-20160113/WIP-BELOW-THIS-LINE +4 -0
  134. data/_patches-20160113/acceptance-test-runner +29 -0
  135. data/_patches-20160113/ansible-1 +92 -0
  136. data/_patches-20160113/cache-api-client-in-up +40 -0
  137. data/_patches-20160113/dead-code-in-actions +44 -0
  138. data/_patches-20160113/debug-changes +55 -0
  139. data/_patches-20160113/demo-rails-app +1276 -0
  140. data/_patches-20160113/eng-10166-halt-spec +40 -0
  141. data/_patches-20160113/eng-10256 +543 -0
  142. data/_patches-20160113/eng-10256-ubuntu-testing +88 -0
  143. data/_patches-20160113/eng-10269-test-stuff +87 -0
  144. data/_patches-20160113/eng-10269-wtf +119 -0
  145. data/_patches-20160113/eng-10369 +143 -0
  146. data/_patches-20160113/eng-10369-tmp +60 -0
  147. data/_patches-20160113/eng-10919 +56 -0
  148. data/_patches-20160113/eng-11177-fix-actions-requires +44 -0
  149. data/_patches-20160113/eng-11442 +4 -0
  150. data/_patches-20160113/eng-11616 +403 -0
  151. data/_patches-20160113/eng-11616-2 +67 -0
  152. data/_patches-20160113/eng-11616-actual +184 -0
  153. data/_patches-20160113/eng-11625a +4 -0
  154. data/_patches-20160113/eng-11711 +85 -0
  155. data/_patches-20160113/eng-12232-command-spec +236 -0
  156. data/_patches-20160113/eng-12235 +83 -0
  157. data/_patches-20160113/eng-12235-override-refactor +140 -0
  158. data/_patches-20160113/eng-12240 +103 -0
  159. data/_patches-20160113/eng-12249 +40 -0
  160. data/_patches-20160113/eng-12301 +50 -0
  161. data/_patches-20160113/eng-12720 +47 -0
  162. data/_patches-20160113/eng-12843 +95 -0
  163. data/_patches-20160113/env-source +112 -0
  164. data/_patches-20160113/frickin-vagrant-spec +163 -0
  165. data/_patches-20160113/gem-pre-version +14 -0
  166. data/_patches-20160113/gems-old +9 -0
  167. data/_patches-20160113/googles-specs +713 -0
  168. data/_patches-20160113/local-configs-ignore +61 -0
  169. data/_patches-20160113/misc +79 -0
  170. data/_patches-20160113/network-unreachable +31 -0
  171. data/_patches-20160113/new-boxfile +288 -0
  172. data/_patches-20160113/parallelization-maybe +198 -0
  173. data/_patches-20160113/read-state +23 -0
  174. data/_patches-20160113/refactor-to-use-public_address-cap +25 -0
  175. data/_patches-20160113/series +56 -0
  176. data/_patches-20160113/status +14 -0
  177. data/_patches-20160113/test-move-env-data +231 -0
  178. data/_patches-20160113/test-vagrantfile-vm1 +167 -0
  179. data/_patches-20160113/vagrant-spec-mock-api +137 -0
  180. data/_patches-20160113/vagrant-vmware-plugin +233 -0
  181. data/_patches-20160113/vagrantfile +403 -0
  182. data/_patches-20160113/vagrantfile-for-acceptance-tests +29 -0
  183. data/_patches-20160113/vagrantfile-for-nick +95 -0
  184. data/_patches-20160113/vagrantfiles-to-forget-what-they-are-for +134 -0
  185. data/_patches-20160113/vm-vanished +42 -0
  186. data/_patches-20160118/COMPLETED-ABOVE-THIS-LINE +4 -0
  187. data/_patches-20160118/COMPLETED-BELOW-THIS-LINE +4 -0
  188. data/_patches-20160118/CR-ABOVE-THIS-LINE +4 -0
  189. data/_patches-20160118/CR-BELOW-THIS-LINE +4 -0
  190. data/_patches-20160118/WIP-ABOVE-THIS-LINE +4 -0
  191. data/_patches-20160118/WIP-BELOW-THIS-LINE +4 -0
  192. data/_patches-20160118/acceptance-test-runner +29 -0
  193. data/_patches-20160118/ansible-1 +92 -0
  194. data/_patches-20160118/cache-api-client-in-up +40 -0
  195. data/_patches-20160118/dead-code-in-actions +44 -0
  196. data/_patches-20160118/debug-changes +55 -0
  197. data/_patches-20160118/demo-rails-app +1276 -0
  198. data/_patches-20160118/eng-10166-halt-spec +40 -0
  199. data/_patches-20160118/eng-10256 +554 -0
  200. data/_patches-20160118/eng-10256-cr +314 -0
  201. data/_patches-20160118/eng-10256-ubuntu-testing +88 -0
  202. data/_patches-20160118/eng-10269-test-stuff +87 -0
  203. data/_patches-20160118/eng-10269-wtf +119 -0
  204. data/_patches-20160118/eng-10369 +143 -0
  205. data/_patches-20160118/eng-10369-tmp +60 -0
  206. data/_patches-20160118/eng-10919 +56 -0
  207. data/_patches-20160118/eng-11177-fix-actions-requires +44 -0
  208. data/_patches-20160118/eng-11442 +4 -0
  209. data/_patches-20160118/eng-11616 +403 -0
  210. data/_patches-20160118/eng-11616-2 +67 -0
  211. data/_patches-20160118/eng-11616-actual +184 -0
  212. data/_patches-20160118/eng-11625a +4 -0
  213. data/_patches-20160118/eng-11711 +85 -0
  214. data/_patches-20160118/eng-12232-command-spec +236 -0
  215. data/_patches-20160118/eng-12235 +83 -0
  216. data/_patches-20160118/eng-12235-override-refactor +140 -0
  217. data/_patches-20160118/eng-12240 +103 -0
  218. data/_patches-20160118/eng-12249 +40 -0
  219. data/_patches-20160118/eng-12301 +50 -0
  220. data/_patches-20160118/eng-12720 +74 -0
  221. data/_patches-20160118/eng-12843 +95 -0
  222. data/_patches-20160118/eng-13040 +291 -0
  223. data/_patches-20160118/env-source +112 -0
  224. data/_patches-20160118/frickin-vagrant-spec +163 -0
  225. data/_patches-20160118/gem-pre-version +14 -0
  226. data/_patches-20160118/gems-old +9 -0
  227. data/_patches-20160118/googles-specs +713 -0
  228. data/_patches-20160118/local-configs-ignore +61 -0
  229. data/_patches-20160118/misc +79 -0
  230. data/_patches-20160118/network-unreachable +31 -0
  231. data/_patches-20160118/new-boxfile +288 -0
  232. data/_patches-20160118/parallelization-maybe +198 -0
  233. data/_patches-20160118/port-forwarding-processes +87 -0
  234. data/_patches-20160118/read-state +23 -0
  235. data/_patches-20160118/refactor-to-use-public_address-cap +25 -0
  236. data/_patches-20160118/series +59 -0
  237. data/_patches-20160118/status +13 -0
  238. data/_patches-20160118/test-move-env-data +231 -0
  239. data/_patches-20160118/test-vagrantfile-vm1 +167 -0
  240. data/_patches-20160118/vagrant-spec-mock-api +137 -0
  241. data/_patches-20160118/vagrant-vmware-plugin +233 -0
  242. data/_patches-20160118/vagrantfile +403 -0
  243. data/_patches-20160118/vagrantfile-for-acceptance-tests +29 -0
  244. data/_patches-20160118/vagrantfile-for-nick +95 -0
  245. data/_patches-20160118/vagrantfiles-to-forget-what-they-are-for +134 -0
  246. data/_patches-20160118/vm-vanished +42 -0
  247. data/_patches-20160118a/COMPLETED-ABOVE-THIS-LINE +4 -0
  248. data/_patches-20160118a/COMPLETED-BELOW-THIS-LINE +4 -0
  249. data/_patches-20160118a/CR-ABOVE-THIS-LINE +4 -0
  250. data/_patches-20160118a/CR-BELOW-THIS-LINE +4 -0
  251. data/_patches-20160118a/WIP-ABOVE-THIS-LINE +4 -0
  252. data/_patches-20160118a/WIP-BELOW-THIS-LINE +4 -0
  253. data/_patches-20160118a/acceptance-test-runner +29 -0
  254. data/_patches-20160118a/ansible-1 +92 -0
  255. data/_patches-20160118a/bar +189 -0
  256. data/_patches-20160118a/cache-api-client-in-up +40 -0
  257. data/_patches-20160118a/dead-code-in-actions +44 -0
  258. data/_patches-20160118a/debug-changes +55 -0
  259. data/_patches-20160118a/demo-rails-app +1276 -0
  260. data/_patches-20160118a/eng-10166-halt-spec +40 -0
  261. data/_patches-20160118a/eng-10256 +554 -0
  262. data/_patches-20160118a/eng-10256-cr +314 -0
  263. data/_patches-20160118a/eng-10256-ubuntu-testing +88 -0
  264. data/_patches-20160118a/eng-10269-test-stuff +87 -0
  265. data/_patches-20160118a/eng-10269-wtf +119 -0
  266. data/_patches-20160118a/eng-10369 +143 -0
  267. data/_patches-20160118a/eng-10369-tmp +60 -0
  268. data/_patches-20160118a/eng-10919 +56 -0
  269. data/_patches-20160118a/eng-11177-fix-actions-requires +44 -0
  270. data/_patches-20160118a/eng-11442 +4 -0
  271. data/_patches-20160118a/eng-11616 +403 -0
  272. data/_patches-20160118a/eng-11616-2 +67 -0
  273. data/_patches-20160118a/eng-11616-actual +184 -0
  274. data/_patches-20160118a/eng-11625a +4 -0
  275. data/_patches-20160118a/eng-11711 +85 -0
  276. data/_patches-20160118a/eng-12232-command-spec +236 -0
  277. data/_patches-20160118a/eng-12235 +83 -0
  278. data/_patches-20160118a/eng-12235-override-refactor +140 -0
  279. data/_patches-20160118a/eng-12240 +103 -0
  280. data/_patches-20160118a/eng-12249 +40 -0
  281. data/_patches-20160118a/eng-12301 +50 -0
  282. data/_patches-20160118a/eng-12720 +74 -0
  283. data/_patches-20160118a/eng-12843 +95 -0
  284. data/_patches-20160118a/eng-13040 +291 -0
  285. data/_patches-20160118a/env-source +112 -0
  286. data/_patches-20160118a/foo +169 -0
  287. data/_patches-20160118a/frickin-vagrant-spec +163 -0
  288. data/_patches-20160118a/gem-pre-version +14 -0
  289. data/_patches-20160118a/gems-old +9 -0
  290. data/_patches-20160118a/googles-specs +713 -0
  291. data/_patches-20160118a/guestport-madness +59 -0
  292. data/_patches-20160118a/local-configs-ignore +61 -0
  293. data/_patches-20160118a/misc +79 -0
  294. data/_patches-20160118a/network-unreachable +31 -0
  295. data/_patches-20160118a/new-boxfile +288 -0
  296. data/_patches-20160118a/parallelization-maybe +198 -0
  297. data/_patches-20160118a/port-forwarding-processes +87 -0
  298. data/_patches-20160118a/read-state +23 -0
  299. data/_patches-20160118a/refactor-to-use-public_address-cap +25 -0
  300. data/_patches-20160118a/series +62 -0
  301. data/_patches-20160118a/status +14 -0
  302. data/_patches-20160118a/test-move-env-data +231 -0
  303. data/_patches-20160118a/test-vagrantfile-vm1 +167 -0
  304. data/_patches-20160118a/vagrant-spec-mock-api +137 -0
  305. data/_patches-20160118a/vagrant-vmware-plugin +233 -0
  306. data/_patches-20160118a/vagrantfile +403 -0
  307. data/_patches-20160118a/vagrantfile-for-acceptance-tests +29 -0
  308. data/_patches-20160118a/vagrantfile-for-nick +95 -0
  309. data/_patches-20160118a/vagrantfiles-to-forget-what-they-are-for +134 -0
  310. data/_patches-20160118a/vm-vanished +42 -0
  311. data/lib/vagrant-skytap/action/clear_forwarded_ports.rb +19 -0
  312. data/lib/vagrant-skytap/action/forward_ports.rb +42 -0
  313. data/lib/vagrant-skytap/action/prepare_forwarded_port_collision_params.rb +37 -0
  314. data/lib/vagrant-skytap/action.rb +18 -0
  315. data/lib/vagrant-skytap/api/environment.rb +19 -4
  316. data/lib/vagrant-skytap/api/vm.rb +10 -6
  317. data/lib/vagrant-skytap/command/up.rb +7 -1
  318. data/lib/vagrant-skytap/errors.rb +4 -0
  319. data/lib/vagrant-skytap/hosts/bsd/cap/ssh_tunnel.rb +15 -0
  320. data/lib/vagrant-skytap/hosts/common/cap/ssh_tunnel.rb +183 -0
  321. data/lib/vagrant-skytap/hosts/linux/cap/ssh_tunnel.rb +15 -0
  322. data/lib/vagrant-skytap/hosts/windows/cap/ssh_tunnel.rb +27 -0
  323. data/lib/vagrant-skytap/model/forwarded_port.rb +78 -0
  324. data/lib/vagrant-skytap/plugin.rb +15 -0
  325. data/lib/vagrant-skytap/util/compile_forwarded_ports.rb +35 -0
  326. data/lib/vagrant-skytap/version.rb +1 -1
  327. data/locales/en.yml +3 -0
  328. data/spec/unit/environment_spec.rb +14 -2
  329. data/spec/unit/forwarded_port_spec.rb +45 -0
  330. data/spec/unit/hosts/common/cap/ssh_tunnel_spec.rb +180 -0
  331. data/spec/unit/prepare_collision_params_spec.rb +57 -0
  332. data/spec/unit/support/forwarded_ports/machines/vm1/skytap/id +1 -0
  333. data/spec/unit/support/forwarded_ports/machines/vm1/skytap/private_key +4 -0
  334. data/spec/unit/support/forwarded_ports/machines/vm1/skytap/tcp9000_tcp_9000_80.pid +1 -0
  335. data/spec/unit/support/forwarded_ports/machines/vm1/skytap/tcp9001_tcp_9001_81.pid +1 -0
  336. data/spec/unit/support/forwarded_ports/machines/vm1/virtualbox/id +1 -0
  337. data/spec/unit/support/forwarded_ports/machines/vm2/skytap/id +1 -0
  338. data/spec/unit/support/forwarded_ports/machines/vm2/skytap/tcp8080_tcp_8080_80.pid +1 -0
  339. data/spec/unit/support/forwarded_ports/machines/vm3/virtualbox/id +1 -0
  340. data/spec/unit/support/forwarded_ports/machines/vm4/skytap/id +1 -0
  341. data/spec/unit/support/forwarded_ports/machines/vm4/skytap/tcp8888_tcp_8888_80.pid +1 -0
  342. metadata +330 -2
@@ -0,0 +1,59 @@
1
+ # HG changeset patch
2
+ # Parent db3a20145d368f18a9a8d39c72e648b830fe149e
3
+ diff -r db3a20145d36 -r 4202d4eb38c9 lib/vagrant-skytap/hosts/common/cap/ssh_tunnel.rb
4
+ --- a/lib/vagrant-skytap/hosts/common/cap/ssh_tunnel.rb Mon Jan 18 17:32:52 2016 -0800
5
+ +++ b/lib/vagrant-skytap/hosts/common/cap/ssh_tunnel.rb Mon Jan 18 17:33:25 2016 -0800
6
+ @@ -65,9 +65,10 @@
7
+ end
8
+ pidfiles.collect do |pidfile|
9
+ debugger
10
+ - pidfile =~ /(\w\w\w)(\d+)\.pid/
11
+ - protocol, hostport, guestport = $1, $2, nil
12
+ - Model::ForwardedPort.new("#{protocol}#{hostport}", hostport, guestport, protocol: protocol)
13
+ + pidfile =~ /(\w\w\w)(\d+)_(\d+)\.pid/
14
+ + protocol, hostport, guestport = $1, $2, $3
15
+ + # name format??
16
+ + Model::ForwardedPort.new("#{protocol}#{hostport}", hostport.to_i, guestport.to_i, protocol: protocol)
17
+ end
18
+ end
19
+
20
+ diff -r db3a20145d36 -r 4202d4eb38c9 lib/vagrant-skytap/model/forwarded_port.rb
21
+ --- a/lib/vagrant-skytap/model/forwarded_port.rb Mon Jan 18 17:32:52 2016 -0800
22
+ +++ b/lib/vagrant-skytap/model/forwarded_port.rb Mon Jan 18 17:33:25 2016 -0800
23
+ @@ -69,7 +69,7 @@
24
+ #
25
+ # @return [String]
26
+ def pidfile_name
27
+ - "#{protocol}#{host_port}.pid"
28
+ + "#{protocol}#{host_port}_#{guest_port}.pid"
29
+ end
30
+
31
+ def privileged_host_port?
32
+ diff -r db3a20145d36 -r 4202d4eb38c9 spec/unit/hosts/common/cap/ssh_tunnel_spec.rb
33
+ --- a/spec/unit/hosts/common/cap/ssh_tunnel_spec.rb Mon Jan 18 17:32:52 2016 -0800
34
+ +++ b/spec/unit/hosts/common/cap/ssh_tunnel_spec.rb Mon Jan 18 17:33:25 2016 -0800
35
+ @@ -16,6 +16,14 @@
36
+ allow(machine).to receive(:data_dir).and_return(env_path.join("machines/vm1/skytap"))
37
+ end
38
+
39
+ + describe "clear_forwarded_ports" do
40
+ + it "calls kill_ssh_tunnel for each pidfile found" do
41
+ + expect(described_class).to receive(:kill_ssh_tunnel).with(nil, forwarded_port1, machine)
42
+ + expect(described_class).to receive(:kill_ssh_tunnel).with(nil, forwarded_port2, machine)
43
+ + described_class.clear_forwarded_ports(nil, machine)
44
+ + end
45
+ + end
46
+ +
47
+ describe "read_pid" do
48
+ it "reads the pid" do
49
+ pid = described_class.read_pid(env_path.join("machines/vm1/skytap/tcp9000.pid"))
50
+ diff -r db3a20145d36 -r 4202d4eb38c9 spec/unit/support/forwarded_ports/machines/vm1/skytap/tcp9000_80.pid
51
+ --- /dev/null Thu Jan 01 00:00:00 1970 +0000
52
+ +++ b/spec/unit/support/forwarded_ports/machines/vm1/skytap/tcp9000_80.pid Mon Jan 18 17:33:25 2016 -0800
53
+ @@ -0,0 +1,1 @@
54
+ +99999
55
+ diff -r db3a20145d36 -r 4202d4eb38c9 spec/unit/support/forwarded_ports/machines/vm1/skytap/tcp9001_81.pid
56
+ --- /dev/null Thu Jan 01 00:00:00 1970 +0000
57
+ +++ b/spec/unit/support/forwarded_ports/machines/vm1/skytap/tcp9001_81.pid Mon Jan 18 17:33:25 2016 -0800
58
+ @@ -0,0 +1,1 @@
59
+ +90210
@@ -0,0 +1,61 @@
1
+ # HG changeset patch
2
+ # Parent 9e196ca30da26298aa093d37c9baa3016113de9e
3
+ # Parent 813456f18a2d7810c0785efa925e2516a7fa5729
4
+ local configs. Ready to commit below this line -----------------------------------------
5
+
6
+ diff -r 813456f18a2d .agignore
7
+ --- /dev/null Thu Jan 01 00:00:00 1970 +0000
8
+ +++ b/.agignore Fri Jan 08 11:51:56 2016 -0800
9
+ @@ -0,0 +1,8 @@
10
+ +#syntax: glob
11
+ +.hg
12
+ +.vagrant*
13
+ +dotvagrant
14
+ +*.diff
15
+ +_patches*
16
+ +.byebug*
17
+ +eng-*
18
+ diff -r 813456f18a2d .hgignore
19
+ --- a/.hgignore Tue Jan 05 13:24:28 2016 -0800
20
+ +++ b/.hgignore Fri Jan 08 11:51:56 2016 -0800
21
+ @@ -14,9 +14,16 @@
22
+ ^Gemfile\.lock$
23
+
24
+ # Vagrant
25
+ -^\.vagrant$
26
+ -^Vagrantfile$
27
+ +^\.vagrant
28
+ +^dotvagrant
29
+ +#^Vagrantfile$
30
+ #!example_box/Vagrantfile
31
+
32
+ # RVM files for gemset/ruby setting
33
+ \.ruby-version$
34
+ +
35
+ +^\.project
36
+ +\.diff
37
+ +^_patches
38
+ +^\.byebug
39
+ +^eng-
40
+ diff -r 813456f18a2d Gemfile
41
+ --- a/Gemfile Tue Jan 05 13:24:28 2016 -0800
42
+ +++ b/Gemfile Fri Jan 08 11:51:56 2016 -0800
43
+ @@ -1,6 +1,7 @@
44
+ source "https://rubygems.org"
45
+
46
+ gemspec
47
+ +gem "byebug"
48
+
49
+ group :development do
50
+ # We depend on Vagrant for development, but we don't add it as a
51
+ @@ -10,9 +11,8 @@
52
+ gem 'vagrant', path: "../vagrant"
53
+ else
54
+ # TODO test against tip
55
+ - gem "vagrant", :git => "git://github.com/mitchellh/vagrant.git", :tag => 'v1.7.2'
56
+ + gem "vagrant", :git => "git://github.com/mitchellh/vagrant.git", :tag => 'v1.7.4'
57
+ end
58
+ - gem "byebug"
59
+
60
+
61
+ if File.exist?(File.expand_path("../../vagrant-spec", __FILE__))
@@ -0,0 +1,79 @@
1
+ # HG changeset patch
2
+ # Parent 0dabf10f761d085b4fb8833f84c1b3a438015087
3
+ G.D. acceptance test(s)!
4
+
5
+ diff --git a/spec/acceptance/provider/status_spec.rb b/spec/acceptance/provider/status_spec.rb
6
+ new file mode 100644
7
+ --- /dev/null
8
+ +++ b/spec/acceptance/provider/status_spec.rb
9
+ @@ -0,0 +1,26 @@
10
+ +shared_examples 'provider/status' do |provider, options|
11
+ + if !options[:box]
12
+ + raise ArgumentError,
13
+ + "box option must be specified for provider: #{provider}"
14
+ + end
15
+ +
16
+ + include_context 'acceptance'
17
+ +
18
+ + before do
19
+ + environment.skeleton('generic')
20
+ + assert_execute('vagrant', 'box', 'add', 'skytap-dummy', options[:box])
21
+ + #assert_execute('vagrant', 'up', "--provider=#{provider}")
22
+ + end
23
+ +
24
+ + after do
25
+ + assert_execute('vagrant', 'destroy', '--force')
26
+ + end
27
+ +
28
+ + it 'should show status' do
29
+ + status("Test: can show status")
30
+ + result = execute("vagrant", "status")
31
+ + expect(result).to exit_with(0)
32
+ + #expect(result.stdout).to match(/vm1\s+not created/)
33
+ + expect(result.stdout).to match(/vm1\s+not created \(skytap\)/)
34
+ + end
35
+ +end
36
+ diff --git a/spec/acceptance/skeletons/generic/Vagrantfile b/spec/acceptance/skeletons/generic/Vagrantfile
37
+ --- a/spec/acceptance/skeletons/generic/Vagrantfile
38
+ +++ b/spec/acceptance/skeletons/generic/Vagrantfile
39
+ @@ -2,14 +2,16 @@
40
+ config.vm.box = "skytap-dummy"
41
+
42
+ config.vm.provider :skytap do |skytap, override|
43
+ - skytap.username = "user"
44
+ - skytap.api_token = "9999999999999999999999"
45
+ - skytap.base_url = "https://example.com/"
46
+ + skytap.username = "vagrant_provider_admin"
47
+ + skytap.api_token = "7c5718531a32eb90e92c804ce1f73da98be22cdf"
48
+ + skytap.base_url = "https://test.skytap.com/"
49
+ end
50
+
51
+ config.vm.define "vm1" do |ubuntu|
52
+ ubuntu.vm.provider :skytap do |box|
53
+ - box.vm_url = "https://example.com/vms/1"
54
+ + box.vm_url = "https://test.skytap.com/vms/6863190"
55
+ end
56
+ + config.ssh.host = '127.0.0.1'
57
+ + config.ssh.port = "22"
58
+ end
59
+ end
60
+ diff --git a/spec/acceptance/skeletons/generic/skytap-dummy b/spec/acceptance/skeletons/generic/skytap-dummy
61
+ new file mode 100644
62
+ index e69de29bb2d1d6434b8b29ae775ad8c2e48c5391..f9eefb302ee552c8d3c6ad929f4946988d2857fd
63
+ GIT binary patch
64
+ literal 167
65
+ zc$|~(=3sc`<q^Wb{Pw&f*C7Le)`#n=yCyK7F!7B3VAi;7K~nTA4UdoS!nm8dcWEpA
66
+ zx&O@2fG7W);?HC1`>l`dJH1U&X=?GSnWdrogU%S~=d9#<+#?tswQ`Ecxm!lTn*!(a
67
+ zPoMF}BK&2Ik7Dc9y_IWo_uq-M3w-}aICx!JmBjDY3pp3x)0Xw${)Bz*{m=2!nHiA5
68
+ Qnkt6NmOI}uXfQAU04kYD3;+NC
69
+
70
+ diff --git a/spec/acceptance/skeletons/generic/skytap-dummy.box b/spec/acceptance/skeletons/generic/skytap-dummy.box
71
+ new file mode 100644
72
+ index e69de29bb2d1d6434b8b29ae775ad8c2e48c5391..f9eefb302ee552c8d3c6ad929f4946988d2857fd
73
+ GIT binary patch
74
+ literal 167
75
+ zc$|~(=3sc`<q^Wb{Pw&f*C7Le)`#n=yCyK7F!7B3VAi;7K~nTA4UdoS!nm8dcWEpA
76
+ zx&O@2fG7W);?HC1`>l`dJH1U&X=?GSnWdrogU%S~=d9#<+#?tswQ`Ecxm!lTn*!(a
77
+ zPoMF}BK&2Ik7Dc9y_IWo_uq-M3w-}aICx!JmBjDY3pp3x)0Xw${)Bz*{m=2!nHiA5
78
+ Qnkt6NmOI}uXfQAU04kYD3;+NC
79
+
@@ -0,0 +1,31 @@
1
+ # HG changeset patch
2
+ # Parent 3ea4ed6d64784874bd83eec8022c452858582802
3
+ The error message for ENETUNREACH, in case we ever need it
4
+
5
+ diff -r 3ea4ed6d6478 -r 07650da5cc24 lib/vagrant-skytap/errors.rb
6
+ --- a/lib/vagrant-skytap/errors.rb Thu Nov 05 19:23:56 2015 -0800
7
+ +++ b/lib/vagrant-skytap/errors.rb Thu Nov 05 19:24:09 2015 -0800
8
+ @@ -66,6 +66,10 @@
9
+ class NoConnectionOptions < VagrantSkytapError
10
+ error_key(:no_connection_options)
11
+ end
12
+ +
13
+ + class NetworkUnreachable < VagrantSkytapError
14
+ + error_key(:network_unreachable)
15
+ + end
16
+ end
17
+ end
18
+ end
19
+ diff -r 3ea4ed6d6478 -r 07650da5cc24 locales/en.yml
20
+ --- a/locales/en.yml Thu Nov 05 19:23:56 2015 -0800
21
+ +++ b/locales/en.yml Thu Nov 05 19:24:09 2015 -0800
22
+ @@ -73,6 +73,9 @@
23
+ Host path: %{hostpath}
24
+ Error: %{err}
25
+
26
+ + network_unreachable: |-
27
+ + The network was unreachable. This can occur when an environment is first created.
28
+ +
29
+ does_not_exist: |-
30
+ %{object_name} was not found.
31
+
@@ -0,0 +1,288 @@
1
+ # HG changeset patch
2
+ # Parent 04af363aa9954a577b32c915fdd5f25c11e6510c
3
+ # Parent aa27fbed31fcb99c72b098e9b66df848cd8ff73e
4
+ [mq]: new-boxfile
5
+
6
+ diff --git a/Vagrantfile b/Vagrantfile
7
+ --- a/Vagrantfile
8
+ +++ b/Vagrantfile
9
+ @@ -1,67 +1,83 @@
10
+ Vagrant.configure(2) do |config|
11
+ - config.vm.box = "skytap-dummy"
12
+ - config.vm.synced_folder ".", "/vagrant", disabled: true
13
+ -
14
+ - config.vm.provider :skytap do |skytap, override|
15
+ - skytap.username = "etrue"
16
+ - skytap.api_token = "fcb2620b72efddbc8239e25db9d812f510c7e166"
17
+ - skytap.base_url = "https://cloud.skytap.com/"
18
+ - #skytap.username = "vagrant_provider_admin"
19
+ - #skytap.api_token = "7c5718531a32eb90e92c804ce1f73da98be22cdf"
20
+ - #skytap.base_url = "https://test.skytap.com/"
21
+ - #skytap.username = "jsmith"
22
+ - #skytap.api_token = "754be5220955f35840498340606b4dfa89f7eb61"
23
+ - #skytap.base_url = "https://cloud.skytap.dev/"
24
+ + config.vm.define "vm1" do |server|
25
+ + server.vm.box = "skytap/vm-3157858"
26
+ + server.vm.provider :skytap do |box|
27
+ + box.cpus = 1
28
+ + end
29
+ end
30
+ -
31
+ - GENERIC_UBUNTU = 'https://cloud.skytap.com/vms/6869434'
32
+ - # for test user
33
+ - #GENERIC_UBUNTU = 'https://cloud.skytap.com/vms/4840008'
34
+ - # local user
35
+ - #GENERIC_UBUNTU = 'https://cloud.skytap.dev/vms/374'
36
+ -
37
+ - UBUNTU1 = "https://cloud.skytap.com/vms/7285844"
38
+ - UBUNTU2 = "https://cloud.skytap.com/vms/7285846"
39
+ - UBUNTU_WITH_VAGRANT = "https://cloud.skytap.com/vms/7397734"
40
+ -
41
+ -
42
+ - # separate template
43
+ - # another ubuntu = 'https://cloud.skytap.com/vms/7242466'
44
+ - WINDOWS_WINRM_CONFIGURED = 'https://cloud.skytap.com/vms/7242468'
45
+ -
46
+ - config.vm.define "vm1" do |ubuntu|
47
+ - ubuntu.vm.hostname = "vm1"
48
+ - ubuntu.vm.provider :skytap do |box|
49
+ - box.vm_url = UBUNTU1#GENERIC_UBUNTU
50
+ - #box.cpus = 1
51
+ - #box.cpuspersocket = 1
52
+ - #box.ram = 1024
53
+ - #box.guestos = "ubuntu"
54
+ + config.vm.define "vm2" do |server|
55
+ + server.vm.box = "skytap/vm-7285844"
56
+ + server.vm.provider :skytap do |box|
57
+ + box.cpus = 1
58
+ end
59
+ - ubuntu.vm.synced_folder "~/test1", "/synced", type: :nfs
60
+ - ubuntu.vm.communicator = :ssh
61
+ - ubuntu.ssh.username = "skytap"
62
+ - ubuntu.ssh.password = "ChangeMe!"
63
+ - end
64
+ -
65
+ - config.vm.define "vm2" do |windows|
66
+ - windows.vm.provider :skytap do |box, override|
67
+ - box.vm_url = WINDOWS_WINRM_CONFIGURED
68
+ - override.vm.guest = "windows"
69
+ - end
70
+ - windows.vm.communicator = :winrm
71
+ - end
72
+ - config.winrm.username = 'Administrator'
73
+ - config.winrm.password = 'admin'
74
+ -
75
+ - config.vm.define "vm3" do |ubuntu|
76
+ - ubuntu.vm.hostname = "vm3"
77
+ - ubuntu.vm.provider :skytap do |box|
78
+ - box.vm_url = UBUNTU2#GENERIC_UBUNTU
79
+ - end
80
+ - ubuntu.vm.communicator = :ssh
81
+ - ubuntu.ssh.username = "skytap"
82
+ - ubuntu.ssh.password = "CarpYe$$$"
83
+ - ubuntu.vm.synced_folder "~/test2", "/synced", type: :nfs
84
+ end
85
+ end
86
+ +
87
+ +
88
+ +#Vagrant.configure(2) do |config|
89
+ +# config.vm.box = "skytap/empty"
90
+ +# config.vm.synced_folder ".", "/vagrant", disabled: true
91
+ +#
92
+ +# config.vm.provider :skytap do |skytap, override|
93
+ +# skytap.username = "etrue"
94
+ +# skytap.api_token = "fcb2620b72efddbc8239e25db9d812f510c7e166"
95
+ +# #skytap.username = "vagrant_provider_admin"
96
+ +# #skytap.api_token = "7c5718531a32eb90e92c804ce1f73da98be22cdf"
97
+ +# #skytap.base_url = "https://test.skytap.com/"
98
+ +# #skytap.username = "jsmith"
99
+ +# #skytap.api_token = "754be5220955f35840498340606b4dfa89f7eb61"
100
+ +# #skytap.base_url = "https://cloud.skytap.dev/"
101
+ +# end
102
+ +#
103
+ +# GENERIC_UBUNTU = 'https://cloud.skytap.com/vms/6869434'
104
+ +# # for test user
105
+ +# #GENERIC_UBUNTU = 'https://cloud.skytap.com/vms/4840008'
106
+ +# # local user
107
+ +# #GENERIC_UBUNTU = 'https://cloud.skytap.dev/vms/374'
108
+ +#
109
+ +# UBUNTU1 = "https://cloud.skytap.com/vms/7285844"
110
+ +# UBUNTU2 = "https://cloud.skytap.com/vms/7285846"
111
+ +# UBUNTU_WITH_VAGRANT = "https://cloud.skytap.com/vms/7397734"
112
+ +# UBUNTU_STOPPED_ENVIRONMENT_SOURCE_VM_A = "https://cloud.skytap.com/vms/7457184"
113
+ +# UBUNTU_STOPPED_ENVIRONMENT_SOURCE_VM_B = "https://cloud.skytap.com/vms/7468766"
114
+ +#
115
+ +# # separate template
116
+ +# # another ubuntu = 'https://cloud.skytap.com/vms/7242466'
117
+ +# WINDOWS_WINRM_CONFIGURED = 'https://cloud.skytap.com/vms/7242468'
118
+ +#
119
+ +# config.vm.define "vm1" do |ubuntu|
120
+ +# ubuntu.vm.hostname = "vm1"
121
+ +# ubuntu.vm.provider :skytap do |box|
122
+ +# box.vm_url = UBUNTU_STOPPED_ENVIRONMENT_SOURCE_VM_A#GENERIC_UBUNTU
123
+ +# #box.cpus = 1
124
+ +# #box.cpuspersocket = 1
125
+ +# #box.ram = 1024
126
+ +# #box.guestos = "ubuntu"
127
+ +# end
128
+ +# ubuntu.vm.synced_folder "~/test1", "/synced", type: :nfs
129
+ +# ubuntu.vm.communicator = :ssh
130
+ +# ubuntu.ssh.username = "skytap"
131
+ +# ubuntu.ssh.password = "ChangeMe!"
132
+ +# end
133
+ +##
134
+ +## config.vm.define "vm2" do |windows|
135
+ +## windows.vm.provider :skytap do |box, override|
136
+ +## box.vm_url = WINDOWS_WINRM_CONFIGURED
137
+ +## override.vm.guest = "windows"
138
+ +## end
139
+ +## windows.vm.communicator = :winrm
140
+ +## end
141
+ +## config.winrm.username = 'Administrator'
142
+ +## config.winrm.password = 'admin'
143
+ +#
144
+ +# config.vm.define "vm3" do |ubuntu|
145
+ +# ubuntu.vm.hostname = "vm3"
146
+ +# ubuntu.vm.provider :skytap do |box|
147
+ +# box.vm_url = UBUNTU_STOPPED_ENVIRONMENT_SOURCE_VM_B#GENERIC_UBUNTU
148
+ +# end
149
+ +# ubuntu.vm.communicator = :ssh
150
+ +# ubuntu.ssh.username = "skytap"
151
+ +# ubuntu.ssh.password = "CarpYe$$$"
152
+ +# ubuntu.vm.synced_folder "~/test2", "/synced", type: :nfs
153
+ +# end
154
+ +#end
155
+ diff --git a/example_box/Vagrantfile b/example_box/Vagrantfile
156
+ --- a/example_box/Vagrantfile
157
+ +++ b/example_box/Vagrantfile
158
+ @@ -1,8 +1,5 @@
159
+ -# -*- mode: ruby -*-
160
+ -# vi: set ft=ruby :
161
+ -
162
+ -Vagrant.configure("2") do |config|
163
+ - config.vm.provider :aws do |aws|
164
+ - aws.ami = "ami-7747d01e"
165
+ +Vagrant.configure(2) do |config|
166
+ + config.vm.provider :skytap do |skytap|
167
+ + skytap.vm_url = "https://cloud.skytap.com/vms/3157858"
168
+ end
169
+ end
170
+ diff --git a/example_box/metadata.json b/example_box/metadata.json
171
+ --- a/example_box/metadata.json
172
+ +++ b/example_box/metadata.json
173
+ @@ -1,3 +1,3 @@
174
+ {
175
+ - "provider": "aws"
176
+ + "provider": "skytap"
177
+ }
178
+ diff --git a/example_box/skytap-3157858.box b/example_box/skytap-3157858.box
179
+ new file mode 100644
180
+ index e69de29bb2d1d6434b8b29ae775ad8c2e48c5391..460c11de4737e8e8ecd2f970010212c9b7919fcc
181
+ GIT binary patch
182
+ literal 293
183
+ zc$@(x0owi_iwFQ4GdWfO1MSq!YJ@Nl2k<@n6v0z_iAmJB2>TknmY{LFtzX0_l-hT1
184
+ z)@=9CgFO_xEc|~U8O;de#|(`cZB?nPqOU{O?zX@flSx9(YbNEgGU3m?I3-+2E=A0R
185
+ zkc9Dsr|FKcO{)1}9IP^~6m89@SMpq1Rjus%Cn4AMPJ9H!347B`r&60RC*kn+ZdD%!
186
+ zpTVt*gU!+CNga)9ZFQ>Ge*eGtt^WnjuKgb;nd|>pX6XNaaryeR=-TRZ9F2YukEHC#
187
+ z>@Uo2Jot!C4gH=HB=<97N%Y~o%n={E)aTLE<Uqm~Yx^OOqN47`l3uopu8F2*h+>{*
188
+ r`*a_=TXkCo=i}C|0{{R3000000000000000;O=|@^bNPb04M+e$=j0|
189
+
190
+ diff --git a/lib/vagrant-skytap/action.rb b/lib/vagrant-skytap/action.rb
191
+ --- a/lib/vagrant-skytap/action.rb
192
+ +++ b/lib/vagrant-skytap/action.rb
193
+ @@ -127,6 +127,7 @@
194
+ # key.
195
+ def self.action_read_state
196
+ Vagrant::Action::Builder.new.tap do |b|
197
+ + b.use HandleBox
198
+ b.use ConfigValidate
199
+ b.use InitializeAPIClient
200
+ b.use FetchEnvironment
201
+ diff --git a/newvf1 b/newvf1
202
+ new file mode 100644
203
+ --- /dev/null
204
+ +++ b/newvf1
205
+ @@ -0,0 +1,50 @@
206
+ +# This sample Vagrantfile creates a Skytap environment
207
+ +# with two VMs from a VM in the public template library.
208
+ +# Any combination of template VMs may be used as long as
209
+ +# all are in the same region.
210
+ +
211
+ +Vagrant.configure(2) do |config|
212
+ + config.vm.box = "skytap/empty"
213
+ +
214
+ + config.vm.provider :skytap do |skytap|
215
+ + # Replace these values with your Skytap username and API token
216
+ + skytap.username = "<username>"
217
+ + skytap.api_token = "<api_token>"
218
+ + end
219
+ +
220
+ + # This section defines a web server using an Ubuntu VM from
221
+ + # public template library (specified by vm_url), with its
222
+ + # hardware settings upgraded to a quad-core CPU and 2GB of RAM.
223
+ + # Only the vm_url property is required.
224
+ + config.vm.define "web" do |webserver|
225
+ + webserver.vm.provider :skytap do |box|
226
+ + box.vm_url = "https://cloud.skytap.com/vms/3157858"
227
+ + box.cpus = 4
228
+ + box.cpuspersocket = 4
229
+ + box.ram = 2048
230
+ + end
231
+ + # Uncomment the following line to mount a directory on your
232
+ + # local machine (replace path1 with an existing directory) as
233
+ + # an NFS share named "/synced" on the VM.
234
+ + # webserver.vm.synced_folder "<path1>", "/synced", type: :nfs
235
+ + end
236
+ +
237
+ + # This section defines a second VM with different hardware
238
+ + # settings. Although it uses the same vm_url as above, VMs
239
+ + # from other templates (or the same template) can be combined
240
+ + # as long as they are all in the same region.
241
+ + config.vm.define "db" do |db_server|
242
+ + db_server.vm.provider :skytap do |box|
243
+ + box.vm_url = "https://cloud.skytap.com/vms/3157858"
244
+ + box.cpus = 8
245
+ + box.cpuspersocket = 4
246
+ + box.ram = 8192
247
+ + end
248
+ + # Uncomment the following line to mount a directory on your
249
+ + # local machine (replace path2 with an existing directory) as
250
+ + # an NFS share named "/synced" on the VM.
251
+ + # db_server.vm.synced_folder "<path1>", "/synced", type: :nfs
252
+ + end
253
+ +end
254
+ +
255
+ +
256
+ diff --git a/newvf2 b/newvf2
257
+ new file mode 100644
258
+ --- /dev/null
259
+ +++ b/newvf2
260
+ @@ -0,0 +1,28 @@
261
+ +https://docs.vagrantup.com/v2/multi-machine/
262
+ +# This sample Vagrantfile creates a Skytap
263
+ +# environment with two VMs. Each VM may be
264
+ +# created using a different vm_url.
265
+ +
266
+ +Vagrant.configure(2) do |config|
267
+ + config.vm.box = "skytap/empty"
268
+ +
269
+ + config.vm.provider :skytap do |skytap|
270
+ + skytap.username = "<username>"
271
+ + skytap.api_token = "<api_token>"
272
+ + end
273
+ +
274
+ + config.vm.define "web" do |web|
275
+ + web.vm.provider :skytap do |box|
276
+ + box.vm_url = "https://cloud.skytap.com/vms/3157858"
277
+ + box.ram = 4096
278
+ + end
279
+ + # web.vm.synced_folder "<path1>", "/synced", type: :nfs
280
+ + end
281
+ +
282
+ + config.vm.define "mysql" do |mysql|
283
+ + mysql.vm.provider :skytap do |box|
284
+ + box.vm_url = "https://cloud.skytap.com/vms/3157858"
285
+ + box.ram = 8192
286
+ + end
287
+ + end
288
+ +end