diff --git a/example.py b/example.py index 3ac24939..24a0a756 100644 --- a/example.py +++ b/example.py @@ -11,24 +11,24 @@ if os.path.exists('rs'): shutil.rmtree('rs') os.mkdir('rs') -node1 = resource.create('node1', 'x/resources/ro_node/', 'rs/', {'ip':'10.0.0.3', 'ssh_key' : '/vagrant/tmp/keys/ssh_private', 'ssh_user':'vagrant'}) -node2 = resource.create('node2', 'x/resources/ro_node/', 'rs/', {'ip':'10.0.0.4', 'ssh_key' : '/vagrant/tmp/keys/ssh_private', 'ssh_user':'vagrant'}) -node3 = resource.create('node3', 'x/resources/ro_node/', 'rs/', {'ip':'10.0.0.5', 'ssh_key' : '/vagrant/tmp/keys/ssh_private', 'ssh_user':'vagrant'}) +node1 = resource.create('node1', 'resources/ro_node/', 'rs/', {'ip':'10.0.0.3', 'ssh_key' : '/vagrant/tmp/keys/ssh_private', 'ssh_user':'vagrant'}) +node2 = resource.create('node2', 'resources/ro_node/', 'rs/', {'ip':'10.0.0.4', 'ssh_key' : '/vagrant/tmp/keys/ssh_private', 'ssh_user':'vagrant'}) +node3 = resource.create('node3', 'resources/ro_node/', 'rs/', {'ip':'10.0.0.5', 'ssh_key' : '/vagrant/tmp/keys/ssh_private', 'ssh_user':'vagrant'}) -mariadb_service1 = resource.create('mariadb_service1', 'x/resources/mariadb_service', 'rs/', {'image':'mariadb', 'root_password' : 'mariadb', 'port' : '3306', 'ip': '', 'ssh_user': '', 'ssh_key': ''}) -keystone_db = resource.create('keystone_db', 'x/resources/mariadb_db/', 'rs/', {'db_name':'keystone_db', 'login_password':'', 'login_user':'root', 'login_port': '', 'ip':'', 'ssh_user':'', 'ssh_key':''}) -keystone_db_user = resource.create('keystone_db_user', 'x/resources/mariadb_user/', 'rs/', {'new_user_name' : 'keystone', 'new_user_password' : 'keystone', 'db_name':'', 'login_password':'', 'login_user':'root', 'login_port': '', 'ip':'', 'ssh_user':'', 'ssh_key':''}) +mariadb_service1 = resource.create('mariadb_service1', 'resources/mariadb_service', 'rs/', {'image':'mariadb', 'root_password' : 'mariadb', 'port' : '3306', 'ip': '', 'ssh_user': '', 'ssh_key': ''}) +keystone_db = resource.create('keystone_db', 'resources/mariadb_db/', 'rs/', {'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/', 'rs/', {'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', 'x/resources/keystone_config/', 'rs/', {'config_dir' : '/etc/solar/keystone', 'ip':'', 'ssh_user':'', 'ssh_key':'', 'admin_token':'admin', 'db_password':'', 'db_name':'', 'db_user':'', 'db_host':''}) -keystone_service1 = resource.create('keystone_service1', 'x/resources/keystone_service/', 'rs/', {'port':'5000', 'admin_port':'35357', 'ip':'', 'ssh_key':'', 'ssh_user':'', 'config_dir':'', 'config_dir':''}) +keystone_config1 = resource.create('keystone_config1', 'resources/keystone_config/', 'rs/', {'config_dir' : '/etc/solar/keystone', 'ip':'', 'ssh_user':'', 'ssh_key':'', 'admin_token':'admin', 'db_password':'', 'db_name':'', 'db_user':'', 'db_host':''}) +keystone_service1 = resource.create('keystone_service1', 'resources/keystone_service/', 'rs/', {'port':'5000', 'admin_port':'35357', 'ip':'', 'ssh_key':'', 'ssh_user':'', 'config_dir':'', 'config_dir':''}) -keystone_config2 = resource.create('keystone_config2', 'x/resources/keystone_config/', 'rs/', {'config_dir' : '/etc/solar/keystone', 'ip':'', 'ssh_user':'', 'ssh_key':'', 'admin_token':'admin', 'db_password':'', 'db_name':'', 'db_user':'', 'db_host':''}) -keystone_service2 = resource.create('keystone_service2', 'x/resources/keystone_service/', 'rs/', {'port':'5000', 'admin_port':'35357', 'ip':'', 'ssh_key':'', 'ssh_user':'', 'config_dir':'', 'config_dir':''}) +keystone_config2 = resource.create('keystone_config2', 'resources/keystone_config/', 'rs/', {'config_dir' : '/etc/solar/keystone', 'ip':'', 'ssh_user':'', 'ssh_key':'', 'admin_token':'admin', 'db_password':'', 'db_name':'', 'db_user':'', 'db_host':''}) +keystone_service2 = resource.create('keystone_service2', 'resources/keystone_service/', 'rs/', {'port':'5000', 'admin_port':'35357', 'ip':'', 'ssh_key':'', 'ssh_user':'', 'config_dir':'', 'config_dir':''}) -haproxy_keystone_config = resource.create('haproxy_keystone1_config', 'x/resources/haproxy_config/', 'rs/', {'name':'keystone_config', 'listen_port':'5000', 'servers':[], 'ports':[]}) -haproxy_config = resource.create('haproxy_config', 'x/resources/haproxy', 'rs/', {'ip':'', 'ssh_key':'', 'ssh_user':'', 'configs_names':[], 'configs_ports':[], 'listen_ports':[], 'configs':[]}) -haproxy_service = resource.create('haproxy_service', 'x/resources/docker_container/', 'rs/', {'image' : 'tutum/haproxy', 'ports': [], 'host_binds': [], 'volume_binds':[], 'ip':'', 'ssh_key':'', 'ssh_user':''}) +haproxy_keystone_config = resource.create('haproxy_keystone1_config', 'resources/haproxy_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':[]}) +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/x/resources/data_container/actions/echo.yml b/resources/data_container/actions/echo.yml similarity index 100% rename from x/resources/data_container/actions/echo.yml rename to resources/data_container/actions/echo.yml diff --git a/x/resources/data_container/actions/remove.yml b/resources/data_container/actions/remove.yml similarity index 100% rename from x/resources/data_container/actions/remove.yml rename to resources/data_container/actions/remove.yml diff --git a/x/resources/data_container/actions/run.yml b/resources/data_container/actions/run.yml similarity index 100% rename from x/resources/data_container/actions/run.yml rename to resources/data_container/actions/run.yml diff --git a/x/resources/data_container/meta.yaml b/resources/data_container/meta.yaml similarity index 100% rename from x/resources/data_container/meta.yaml rename to resources/data_container/meta.yaml diff --git a/x/resources/docker_container/actions/remove.yml b/resources/docker_container/actions/remove.yml similarity index 100% rename from x/resources/docker_container/actions/remove.yml rename to resources/docker_container/actions/remove.yml diff --git a/x/resources/docker_container/actions/run.yml b/resources/docker_container/actions/run.yml similarity index 100% rename from x/resources/docker_container/actions/run.yml rename to resources/docker_container/actions/run.yml diff --git a/x/resources/docker_container/meta.yaml b/resources/docker_container/meta.yaml similarity index 100% rename from x/resources/docker_container/meta.yaml rename to resources/docker_container/meta.yaml diff --git a/x/resources/file/actions/remove.sh b/resources/file/actions/remove.sh similarity index 100% rename from x/resources/file/actions/remove.sh rename to resources/file/actions/remove.sh diff --git a/x/resources/file/actions/run.sh b/resources/file/actions/run.sh similarity index 100% rename from x/resources/file/actions/run.sh rename to resources/file/actions/run.sh diff --git a/x/resources/file/meta.yaml b/resources/file/meta.yaml similarity index 100% rename from x/resources/file/meta.yaml rename to resources/file/meta.yaml diff --git a/x/resources/haproxy/actions/remove.yml b/resources/haproxy/actions/remove.yml similarity index 100% rename from x/resources/haproxy/actions/remove.yml rename to resources/haproxy/actions/remove.yml diff --git a/x/resources/haproxy/actions/run.yml b/resources/haproxy/actions/run.yml similarity index 100% rename from x/resources/haproxy/actions/run.yml rename to resources/haproxy/actions/run.yml diff --git a/x/resources/haproxy/meta.yaml b/resources/haproxy/meta.yaml similarity index 100% rename from x/resources/haproxy/meta.yaml rename to resources/haproxy/meta.yaml diff --git a/x/resources/haproxy_config/meta.yaml b/resources/haproxy_config/meta.yaml similarity index 100% rename from x/resources/haproxy_config/meta.yaml rename to resources/haproxy_config/meta.yaml diff --git a/x/resources/keystone_config/actions/remove.yml b/resources/keystone_config/actions/remove.yml similarity index 100% rename from x/resources/keystone_config/actions/remove.yml rename to resources/keystone_config/actions/remove.yml diff --git a/x/resources/keystone_config/actions/run.yml b/resources/keystone_config/actions/run.yml similarity index 100% rename from x/resources/keystone_config/actions/run.yml rename to resources/keystone_config/actions/run.yml diff --git a/x/resources/keystone_config/meta.yaml b/resources/keystone_config/meta.yaml similarity index 100% rename from x/resources/keystone_config/meta.yaml rename to resources/keystone_config/meta.yaml diff --git a/x/resources/keystone_config/templates/default_catalog.templates b/resources/keystone_config/templates/default_catalog.templates similarity index 100% rename from x/resources/keystone_config/templates/default_catalog.templates rename to resources/keystone_config/templates/default_catalog.templates diff --git a/x/resources/keystone_config/templates/keystone.conf b/resources/keystone_config/templates/keystone.conf similarity index 100% rename from x/resources/keystone_config/templates/keystone.conf rename to resources/keystone_config/templates/keystone.conf diff --git a/x/resources/keystone_config/templates/logging.conf b/resources/keystone_config/templates/logging.conf similarity index 100% rename from x/resources/keystone_config/templates/logging.conf rename to resources/keystone_config/templates/logging.conf diff --git a/x/resources/keystone_config/templates/policy.json b/resources/keystone_config/templates/policy.json similarity index 100% rename from x/resources/keystone_config/templates/policy.json rename to resources/keystone_config/templates/policy.json diff --git a/x/resources/keystone_service/actions/remove.yml b/resources/keystone_service/actions/remove.yml similarity index 100% rename from x/resources/keystone_service/actions/remove.yml rename to resources/keystone_service/actions/remove.yml diff --git a/x/resources/keystone_service/actions/run.yml b/resources/keystone_service/actions/run.yml similarity index 100% rename from x/resources/keystone_service/actions/run.yml rename to resources/keystone_service/actions/run.yml diff --git a/x/resources/keystone_service/meta.yaml b/resources/keystone_service/meta.yaml similarity index 100% rename from x/resources/keystone_service/meta.yaml rename to resources/keystone_service/meta.yaml diff --git a/x/resources/keystone_user/actions/remove.yml b/resources/keystone_user/actions/remove.yml similarity index 100% rename from x/resources/keystone_user/actions/remove.yml rename to resources/keystone_user/actions/remove.yml diff --git a/x/resources/keystone_user/actions/run.yml b/resources/keystone_user/actions/run.yml similarity index 100% rename from x/resources/keystone_user/actions/run.yml rename to resources/keystone_user/actions/run.yml diff --git a/x/resources/keystone_user/meta.yaml b/resources/keystone_user/meta.yaml similarity index 100% rename from x/resources/keystone_user/meta.yaml rename to resources/keystone_user/meta.yaml diff --git a/x/resources/mariadb_db/actions/remove.yml b/resources/mariadb_db/actions/remove.yml similarity index 100% rename from x/resources/mariadb_db/actions/remove.yml rename to resources/mariadb_db/actions/remove.yml diff --git a/x/resources/mariadb_db/actions/run.yml b/resources/mariadb_db/actions/run.yml similarity index 100% rename from x/resources/mariadb_db/actions/run.yml rename to resources/mariadb_db/actions/run.yml diff --git a/x/resources/mariadb_db/meta.yaml b/resources/mariadb_db/meta.yaml similarity index 100% rename from x/resources/mariadb_db/meta.yaml rename to resources/mariadb_db/meta.yaml diff --git a/x/resources/mariadb_service/actions/remove.yml b/resources/mariadb_service/actions/remove.yml similarity index 100% rename from x/resources/mariadb_service/actions/remove.yml rename to resources/mariadb_service/actions/remove.yml diff --git a/x/resources/mariadb_service/actions/run.yml b/resources/mariadb_service/actions/run.yml similarity index 100% rename from x/resources/mariadb_service/actions/run.yml rename to resources/mariadb_service/actions/run.yml diff --git a/x/resources/mariadb_service/meta.yaml b/resources/mariadb_service/meta.yaml similarity index 100% rename from x/resources/mariadb_service/meta.yaml rename to resources/mariadb_service/meta.yaml diff --git a/x/resources/mariadb_user/actions/remove.yml b/resources/mariadb_user/actions/remove.yml similarity index 100% rename from x/resources/mariadb_user/actions/remove.yml rename to resources/mariadb_user/actions/remove.yml diff --git a/x/resources/mariadb_user/actions/run.yml b/resources/mariadb_user/actions/run.yml similarity index 100% rename from x/resources/mariadb_user/actions/run.yml rename to resources/mariadb_user/actions/run.yml diff --git a/x/resources/mariadb_user/meta.yaml b/resources/mariadb_user/meta.yaml similarity index 100% rename from x/resources/mariadb_user/meta.yaml rename to resources/mariadb_user/meta.yaml diff --git a/x/resources/nova/actions/remove.yml b/resources/nova/actions/remove.yml similarity index 100% rename from x/resources/nova/actions/remove.yml rename to resources/nova/actions/remove.yml diff --git a/x/resources/nova/actions/run.yml b/resources/nova/actions/run.yml similarity index 100% rename from x/resources/nova/actions/run.yml rename to resources/nova/actions/run.yml diff --git a/x/resources/nova/meta.yaml b/resources/nova/meta.yaml similarity index 100% rename from x/resources/nova/meta.yaml rename to resources/nova/meta.yaml diff --git a/x/resources/ro_node/meta.yaml b/resources/ro_node/meta.yaml similarity index 100% rename from x/resources/ro_node/meta.yaml rename to resources/ro_node/meta.yaml diff --git a/x/README.md b/x-README.md similarity index 100% rename from x/README.md rename to x-README.md diff --git a/x/TODO.md b/x-TODO.md similarity index 100% rename from x/TODO.md rename to x-TODO.md diff --git a/x/__init__.py b/x/__init__.py deleted file mode 100644 index e69de29b..00000000