diff --git a/example.py b/example.py index 179be71d..95c16fab 100644 --- a/example.py +++ b/example.py @@ -25,14 +25,14 @@ mariadb_service1 = resource.create('mariadb_service1', 'resources/mariadb_servic keystone_db = resource.create('keystone_db', 'resources/mariadb_db/', {'db_name':'keystone_db', 'login_password':'', 'login_user':'root', 'login_port': '', 'ip':'', 'ssh_user':'', 'ssh_key':''}) keystone_db_user = resource.create('keystone_db_user', 'resources/mariadb_user/', {'new_user_name' : 'keystone', 'new_user_password' : 'keystone', 'db_name':'', 'login_password':'', 'login_user':'root', 'login_port': '', 'ip':'', 'ssh_user':'', 'ssh_key':''}) -keystone_config1 = resource.create('keystone_config1', 'resources/keystone_config/', {'config_dir' : '/etc/solar/keystone', 'ip':'', 'ssh_user':'', 'ssh_key':'', 'admin_token':'admin', 'db_password':'', 'db_name':'', 'db_user':'', 'db_host':''}) +keystone_config1 = resource.create('keystone_config1', 'resources/keystone_config/', {'config_dir' : '/etc/solar/keystone', 'ip':'', 'ssh_user':'', 'ssh_key':'', 'admin_token':'admin', 'db_password':'', 'db_name':'', 'db_user':'', 'db_host':'', 'db_port': ''}) keystone_service1 = resource.create('keystone_service1', 'resources/keystone_service/', {'port': 5001, 'admin_port': 35357, 'image': '', 'ip':'', 'ssh_key':'', 'ssh_user':'', 'config_dir':''}) -keystone_config2 = resource.create('keystone_config2', 'resources/keystone_config/', {'config_dir' : '/etc/solar/keystone', 'ip':'', 'ssh_user':'', 'ssh_key':'', 'admin_token':'admin', 'db_password':'', 'db_name':'', 'db_user':'', 'db_host':''}) +keystone_config2 = resource.create('keystone_config2', 'resources/keystone_config/', {'config_dir' : '/etc/solar/keystone', 'ip':'', 'ssh_user':'', 'ssh_key':'', 'admin_token':'admin', 'db_password':'', 'db_name':'', 'db_user':'', 'db_host':'', 'db_port': ''}) keystone_service2 = resource.create('keystone_service2', 'resources/keystone_service/', {'port': 5002, 'admin_port': 35357, 'image': '', 'ip':'', 'ssh_key':'', 'ssh_user':'', 'config_dir':''}) -haproxy_keystone_config = resource.create('haproxy_keystone1_config', 'resources/haproxy_keystone_config/', {'name':'keystone_config', 'listen_port':'5000', 'servers':[], 'ports':[]}) +haproxy_keystone_config = resource.create('haproxy_keystone1_config', 'resources/haproxy_keystone_config/', {'name':'keystone_config', 'listen_port':5000, 'servers':[], 'ports':[]}) haproxy_config = resource.create('haproxy_config', 'resources/haproxy', {'ip':'', 'ssh_key':'', 'ssh_user':'', 'configs_names':[], 'configs_ports':[], 'listen_ports':[], 'configs':[], 'config_dir': ''}) haproxy_service = resource.create('haproxy_service', 'resources/docker_container/', {'image' : 'tutum/haproxy', 'ports': [], 'host_binds': [], 'volume_binds':[], 'ip':'', 'ssh_key':'', 'ssh_user':''}) @@ -54,14 +54,14 @@ signals.connect(mariadb_service1, keystone_db_user, {'root_password':'login_pass signals.connect(keystone_db, keystone_db_user, {'db_name':'db_name'}) signals.connect(node1, keystone_config1) -signals.connect(mariadb_service1, keystone_config1, {'ip':'db_host'}) +signals.connect(mariadb_service1, keystone_config1, {'ip':'db_host', 'port': 'db_port'}) signals.connect(keystone_db_user, keystone_config1, {'db_name':'db_name', 'new_user_name':'db_user', 'new_user_password':'db_password'}) signals.connect(node1, keystone_service1) signals.connect(keystone_config1, keystone_service1, {'config_dir': 'config_dir'}) signals.connect(node2, keystone_config2) -signals.connect(mariadb_service1, keystone_config2, {'ip':'db_host'}) +signals.connect(mariadb_service1, keystone_config2, {'ip':'db_host', 'port': 'db_port'}) signals.connect(keystone_db_user, keystone_config2, {'db_name':'db_name', 'new_user_name':'db_user', 'new_user_password':'db_password'}) signals.connect(node2, keystone_service2) diff --git a/resources/keystone_config/meta.yaml b/resources/keystone_config/meta.yaml index 9746f2db..9b0bb4b0 100644 --- a/resources/keystone_config/meta.yaml +++ b/resources/keystone_config/meta.yaml @@ -19,7 +19,7 @@ input: schema: str! value: db_port: - schema: str! + schema: int! value: db_name: schema: str! diff --git a/solar/solar/core/connections.py b/solar/solar/core/connections.py index 7d25786d..281f2d0c 100644 --- a/solar/solar/core/connections.py +++ b/solar/solar/core/connections.py @@ -1,16 +1,4 @@ -import copy -import json - -from itertools import imap, ifilter - -import networkx as nx -import jinja2 -import mock - -from jinja2 import Template - - def depends_on(init_value, value=None, tags=None): if tags is None: tags = []