diff --git a/Vagrantfile b/Vagrantfile index 311e2703..ea0db53f 100644 --- a/Vagrantfile +++ b/Vagrantfile @@ -34,9 +34,11 @@ SLAVES_COUNT = cfg["slaves_count"] SLAVES_RAM = cfg["slaves_ram"] SLAVES_IPS = cfg["slaves_ips"] SLAVES_IMAGE = cfg["slaves_image"] +SLAVES_IMAGE_VERSION = cfg["slaves_image_version"] MASTER_RAM = cfg["master_ram"] MASTER_IPS = cfg["master_ips"] MASTER_IMAGE = cfg["master_image"] +MASTER_IMAGE_VERSION = cfg["master_image_version"] SYNC_TYPE = cfg["sync_type"] MASTER_CPUS = cfg["master_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.box = MASTER_IMAGE + config.vm.box_version = MASTER_IMAGE_VERSION config.vm.provision "shell", inline: solar_script, privileged: true 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 config.vm.box = SLAVES_IMAGE + config.vm.box_version = SLAVES_IMAGE_VERSION config.vm.host_name = "solar-dev#{index}" if PREPROVISIONED diff --git a/setup.cfg b/setup.cfg index d37398e5..250e1b82 100644 --- a/setup.cfg +++ b/setup.cfg @@ -1,6 +1,6 @@ [metadata] name = solar -version = 0.2.0 +version = 0.2.1 author = Mirantis Inc. author-email = product@mirantis.com summary = Deployment tool diff --git a/vagrant-settings.yaml_defaults b/vagrant-settings.yaml_defaults index 5e85d047..d750586c 100644 --- a/vagrant-settings.yaml_defaults +++ b/vagrant-settings.yaml_defaults @@ -3,8 +3,10 @@ slaves_count: 2 slaves_ram: 1024 -master_image: solar-project/solar-master<0.3.0 -slaves_image: solar-project/solar-master<0.3.0 +master_image: solar-project/solar-master +master_image_version: <0.3.0 +slaves_image: solar-project/solar-master +slaves_image_version: <0.3.0 master_ram: 1024 master_cpus: 1 master_ips: