x/solar
Code Issues Proposed changes

Fix incorrect version handling in Vagrantfile

Browse Source 
Bumped version to 0.2.1

Change-Id: I17a8e786f9b1ec61de084bff6abe4bd9a4ee173e
This commit is contained in:
Jedrzej Nowak 2016-02-12 20:23:42 +01:00
parent b8e6b45498
commit e4cb8ad0c7
3 changed files with 9 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Vagrantfile vendored
View File

@ -34,9 +34,11 @@ SLAVES_COUNT = cfg["slaves_count"]
SLAVES_RAM = cfg["slaves_ram"] SLAVES_RAM = cfg["slaves_ram"]
SLAVES_IPS = cfg["slaves_ips"] SLAVES_IPS = cfg["slaves_ips"]
SLAVES_IMAGE = cfg["slaves_image"] SLAVES_IMAGE = cfg["slaves_image"]
SLAVES_IMAGE_VERSION = cfg["slaves_image_version"]
MASTER_RAM = cfg["master_ram"] MASTER_RAM = cfg["master_ram"]
MASTER_IPS = cfg["master_ips"] MASTER_IPS = cfg["master_ips"]
MASTER_IMAGE = cfg["master_image"] MASTER_IMAGE = cfg["master_image"]
MASTER_IMAGE_VERSION = cfg["master_image_version"]
SYNC_TYPE = cfg["sync_type"] SYNC_TYPE = cfg["sync_type"]
MASTER_CPUS = cfg["master_cpus"] MASTER_CPUS = cfg["master_cpus"]
SLAVES_CPUS = cfg["slaves_cpus"] SLAVES_CPUS = cfg["slaves_cpus"]
@ -60,6 +62,7 @@ Vagrant.configure(VAGRANTFILE_API_VERSION) do |config|
config.vm.define "solar-dev", primary: true do |config| config.vm.define "solar-dev", primary: true do |config|
config.vm.box = MASTER_IMAGE config.vm.box = MASTER_IMAGE
config.vm.box_version = MASTER_IMAGE_VERSION
config.vm.provision "shell", inline: solar_script, privileged: true config.vm.provision "shell", inline: solar_script, privileged: true
config.vm.provision "shell", inline: master_pxe, privileged: true unless PREPROVISIONED config.vm.provision "shell", inline: master_pxe, privileged: true unless PREPROVISIONED
@ -113,6 +116,7 @@ Vagrant.configure(VAGRANTFILE_API_VERSION) do |config|
# Standard box with all stuff preinstalled # Standard box with all stuff preinstalled
config.vm.box = SLAVES_IMAGE config.vm.box = SLAVES_IMAGE
config.vm.box_version = SLAVES_IMAGE_VERSION
config.vm.host_name = "solar-dev#{index}" config.vm.host_name = "solar-dev#{index}"
if PREPROVISIONED if PREPROVISIONED

2
setup.cfg
View File

@ -1,6 +1,6 @@
[metadata] [metadata]
name = solar name = solar
version = 0.2.0 version = 0.2.1
author = Mirantis Inc. author = Mirantis Inc.
author-email = product@mirantis.com author-email = product@mirantis.com
summary = Deployment tool summary = Deployment tool

6
vagrant-settings.yaml_defaults
View File

@ -3,8 +3,10 @@
slaves_count: 2 slaves_count: 2
slaves_ram: 1024 slaves_ram: 1024
master_image: solar-project/solar-master<0.3.0 master_image: solar-project/solar-master
slaves_image: solar-project/solar-master<0.3.0 master_image_version: <0.3.0
slaves_image: solar-project/solar-master
slaves_image_version: <0.3.0
master_ram: 1024 master_ram: 1024
master_cpus: 1 master_cpus: 1
master_ips: master_ips: