x
/
fuel-ccp-installer
Code Issues Proposed changes

Adjust README and don't fail when custom settings file is empty

This commit is contained in:
Jedrzej Nowak 2016-05-06 19:41:23 +02:00
parent fa8897a6e6
commit c7d4166e26
2 changed files with 10 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
README.md
View File

@ -4,10 +4,11 @@ Express Vagrant setup:
---------------------
1. `git clone -b stable https://github.com/pigmej/mcpinstall.git && cd mcpinstall`
2. Copy default vagrant settings: `cp utils/vagrant/vagrant-settings.yaml_defaults utils/vagrant/vagrant-settings.yaml`
3. `./deploy/kube-up.sh`
4. `vagrant ssh solar`
5. `kubectl get pods`
2. `./deploy/kube-up.sh`
3. `vagrant ssh solar`
4. `kubectl get pods`
You can adjust any setting value from `utils/vagrant/vagrant-settings.yaml_defaults` by setting it in `utils/vagrant/vagrant-settings.yaml`. For example on Linux you should consider setting `sync_type` to `nfs` by adding `sync_type: nfs` to your vagrant-settings.yaml.
Fedora slave nodes:
-------------------

6
utils/vagrant/Vagrantfile vendored
View File

@ -25,7 +25,11 @@ VAGRANTFILE_API_VERSION = "2"
defaults_cfg = YAML.load_file('vagrant-settings.yaml_defaults')
if File.exist?('vagrant-settings.yaml')
custom_cfg = YAML.load_file('vagrant-settings.yaml')
cfg = defaults_cfg.merge(custom_cfg)
if custom_cfg
cfg = defaults_cfg.merge(custom_cfg)
else
cfg = defaults_cfg
end
else
cfg = defaults_cfg
end