Signed-off-by: yupeng <yu.peng36@zte.com.cn>
| ... | ... |
@@ -43,7 +43,7 @@ VM_NAME_PREFIX = ENV['OPENSHIFT_VM_NAME_PREFIX'] || "" |
| 43 | 43 |
|
| 44 | 44 |
Vagrant.configure(VAGRANTFILE_API_VERSION) do |config| |
| 45 | 45 |
|
| 46 |
- # these are the default settings, overrides are in .vagrant-openshift.json |
|
| 46 |
+ # These are the default settings, overrides are in .vagrant-openshift.json |
|
| 47 | 47 |
vagrant_openshift_config = {
|
| 48 | 48 |
"instance_name" => "origin-dev", |
| 49 | 49 |
"os" => "fedora", |
| ... | ... |
@@ -91,7 +91,7 @@ Vagrant.configure(VAGRANTFILE_API_VERSION) do |config| |
| 91 | 91 |
}, |
| 92 | 92 |
} |
| 93 | 93 |
|
| 94 |
- # attempt to read config in this repo's .vagrant-openshift.json if present |
|
| 94 |
+ # Attempt to read config in this repo's .vagrant-openshift.json if present |
|
| 95 | 95 |
if File.exist?('.vagrant-openshift.json')
|
| 96 | 96 |
json = File.read('.vagrant-openshift.json')
|
| 97 | 97 |
begin |
| ... | ... |
@@ -190,7 +190,7 @@ Vagrant.configure(VAGRANTFILE_API_VERSION) do |config| |
| 190 | 190 |
end |
| 191 | 191 |
else # Single VM dev environment |
| 192 | 192 |
########################## |
| 193 |
- # define settings for the single VM being created. |
|
| 193 |
+ # Define settings for the single VM being created. |
|
| 194 | 194 |
config.vm.define "#{VM_NAME_PREFIX}openshiftdev", primary: true do |config|
|
| 195 | 195 |
if vagrant_openshift_config['rebuild_yum_cache'] |
| 196 | 196 |
config.vm.provision "shell", inline: "yum clean all && yum makecache" |
| ... | ... |
@@ -316,7 +316,7 @@ Vagrant.configure(VAGRANTFILE_API_VERSION) do |config| |
| 316 | 316 |
override.vm.provision "setup", type: "shell", path: "contrib/vagrant/provision-full.sh", args: user |
| 317 | 317 |
end |
| 318 | 318 |
|
| 319 |
- # floating ip usually needed for accessing machines |
|
| 319 |
+ # Floating ip usually needed for accessing machines |
|
| 320 | 320 |
floating_ip = creds['OSFloatingIP'] || ENV['OS_FLOATING_IP'] |
| 321 | 321 |
os.floating_ip = floating_ip == ":auto" ? :auto : floating_ip |
| 322 | 322 |
floating_ip_pool = creds['OSFloatingIPPool'] || ENV['OS_FLOATING_IP_POOL'] |
| ... | ... |
@@ -351,7 +351,7 @@ Vagrant.configure(VAGRANTFILE_API_VERSION) do |config| |
| 351 | 351 |
aws.instance_ready_timeout = 240 |
| 352 | 352 |
aws.tags = { "Name" => ENV['AWS_HOSTNAME'] || vagrant_openshift_config['instance_name'] }
|
| 353 | 353 |
aws.user_data = %{
|
| 354 |
-#cloud-config |
|
| 354 |
+# cloud-config |
|
| 355 | 355 |
|
| 356 | 356 |
growpart: |
| 357 | 357 |
mode: auto |