diff --git a/example.py b/example.py index a5b87782..25a29e19 100644 --- a/example.py +++ b/example.py @@ -27,7 +27,7 @@ keystone_config2 = resource.create('keystone_config2', 'resources/keystone_confi keystone_service2 = resource.create('keystone_service2', 'resources/keystone_service/', 'rs/', {'port':'5002', 'admin_port':'35357', 'image': '', 'ip':'', 'ssh_key':'', 'ssh_user':'', 'config_dir':''}) -haproxy_keystone_config = resource.create('haproxy_keystone1_config', 'resources/haproxy_config/', 'rs/', {'name':'keystone_config', 'listen_port':'5000', 'servers':[], 'ports':[]}) +haproxy_keystone_config = resource.create('haproxy_keystone1_config', 'resources/haproxy_keystone_config/', 'rs/', {'name':'keystone_config', 'listen_port':'5000', 'servers':[], 'ports':[]}) haproxy_config = resource.create('haproxy_config', 'resources/haproxy', 'rs/', {'ip':'', 'ssh_key':'', 'ssh_user':'', 'configs_names':[], 'configs_ports':[], 'listen_ports':[], 'configs':[], 'config_dir': ''}) haproxy_service = resource.create('haproxy_service', 'resources/docker_container/', 'rs/', {'image' : 'tutum/haproxy', 'ports': [], 'host_binds': [], 'volume_binds':[], 'ip':'', 'ssh_key':'', 'ssh_user':''}) diff --git a/solar/solar/core/resource.py b/solar/solar/core/resource.py index 1c004247..0369dffa 100644 --- a/solar/solar/core/resource.py +++ b/solar/solar/core/resource.py @@ -137,7 +137,7 @@ def create(name, base_path, dest_path, args, connections={}): for f in os.listdir(actions_path): meta['actions'][os.path.splitext(f)[0]] = f - resource = Resource(name, meta, args, dest_path, tags=args['tags']) + resource = Resource(name, meta, args, dest_path, tags=args.get('tags', [])) signals.assign_connections(resource, connections) # save