From cf1bd28c126321a1167a47bc17a05900969ae848 Mon Sep 17 00:00:00 2001 From: Jedrzej Nowak Date: Wed, 16 Sep 2015 12:15:08 +0200 Subject: [PATCH 01/17] Change riak hostnames mapping --- examples/riak/riaks.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/examples/riak/riaks.py b/examples/riak/riaks.py index f5df525..30282c9 100644 --- a/examples/riak/riaks.py +++ b/examples/riak/riaks.py @@ -58,7 +58,8 @@ def setup_riak(): for riak in riak_services: for hosts_file in hosts_services: signals.connect(riak, hosts_file, - {'riak_hostname': 'hosts_names', 'ip': 'hosts_ips'}, + {'riak_hostname': 'hosts:name', + 'ip': 'hosts:ip'}, events=False) has_errors = False From 2e988626e24f0c5bb95301c46114a6cb2191af42 Mon Sep 17 00:00:00 2001 From: Jedrzej Nowak Date: Wed, 16 Sep 2015 14:14:30 +0200 Subject: [PATCH 02/17] First stage of porting --- examples/riak/riaks.py | 46 ++++++++++++++-------- resources/haproxy_config/meta.yaml | 31 ++++++++------- resources/haproxy_service_config/meta.yaml | 14 ++++--- 3 files changed, 54 insertions(+), 37 deletions(-) diff --git a/examples/riak/riaks.py b/examples/riak/riaks.py index 30282c9..53dbb24 100644 --- a/examples/riak/riaks.py +++ b/examples/riak/riaks.py @@ -144,33 +144,45 @@ def setup_haproxies(): for single_hpsc in hpsc_http: for riak in riaks: - signals.connect(riak, single_hpsc, {'riak_hostname': 'servers', - 'riak_port_http': 'ports'}) + # signals.connect(riak, single_hpsc, {'riak_hostname': 'servers', + # 'riak_port_http': 'ports'}) + signals.connect(riak, single_hpsc, {'riak_hostname': 'backends:server', + 'riak_port_http': 'backends:port'}) for single_hpsc in hpsc_pb: for riak in riaks: - signals.connect(riak, single_hpsc, {'riak_hostname': 'servers', - 'riak_port_pb': 'ports'}) + # signals.connect(riak, single_hpsc, {'riak_hostname': 'servers', + # 'riak_port_pb': 'ports'}) + signals.connect(riak, single_hpsc, {'riak_hostname': 'backends:server', + 'riak_port_pb': 'backends:port'}) # haproxy config to haproxy service for single_hpc, single_hpsc in zip(hpc, hpsc_http): - signals.connect(single_hpsc, single_hpc, {'protocol': 'configs_protocols', - 'listen_port': 'listen_ports', - 'name': 'configs_names', - 'servers': 'configs', - 'ports': 'configs_ports'}) + # signals.connect(single_hpsc, single_hpc, {'protocol': 'configs_protocols', + # 'listen_port': 'listen_ports', + # 'name': 'configs_names', + # 'servers': 'configs', + # 'ports': 'configs_ports'}) + signals.connect(single_hpsc, single_hpc, {"backends": "config:backends", + "listen_port": "config:listen_port", + "protocol": "config:protocol", + "name": "config:name"}) for single_hpc, single_hpsc in zip(hpc, hpsc_pb): - signals.connect(single_hpsc, single_hpc, {'protocol': 'configs_protocols', - 'listen_port': 'listen_ports', - 'name': 'configs_names', - 'servers': 'configs', - 'ports': 'configs_ports'}) + # signals.connect(single_hpsc, single_hpc, {'protocol': 'configs_protocols', + # 'listen_port': 'listen_ports', + # 'name': 'configs_names', + # 'servers': 'configs', + # 'ports': 'configs_ports'}) + signals.connect(single_hpsc, single_hpc, {"backends": "config:backends", + "listen_port": "config:listen_port", + "protocol": "config:protocol", + "name": "config:name"}) - for single_hps, single_hpc in zip(hps, hpc): - signals.connect(single_hpc, single_hps, {'listen_ports': 'ports'}, - events=False) + # for single_hps, single_hpc in zip(hps, hpc): + # signals.connect(single_hpc, single_hps, {'listen_ports': 'ports'}, + # events=False) # assign haproxy services to each node diff --git a/resources/haproxy_config/meta.yaml b/resources/haproxy_config/meta.yaml index af5858e..2263616 100644 --- a/resources/haproxy_config/meta.yaml +++ b/resources/haproxy_config/meta.yaml @@ -8,20 +8,23 @@ input: config_dir: schema: {src: str!, dst: str!} value: {src: /etc/solar/haproxy, dst: /etc/haproxy} - listen_ports: - schema: [int] - value: [] - configs: - schema: [[str]] - value: [] - configs_names: - schema: [str] - value: [] - configs_ports: - schema: [[int]] - value: [] - configs_protocols: - schema: [str] + # listen_ports: + # schema: [int] + # value: [] + # configs: + # schema: [[str]] + # value: [] + # configs_names: + # schema: [str] + # value: [] + # configs_ports: + # schema: [[int]] + # value: [] + # configs_protocols: + # schema: [str] + # value: [] + config: + schema: [{backends: [{server: str!, port: int!}], listen_port: int!, protocol: str!, name: str!}] value: [] ssh_user: schema: str! diff --git a/resources/haproxy_service_config/meta.yaml b/resources/haproxy_service_config/meta.yaml index 88c7174..c6dd689 100644 --- a/resources/haproxy_service_config/meta.yaml +++ b/resources/haproxy_service_config/meta.yaml @@ -5,17 +5,19 @@ input: name: schema: str! value: general_haproxy + backends: + schema: [{server: str!, port: int!}] listen_port: schema: int! value: 9999 protocol: schema: str! value: http - ports: - schema: [int] - value: [] - servers: - schema: [str] - value: [] + # ports: + # schema: [int] + # value: [] + # servers: + # schema: [str] + # value: [] tags: [resources/haproxy, resource/haproxy_general_config] From 66c140f25357b568a43049c445c4bd7cb64ecbf4 Mon Sep 17 00:00:00 2001 From: Jedrzej Nowak Date: Thu, 17 Sep 2015 14:21:17 +0200 Subject: [PATCH 03/17] Fixed haproxy resource --- resources/haproxy_config/actions/run.yaml | 26 +++++++++--------- resources/haproxy_config/actions/update.yaml | 28 ++++++++++---------- resources/haproxy_config/meta.yaml | 15 ----------- 3 files changed, 27 insertions(+), 42 deletions(-) diff --git a/resources/haproxy_config/actions/run.yaml b/resources/haproxy_config/actions/run.yaml index 9ab8a09..e4aaf9b 100644 --- a/resources/haproxy_config/actions/run.yaml +++ b/resources/haproxy_config/actions/run.yaml @@ -2,21 +2,21 @@ - hosts: [{{host}}] sudo: yes vars: - config_dir: {src: {{ config_dir.value['src'] }}, dst: {{ config_dir.value['dst'] }}} + config_dir: {src: {{ config_dir['src'] }}, dst: {{ config_dir['dst'] }}} haproxy_ip: {{ ip }} haproxy_services: - {% for service, ports, listen_port, protocol in zip(configs.value, configs_ports.value, listen_ports.value, configs_protocols.value) %} - - name: {{ service['emitter_attached_to'] }} - listen_port: {{ listen_port['value'] }} - protocol: {{ protocol['value'] }} - servers: - {% for server_ip, server_port in zip(service['value'], ports['value']) %} - - name: {{ server_ip['emitter_attached_to'] }} - ip: {{ server_ip['value'] }} - port: {{ server_port['value'] }} - {% endfor %} + {% for single in config %} + - name: {{ single['name'] }} + listen_port: {{ single['listen_port'] }} + protocol: {{ single['protocol'] }} + servers: + {% for backend in single['backends'] %} + - name: {{ backend['server'] }}_{{ backend['port'] }} + ip: {{ backend['server'] }} + port: {{ backend['port'] }} + {% endfor %} {% endfor %} tasks: - - file: path={{ config_dir.value['src'] }}/ state=directory - - file: path={{ config_dir.value['src'] }}/haproxy.cfg state=touch + - file: path={{ config_dir['src'] }}/ state=directory + - file: path={{ config_dir['src'] }}/haproxy.cfg state=touch - template: src={{templates_dir}}/haproxy.cfg dest=/etc/haproxy/haproxy.cfg diff --git a/resources/haproxy_config/actions/update.yaml b/resources/haproxy_config/actions/update.yaml index 474ee62..e4aaf9b 100644 --- a/resources/haproxy_config/actions/update.yaml +++ b/resources/haproxy_config/actions/update.yaml @@ -1,22 +1,22 @@ # TODO -- hosts: [{{ip}}] +- hosts: [{{host}}] sudo: yes vars: - config_dir: {src: {{ config_dir.value['src'] }}, dst: {{ config_dir.value['dst'] }}} + config_dir: {src: {{ config_dir['src'] }}, dst: {{ config_dir['dst'] }}} haproxy_ip: {{ ip }} haproxy_services: - {% for service, ports, listen_port, protocol in zip(configs.value, configs_ports.value, listen_ports.value, configs_protocols.value) %} - - name: {{ service['emitter_attached_to'] }} - listen_port: {{ listen_port['value'] }} - protocol: {{ protocol['value'] }} - servers: - {% for server_ip, server_port in zip(service['value'], ports['value']) %} - - name: {{ server_ip['emitter_attached_to'] }} - ip: {{ server_ip['value'] }} - port: {{ server_port['value'] }} - {% endfor %} + {% for single in config %} + - name: {{ single['name'] }} + listen_port: {{ single['listen_port'] }} + protocol: {{ single['protocol'] }} + servers: + {% for backend in single['backends'] %} + - name: {{ backend['server'] }}_{{ backend['port'] }} + ip: {{ backend['server'] }} + port: {{ backend['port'] }} + {% endfor %} {% endfor %} tasks: - - file: path={{ config_dir.value['src'] }}/ state=directory - - file: path={{ config_dir.value['src'] }}/haproxy.cfg state=touch + - file: path={{ config_dir['src'] }}/ state=directory + - file: path={{ config_dir['src'] }}/haproxy.cfg state=touch - template: src={{templates_dir}}/haproxy.cfg dest=/etc/haproxy/haproxy.cfg diff --git a/resources/haproxy_config/meta.yaml b/resources/haproxy_config/meta.yaml index 2263616..e61f0ef 100644 --- a/resources/haproxy_config/meta.yaml +++ b/resources/haproxy_config/meta.yaml @@ -8,21 +8,6 @@ input: config_dir: schema: {src: str!, dst: str!} value: {src: /etc/solar/haproxy, dst: /etc/haproxy} - # listen_ports: - # schema: [int] - # value: [] - # configs: - # schema: [[str]] - # value: [] - # configs_names: - # schema: [str] - # value: [] - # configs_ports: - # schema: [[int]] - # value: [] - # configs_protocols: - # schema: [str] - # value: [] config: schema: [{backends: [{server: str!, port: int!}], listen_port: int!, protocol: str!, name: str!}] value: [] From 40966fefe5121d71fbb7ff378886cb32555dc66b Mon Sep 17 00:00:00 2001 From: Jedrzej Nowak Date: Thu, 17 Sep 2015 14:22:32 +0200 Subject: [PATCH 04/17] Removed old stuff --- examples/riak/riaks.py | 17 ----------------- 1 file changed, 17 deletions(-) diff --git a/examples/riak/riaks.py b/examples/riak/riaks.py index 53dbb24..3ad0cbe 100644 --- a/examples/riak/riaks.py +++ b/examples/riak/riaks.py @@ -144,45 +144,28 @@ def setup_haproxies(): for single_hpsc in hpsc_http: for riak in riaks: - # signals.connect(riak, single_hpsc, {'riak_hostname': 'servers', - # 'riak_port_http': 'ports'}) signals.connect(riak, single_hpsc, {'riak_hostname': 'backends:server', 'riak_port_http': 'backends:port'}) for single_hpsc in hpsc_pb: for riak in riaks: - # signals.connect(riak, single_hpsc, {'riak_hostname': 'servers', - # 'riak_port_pb': 'ports'}) signals.connect(riak, single_hpsc, {'riak_hostname': 'backends:server', 'riak_port_pb': 'backends:port'}) # haproxy config to haproxy service for single_hpc, single_hpsc in zip(hpc, hpsc_http): - # signals.connect(single_hpsc, single_hpc, {'protocol': 'configs_protocols', - # 'listen_port': 'listen_ports', - # 'name': 'configs_names', - # 'servers': 'configs', - # 'ports': 'configs_ports'}) signals.connect(single_hpsc, single_hpc, {"backends": "config:backends", "listen_port": "config:listen_port", "protocol": "config:protocol", "name": "config:name"}) for single_hpc, single_hpsc in zip(hpc, hpsc_pb): - # signals.connect(single_hpsc, single_hpc, {'protocol': 'configs_protocols', - # 'listen_port': 'listen_ports', - # 'name': 'configs_names', - # 'servers': 'configs', - # 'ports': 'configs_ports'}) signals.connect(single_hpsc, single_hpc, {"backends": "config:backends", "listen_port": "config:listen_port", "protocol": "config:protocol", "name": "config:name"}) - # for single_hps, single_hpc in zip(hps, hpc): - # signals.connect(single_hpc, single_hps, {'listen_ports': 'ports'}, - # events=False) # assign haproxy services to each node From 6be816023a30a0210802859d5f9ae1b035255485 Mon Sep 17 00:00:00 2001 From: Jedrzej Nowak Date: Thu, 17 Sep 2015 16:42:23 +0200 Subject: [PATCH 05/17] removed duplicate name in ro_node --- resources/ro_node/meta.yaml | 3 --- 1 file changed, 3 deletions(-) diff --git a/resources/ro_node/meta.yaml b/resources/ro_node/meta.yaml index 2add4de..d17c1ee 100644 --- a/resources/ro_node/meta.yaml +++ b/resources/ro_node/meta.yaml @@ -6,9 +6,6 @@ input: ip: schema: str! value: - name: - schema: str - value: ssh_key: schema: str! value: From 916b3c79daf4e71848ff74f1da40c3debf8ebd68 Mon Sep 17 00:00:00 2001 From: Przemyslaw Kaminski Date: Fri, 18 Sep 2015 11:36:08 +0200 Subject: [PATCH 06/17] Riaks: fix template example, small riaks.py fixes --- examples/riak/riaks-template.py | 262 +++++++++++++++++++------------- examples/riak/riaks.py | 28 ++-- 2 files changed, 172 insertions(+), 118 deletions(-) diff --git a/examples/riak/riaks-template.py b/examples/riak/riaks-template.py index 751f983..9708739 100644 --- a/examples/riak/riaks-template.py +++ b/examples/riak/riaks-template.py @@ -4,116 +4,172 @@ # work here, for most up-to-date version see example-riaks.py # This is just a demo of the template language of Solar +import click +import sys + +from solar.core import resource from solar.interfaces.db import get_db -from solar.core import signals - -db = get_db() -db.clear() -signals.Connections.clear() - from solar import template -nodes = template.nodes_from('templates/riak_nodes.yaml') - -riak_services = nodes.on_each( - 'resources/riak_node', - { - 'riak_self_name': 'riak{num}', - 'riak_hostname': 'riak_server{num}.solar', - 'riak_name': 'riak{num}@riak_server{num}.solar', -}) - -slave_riak_services = riak_services.tail() - -riak_services.take(0).connect_list( - slave_riak_services, - { - 'riak_name': 'join_to', - } -) - -hosts_files = nodes.on_each('resources/hosts_file') - -riak_services.connect_list_to_each( - hosts_files, - { - 'ip': 'hosts_ips', - 'riak_hostname': 'hosts_names', - }, - events=False -) +db = get_db() -hosts_files.add_deps('run/success', riak_services, 'run') -slave_riak_services.add_reacts('run/success', slave_riak_services, 'join') -slave_riak_services.add_reacts('leave/success', slave_riak_services, 'join') -slave_riak_services.add_react('run/success', riak_services.take(0), 'commit') +def setup_riak(): + db.clear() + + nodes = template.nodes_from('templates/riak_nodes.yaml') + + riak_services = nodes.on_each( + 'resources/riak_node', + args={ + 'riak_self_name': 'riak{num}', + 'riak_hostname': 'riak_server{num}.solar', + 'riak_name': 'riak{num}@riak_server{num}.solar', + } + ) + + slave_riak_services = riak_services.tail() + + riak_services.take(0).connect_list( + slave_riak_services, + mapping={ + 'riak_name': 'join_to', + } + ) + + hosts_files = nodes.on_each('resources/hosts_file') + + riak_services.connect_list_to_each( + hosts_files, + mapping={ + 'ip': 'hosts:ip', + 'riak_hostname': 'hosts:name', + }, + events=False + ) + + errors = resource.validate_resources() + for r, error in errors: + click.echo('ERROR: %s: %s' % (r.name, error)) + + if errors: + click.echo("ERRORS") + sys.exit(1) + + hosts_files.add_deps('run/success', riak_services, 'run') + slave_riak_services.add_reacts('run/success', slave_riak_services, 'join') + slave_riak_services.add_reacts('leave/success', slave_riak_services, 'join') + slave_riak_services.add_react('run/success', riak_services.take(0), 'commit') -haproxy_services = nodes.on_each( - 'resources/haproxy_service' -) -haproxy_configs = nodes.on_each( - 'resources/haproxy_config' -) -haproxy_service_configs_http = nodes.on_each( - 'resources/haproxy_service_config', - { - 'listen_port': 8098, - 'protocol': 'http', - } -) -haproxy_service_configs_pb = nodes.on_each( - 'resources/haproxy_service_config', - { - 'listen_port': 8087, - 'protocol': 'tcp', - } -) +def setup_haproxies(): + # TODO: VR loading needs to be supported, then we can do something like + # nodes = template.load('nodes') -riak_services.connect_list_to_each( - haproxy_service_configs_http, - { - 'riak_hostname': 'servers', - 'riak_port_http': 'ports', - } -) -riak_services.connect_list_to_each( - haproxy_service_configs_pb, - { - 'riak_hostname': 'servers', - 'riak_port_pb': 'ports', - } -) -haproxy_service_configs_http.connect_list( - haproxy_configs, - { - 'protocol': 'configs_protocols', - 'listen_port': 'listen_ports', - 'name': 'configs_names', - 'servers': 'configs', - 'ports': 'configs_ports', - } -) -haproxy_service_configs_pb.connect_list( - haproxy_configs, - { - 'protocol': 'configs_protocols', - 'listen_port': 'listen_ports', - 'name': 'configs_names', - 'servers': 'configs', - 'ports': 'configs_ports', - } -) -haproxy_configs.connect_list( - haproxy_services, - { - 'listen_ports': 'ports', - } -) + nodes = template.ResourceListTemplate([ + resource.load('node1'), + resource.load('node2'), + resource.load('node3'), + ]) + riak_services = template.ResourceListTemplate([ + resource.load('riak_node-0'), + resource.load('riak_node-1'), + resource.load('riak_node-2'), + ]) -nodes.add_reacts('run/success', haproxy_services, 'install') -haproxy_services.add_deps('install/success', haproxy_configs, 'run') -haproxy_configs.add_reacts('run/success', haproxy_services, 'run') -haproxy_configs.add_reacts('update/success', haproxy_services, 'update') + haproxy_services = nodes.on_each( + 'resources/haproxy_service' + ) + haproxy_configs = nodes.on_each( + 'resources/haproxy_config' + ) + haproxy_service_configs_http = nodes.on_each( + 'resources/haproxy_service_config', + { + 'listen_port': 8098, + 'protocol': 'http', + } + ) + haproxy_service_configs_pb = nodes.on_each( + 'resources/haproxy_service_config', + { + 'listen_port': 8087, + 'protocol': 'tcp', + } + ) + + riak_services.connect_list_to_each( + haproxy_service_configs_http, + { + 'riak_hostname': 'backends:server', + 'riak_port_http': 'backends:port', + } + ) + riak_services.connect_list_to_each( + haproxy_service_configs_pb, + { + 'riak_hostname': 'backends:server', + 'riak_port_pb': 'backends:port', + } + ) + haproxy_service_configs_http.connect_list( + haproxy_configs, + { + 'backends': 'config:backends', + 'listen_port': 'config:listen_port', + 'protocol': 'config:protocol', + 'name': 'config:name', + } + ) + haproxy_service_configs_pb.connect_list( + haproxy_configs, + { + 'backends': 'config:backends', + 'listen_port': 'config:listen_port', + 'protocol': 'config:protocol', + 'name': 'config:name', + } + ) + + #nodes.add_reacts('run/success', haproxy_services, 'install') + haproxy_services.add_deps('run/success', haproxy_configs, 'run') + haproxy_configs.add_reacts('run/success', haproxy_services, 'apply_config') + haproxy_configs.add_reacts('update/success', haproxy_services, 'apply_config') + + errors = resource.validate_resources() + for r, error in errors: + click.echo('ERROR: %s: %s' % (r.name, error)) + + if errors: + click.echo("ERRORS") + sys.exit(1) + + +@click.group() +def main(): + pass + + +@click.command() +def deploy(): + setup_riak() + + +@click.command() +def add_haproxies(): + setup_haproxies() + + +@click.command() +def undeploy(): + raise NotImplemented("Not yet") + + +main.add_command(deploy) +main.add_command(undeploy) +main.add_command(add_haproxies) + + +if __name__ == '__main__': + main() diff --git a/examples/riak/riaks.py b/examples/riak/riaks.py index 3ad0cbe..e4a93e7 100644 --- a/examples/riak/riaks.py +++ b/examples/riak/riaks.py @@ -1,5 +1,10 @@ +#!/usr/bin/env python + # To run: # python example-riaks.py deploy +# solar changes stage +# solar changes process +# solar orch run-once last # python example-riaks.py add_haproxies # solar changes stage # solar changes process @@ -45,7 +50,7 @@ def setup_riak(): signals.connect(nodes[i], riak) for i, riak in enumerate(riak_services[1:]): - signals.connect(riak_services[0], riak, {'riak_name': 'join_to'}, events=None) + signals.connect(riak_services[0], riak, {'riak_name': 'join_to'}) hosts_services = [] for i, riak in enumerate(riak_services): @@ -62,21 +67,13 @@ def setup_riak(): 'ip': 'hosts:ip'}, events=False) + errors = resource.validate_resources() + for r, error in errors: + click.echo('ERROR: %s: %s' % (r.name, error)) has_errors = False - for r in locals().values(): - # TODO: handle list - if not isinstance(r, resource.Resource): - continue - - # print 'Validating {}'.format(r.name) - local_errors = validation.validate_resource(r) - if local_errors: - has_errors = True - print 'ERROR: %s: %s' % (r.name, local_errors) - - if has_errors: - print "ERRORS" + if errors: + click.echo("ERRORS") sys.exit(1) events = [ @@ -109,7 +106,7 @@ def setup_riak(): for event in events: add_event(event) - print 'Use solar changes process & orch' + click.echo('Use solar changes process & orch') sys.exit(0) @@ -219,6 +216,7 @@ def main(): def deploy(): setup_riak() + @click.command() def add_haproxies(): setup_haproxies() From 6402043ceaadb592372140703ab8b603e0f452a3 Mon Sep 17 00:00:00 2001 From: Przemyslaw Kaminski Date: Fri, 18 Sep 2015 11:46:37 +0200 Subject: [PATCH 07/17] riaks: node name fix --- templates/riak_nodes.yaml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/templates/riak_nodes.yaml b/templates/riak_nodes.yaml index 97e0c09..57cce6d 100644 --- a/templates/riak_nodes.yaml +++ b/templates/riak_nodes.yaml @@ -4,17 +4,20 @@ resources: from: resources/ro_node values: ip: '10.0.0.3' + name: 'node1' ssh_key: '/vagrant/.vagrant/machines/solar-dev1/virtualbox/private_key' ssh_user: 'vagrant' - id: node2 from: resources/ro_node values: ip: '10.0.0.4' + name: 'node2' ssh_key: '/vagrant/.vagrant/machines/solar-dev2/virtualbox/private_key' ssh_user: 'vagrant' - id: node3 from: resources/ro_node values: ip: '10.0.0.5' + name: 'node3' ssh_key: '/vagrant/.vagrant/machines/solar-dev3/virtualbox/private_key' ssh_user: 'vagrant' From 7d6e663a5f1581664e5bd677250a5fe422ce3d1d Mon Sep 17 00:00:00 2001 From: Przemyslaw Kaminski Date: Fri, 18 Sep 2015 12:10:48 +0200 Subject: [PATCH 08/17] riaks: fix names for haproxy --- examples/riak/riaks-template.py | 2 ++ resources/ro_node/meta.yaml | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/examples/riak/riaks-template.py b/examples/riak/riaks-template.py index 9708739..204d967 100644 --- a/examples/riak/riaks-template.py +++ b/examples/riak/riaks-template.py @@ -89,6 +89,7 @@ def setup_haproxies(): { 'listen_port': 8098, 'protocol': 'http', + 'name': 'riak_haproxy_http{num}', } ) haproxy_service_configs_pb = nodes.on_each( @@ -96,6 +97,7 @@ def setup_haproxies(): { 'listen_port': 8087, 'protocol': 'tcp', + 'name': 'riak_haproxy_pb{num}', } ) diff --git a/resources/ro_node/meta.yaml b/resources/ro_node/meta.yaml index d17c1ee..e3451f6 100644 --- a/resources/ro_node/meta.yaml +++ b/resources/ro_node/meta.yaml @@ -14,4 +14,4 @@ input: value: name: schema: str - value: a node + value: From 8f7aca2e053af461957d0a8fc9266637a0603758 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C5=81ukasz=20Ole=C5=9B?= Date: Fri, 28 Aug 2015 14:24:57 +0000 Subject: [PATCH 09/17] Riak cluster as VirtualResource --- templates/riak_cluster.yml | 101 +++++++++++++++++++++++++++++++++++++ 1 file changed, 101 insertions(+) create mode 100644 templates/riak_cluster.yml diff --git a/templates/riak_cluster.yml b/templates/riak_cluster.yml new file mode 100644 index 0000000..16d4adb --- /dev/null +++ b/templates/riak_cluster.yml @@ -0,0 +1,101 @@ +id: riak_node + +resources: +{% for i in range(idx|int) %} + - id: riak_service_{{i}} + from: resources/riak_node + values: + riak_self_name: 'riak{{i}}' + riak_hostname: 'riak_server{{i}}.solar' + riak_name: 'riak{{i}}@riak_server{{i}}.solar' + ip: '{{nodes[i]}}::ip' + ssh_user: '{{nodes[i]}}::ssh_user' + ssh_key: '{{nodes[i]}}::ssh_key' +{% endfor %} + +{% for i in range(idx|int) %} + - id: hosts_file{{i}} + from: resources/hosts_file + values: + hosts_names: + {% for j in range(idx|int) %} + - riak_service_{{j}}::riak_hostname + {% endfor %} + hosts_ips: + {% for j in range(idx|int) %} + - riak_service_{{j}}::ip + {% endfor %} + ip: '{{nodes[i]}}::ip' + ssh_user: '{{nodes[i]}}::ssh_user' + ssh_key: '{{nodes[i]}}::ssh_key' +{% endfor %} + + +{% for i in range(idx|int) %} + - id: haproxy_service_config_http{{i}} + from: resources/haproxy_service_config + values: + listen_port: 8098 + protocol: 'http' + name: 'riak_haproxy_http{{i}}' + servers: + {% for j in range(idx|int) %} + - riak_service_{{j}}::riak_hostname + {% endfor %} + ports: + {% for j in range(idx|int) %} + - riak_service_{{j}}::riak_port_http + {% endfor %} +{% endfor %} + +{% for i in range(idx|int) %} + - id: haproxy_service_config_pb{{i}} + from: resources/haproxy_service_config + values: + listen_port: 8087 + protocol: 'tcp' + name: 'riak_haproxy_pb{{i}}' + servers: + {% for j in range(idx|int) %} + - riak_service_{{j}}::riak_hostname + {% endfor %} + ports: + {% for j in range(idx|int) %} + - riak_service_{{j}}::riak_port_pb + {% endfor %} +{% endfor %} + +{% for i in range(idx|int) %} + - id: haproxy_config{{i}} + from: resources/haproxy_config + values: + configs_protocols: + - haproxy_service_config_http{{i}}::protocol + - haproxy_service_config_pb{{i}}::protocol + listen_ports: + - haproxy_service_config_http{{i}}::listen_port + - haproxy_service_config_pb{{i}}::listen_port + configs_names: + - haproxy_service_config_http{{i}}::name + - haproxy_service_config_pb{{i}}::name + configs: + - haproxy_service_config_http{{i}}::servers + - haproxy_service_config_pb{{i}}::servers + configs_ports: + - haproxy_service_config_http{{i}}::ports + - haproxy_service_config_pb{{i}}::ports + ip: '{{nodes[i]}}::ip' + ssh_user: '{{nodes[i]}}::ssh_user' + ssh_key: '{{nodes[i]}}::ssh_key' +{% endfor %} + +{% for i in range(idx|int) %} + - id: haproxy_service{{i}} + from: resources/haproxy_service + values: + ports: + - haproxy_config{{i}}::listen_ports + ip: '{{nodes[i]}}::ip' + ssh_user: '{{nodes[i]}}::ssh_user' + ssh_key: '{{nodes[i]}}::ssh_key' +{% endfor %} From 35b0fb3a854edc337af922ba6200f8dd58888c1a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C5=81ukasz=20Ole=C5=9B?= Date: Fri, 18 Sep 2015 12:33:48 +0200 Subject: [PATCH 10/17] Improve VirtualResources - add support for events - refactor code after orm changes --- templates/riak_cluster.yml | 77 ++++++++++++++++++++++++++++++++------ 1 file changed, 65 insertions(+), 12 deletions(-) diff --git a/templates/riak_cluster.yml b/templates/riak_cluster.yml index 16d4adb..f292ab4 100644 --- a/templates/riak_cluster.yml +++ b/templates/riak_cluster.yml @@ -1,13 +1,24 @@ id: riak_node resources: -{% for i in range(idx|int) %} - - id: riak_service_{{i}} + - id: riak_service0 + from: resources/riak_node + values: + riak_self_name: 'riak0' + riak_hostname: 'riak_server0.solar' + riak_name: 'riak0@riak_server0.solar' + ip: '{{nodes[0]}}::ip' + ssh_user: '{{nodes[0]}}::ssh_user' + ssh_key: '{{nodes[0]}}::ssh_key' + +{% for i in range(1, idx|int) %} + - id: riak_service{{i}} from: resources/riak_node values: riak_self_name: 'riak{{i}}' riak_hostname: 'riak_server{{i}}.solar' riak_name: 'riak{{i}}@riak_server{{i}}.solar' + join_to: 'riak_service0::riak_name' ip: '{{nodes[i]}}::ip' ssh_user: '{{nodes[i]}}::ssh_user' ssh_key: '{{nodes[i]}}::ssh_key' @@ -17,20 +28,19 @@ resources: - id: hosts_file{{i}} from: resources/hosts_file values: - hosts_names: + hosts:name: {% for j in range(idx|int) %} - - riak_service_{{j}}::riak_hostname + - riak_service{{j}}::riak_hostname::NO_EVENTS {% endfor %} - hosts_ips: + hosts:ip: {% for j in range(idx|int) %} - - riak_service_{{j}}::ip + - riak_service{{j}}::ip::NO_EVENTS {% endfor %} ip: '{{nodes[i]}}::ip' ssh_user: '{{nodes[i]}}::ssh_user' ssh_key: '{{nodes[i]}}::ssh_key' {% endfor %} - {% for i in range(idx|int) %} - id: haproxy_service_config_http{{i}} from: resources/haproxy_service_config @@ -40,11 +50,11 @@ resources: name: 'riak_haproxy_http{{i}}' servers: {% for j in range(idx|int) %} - - riak_service_{{j}}::riak_hostname + - riak_service{{j}}::riak_hostname {% endfor %} ports: {% for j in range(idx|int) %} - - riak_service_{{j}}::riak_port_http + - riak_service{{j}}::riak_port_http {% endfor %} {% endfor %} @@ -57,11 +67,11 @@ resources: name: 'riak_haproxy_pb{{i}}' servers: {% for j in range(idx|int) %} - - riak_service_{{j}}::riak_hostname + - riak_service{{j}}::riak_hostname {% endfor %} ports: {% for j in range(idx|int) %} - - riak_service_{{j}}::riak_port_pb + - riak_service{{j}}::riak_port_pb {% endfor %} {% endfor %} @@ -94,8 +104,51 @@ resources: from: resources/haproxy_service values: ports: - - haproxy_config{{i}}::listen_ports + - haproxy_config{{i}}::listen_ports::NO_EVENTS ip: '{{nodes[i]}}::ip' ssh_user: '{{nodes[i]}}::ssh_user' ssh_key: '{{nodes[i]}}::ssh_key' {% endfor %} + + +events: +{% for i in range(idx|int) %} + - type: depends_on + parent_action: 'hosts_file{{i}}.run' + state: 'success' + depend_action: 'riak_service{{i}}.run' +{% endfor %} + +{% for i in range(1, idx|int) %} + - type: react_on + parent_action: 'riak_service{{i}}.run' + state: 'success' + depend_action: 'riak_service{{i}}.join' + + - type: react_on + parent_action: 'riak_service{{i}}.leave' + state: 'success' + depend_action: 'riak_service{{i}}.join' + + - type: react_on + parent_action: 'riak_service{{i}}.join' + state: 'success' + depend_action: 'riak_service0.commit' +{% endfor %} + +{% for i in range(1, idx|int) %} + - type: depends_on + parent_action: 'haproxy_service{{i}}.run' + state: 'success' + depend_action: 'haproxy_config{{i}}.run' + + - type: react_on + parent_action: 'haproxy_config{{i}}.run' + state: 'success' + depend_action: 'haproxy_service{{i}}.apply_config' + + - type: react_on + parent_action: 'haprox_config{{i}}.update' + state: 'success' + depend_action: 'haproxy_service{{i}}.apply_config' +{% endfor %} From 58e717fe4c6ca6dfa5e26168c8861fca5e98f3c6 Mon Sep 17 00:00:00 2001 From: Przemyslaw Kaminski Date: Fri, 18 Sep 2015 12:40:00 +0200 Subject: [PATCH 11/17] Riak: yet another naming fix --- examples/riak/riaks-template.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/examples/riak/riaks-template.py b/examples/riak/riaks-template.py index 204d967..479aad3 100644 --- a/examples/riak/riaks-template.py +++ b/examples/riak/riaks-template.py @@ -84,7 +84,7 @@ def setup_haproxies(): haproxy_configs = nodes.on_each( 'resources/haproxy_config' ) - haproxy_service_configs_http = nodes.on_each( + haproxy_service_configs_http = riak_services.on_each( 'resources/haproxy_service_config', { 'listen_port': 8098, @@ -92,7 +92,7 @@ def setup_haproxies(): 'name': 'riak_haproxy_http{num}', } ) - haproxy_service_configs_pb = nodes.on_each( + haproxy_service_configs_pb = riak_services.on_each( 'resources/haproxy_service_config', { 'listen_port': 8087, From 2fff44235b0611f2e827c535c14b21d1f05e5bb1 Mon Sep 17 00:00:00 2001 From: Dmitry Shulyak Date: Sun, 20 Sep 2015 11:04:10 +0300 Subject: [PATCH 12/17] Fix build_edges routing to take into account order between events - Previously order between events for same resource wasnt used - Unit test that shows this behaviour will be made green --- .gitignore | 1 + 1 file changed, 1 insertion(+) diff --git a/.gitignore b/.gitignore index 7feedf8..f81252a 100644 --- a/.gitignore +++ b/.gitignore @@ -36,3 +36,4 @@ vagrant-settings.yaml .solar_cli_uids .ssh/ +.cache From 7c250520ff8f09f04bc085f17021629049d34073 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C5=81ukasz=20Ole=C5=9B?= Date: Mon, 21 Sep 2015 18:09:34 +0200 Subject: [PATCH 13/17] Remove unused input `ports` --- resources/haproxy_service/meta.yaml | 3 --- 1 file changed, 3 deletions(-) diff --git a/resources/haproxy_service/meta.yaml b/resources/haproxy_service/meta.yaml index fac7c86..361a4b4 100644 --- a/resources/haproxy_service/meta.yaml +++ b/resources/haproxy_service/meta.yaml @@ -5,9 +5,6 @@ input: ip: schema: str! value: - ports: - schema: [[int]] - value: [] ssh_user: schema: str! value: From da96b3bc63bbd1a183246a06f4bedb9fe2005b14 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C5=81ukasz=20Ole=C5=9B?= Date: Mon, 21 Sep 2015 19:31:34 +0200 Subject: [PATCH 14/17] Update riak cluster example after changes is HAProxy resources --- templates/riak_cluster.yml | 25 ++++++++++--------------- 1 file changed, 10 insertions(+), 15 deletions(-) diff --git a/templates/riak_cluster.yml b/templates/riak_cluster.yml index f292ab4..a8b4596 100644 --- a/templates/riak_cluster.yml +++ b/templates/riak_cluster.yml @@ -48,11 +48,11 @@ resources: listen_port: 8098 protocol: 'http' name: 'riak_haproxy_http{{i}}' - servers: + backends:server: {% for j in range(idx|int) %} - riak_service{{j}}::riak_hostname {% endfor %} - ports: + backends:port: {% for j in range(idx|int) %} - riak_service{{j}}::riak_port_http {% endfor %} @@ -65,11 +65,11 @@ resources: listen_port: 8087 protocol: 'tcp' name: 'riak_haproxy_pb{{i}}' - servers: + backends:server: {% for j in range(idx|int) %} - riak_service{{j}}::riak_hostname {% endfor %} - ports: + backends:port: {% for j in range(idx|int) %} - riak_service{{j}}::riak_port_pb {% endfor %} @@ -79,21 +79,18 @@ resources: - id: haproxy_config{{i}} from: resources/haproxy_config values: - configs_protocols: + config:protocol: - haproxy_service_config_http{{i}}::protocol - haproxy_service_config_pb{{i}}::protocol - listen_ports: + config:listen_port: - haproxy_service_config_http{{i}}::listen_port - haproxy_service_config_pb{{i}}::listen_port - configs_names: + config:name: - haproxy_service_config_http{{i}}::name - haproxy_service_config_pb{{i}}::name - configs: - - haproxy_service_config_http{{i}}::servers - - haproxy_service_config_pb{{i}}::servers - configs_ports: - - haproxy_service_config_http{{i}}::ports - - haproxy_service_config_pb{{i}}::ports + config:backends: + - haproxy_service_config_http{{i}}::backends + - haproxy_service_config_pb{{i}}::backends ip: '{{nodes[i]}}::ip' ssh_user: '{{nodes[i]}}::ssh_user' ssh_key: '{{nodes[i]}}::ssh_key' @@ -103,8 +100,6 @@ resources: - id: haproxy_service{{i}} from: resources/haproxy_service values: - ports: - - haproxy_config{{i}}::listen_ports::NO_EVENTS ip: '{{nodes[i]}}::ip' ssh_user: '{{nodes[i]}}::ssh_user' ssh_key: '{{nodes[i]}}::ssh_key' From 6f3be2bf081e1804421cde4f7ee223e5629f7019 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C5=81ukasz=20Ole=C5=9B?= Date: Tue, 22 Sep 2015 18:53:21 +0200 Subject: [PATCH 15/17] fix typo --- templates/riak_cluster.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/templates/riak_cluster.yml b/templates/riak_cluster.yml index a8b4596..288eb47 100644 --- a/templates/riak_cluster.yml +++ b/templates/riak_cluster.yml @@ -143,7 +143,7 @@ events: depend_action: 'haproxy_service{{i}}.apply_config' - type: react_on - parent_action: 'haprox_config{{i}}.update' + parent_action: 'haproxy_config{{i}}.update' state: 'success' depend_action: 'haproxy_service{{i}}.apply_config' {% endfor %} From 423a08fe231efe2dd03f91d3a7e63e9880548fe5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C5=81ukasz=20Ole=C5=9B?= Date: Tue, 22 Sep 2015 18:59:15 +0200 Subject: [PATCH 16/17] Move VR for riak to riak example dir --- templates/riak_cluster.yml => examples/riak/riak_cluster.yaml | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename templates/riak_cluster.yml => examples/riak/riak_cluster.yaml (100%) diff --git a/templates/riak_cluster.yml b/examples/riak/riak_cluster.yaml similarity index 100% rename from templates/riak_cluster.yml rename to examples/riak/riak_cluster.yaml From c0a9b404d99368c7f02c212a06abb4edce16ca94 Mon Sep 17 00:00:00 2001 From: Dmitry Shulyak Date: Wed, 23 Sep 2015 16:14:17 +0300 Subject: [PATCH 17/17] Add tox.ini --- .gitignore | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.gitignore b/.gitignore index f81252a..000e943 100644 --- a/.gitignore +++ b/.gitignore @@ -37,3 +37,5 @@ vagrant-settings.yaml .ssh/ .cache + +.tox