Merge pull request #69 from bodepd/node_group_scenario_refactor

Update node_groups to use scenarios

Vagrantfile

@@ -16,7 +16,7 @@ def parse_vagrant_config(
     'operatingsystem' => 'ubuntu',
     'verbose'         => false,
     'update_repos'    => true,
-    'node_group'      => 'multi_node'
+    'scenario'        => '2_role'
   }
   if File.exists?(config_file)
     overrides = YAML.load_file(config_file)
@@ -33,7 +33,7 @@ end
 #
 def process_nodes(config, v_config, apt_cache_proxy)
 
-  node_group      = v_config['node_group']
+  node_group      = v_config['scenario']
   node_group_file = File.expand_path(File.join(File.dirname(__FILE__), 'data', 'nodes', "#{node_group}.yaml"))
 
   abort('node_group much be specific in config') unless node_group

data/config.yaml

@@ -4,6 +4,8 @@ apt_cache:  '192.168.242.99' # Apt cache server, set to 'false' to disable
 apt_mirror: 'us.archive.ubuntu.com'
 domain:     'domain.name'
 verbose:    false
+operatingsystem: ubuntu
+scenario: 2_role
 
 # puppet config
 application:
@@ -31,7 +33,3 @@ enabled_services:
   # should I be able to interpolate this?
   - quantum
   - swift
-
-operatingsystem: ubuntu
-node_group: swift
-scenario: 2_role

tests/basic_test.sh

@@ -90,7 +90,7 @@ if [ "${test_type:-}" = 'swift' ]; then
 
   source tests/swift.sh
 
-  echo 'node_group: swift' >> data/config.yaml
+  sed -i 's/scenario:.*/scenario: swift/g' data/config.yaml
   destroy_swift
   deploy_swift_multi
 
@@ -106,12 +106,12 @@ elif [ "${test_type:-}" = 'openstack_multi' ]; then
 
   if [[ "${test_mode}" == tempest* ]]; then
     # pull in functions to install controller with tempest
-    echo 'node_group: multi_node_tempest' >> data/config.yaml
+    sed -i 's/scenario:.*/scenario: multi_node_tempest/g' data/config.yaml
     source tests/multi_node_tempest.sh
   else
-    echo 'node_group: multi_node' >> data/config.yaml
+    sed -i 's/scenario:.*/scenario: 2_role/g' data/config.yaml
     # pull in functions that test multi-node
-    source tests/multi_node.sh
+    source tests/2_role.sh
   fi
 
   # perform a multi-node openstack installation test by default