From 5a74ce27869989aa8893ab748b19b59fa898f894 Mon Sep 17 00:00:00 2001 From: Smirnov Alexey Date: Thu, 14 Feb 2019 19:02:44 +0300 Subject: [PATCH] fix templates --- .../ks/components/insolar/genesis.libsonnet | 58 +++++++++---------- .../manifests/ks/components/insolar/launch.sh | 20 +++---- .../ks/environments/dev/params.libsonnet | 39 +++++++------ 3 files changed, 57 insertions(+), 60 deletions(-) diff --git a/ci/local-dev/manifests/ks/components/insolar/genesis.libsonnet b/ci/local-dev/manifests/ks/components/insolar/genesis.libsonnet index 6df71f7580..55ca24e8c9 100644 --- a/ci/local-dev/manifests/ks/components/insolar/genesis.libsonnet +++ b/ci/local-dev/manifests/ks/components/insolar/genesis.libsonnet @@ -1,44 +1,44 @@ local base_params = import '../params.libsonnet'; -local params = std.mergePatch( base_params.components, std.extVar("__ksonnet/params").components ); +local params = std.mergePatch(base_params.components, std.extVar('__ksonnet/params').components); local utils = params.utils; local insolar_params = params.insolar; local make_min_roles() = { - virtual: 1, + virtual: 1, heavy_material: 1, - light_material: 1 + light_material: 1, }; { - // It generates nodes in particular order: 1) heavy_material 2) light_material 3) virtual - generate_genesis() :: { + // It generates nodes in particular order: 1) heavy_material 2) light_material 3) virtual + generate_genesis():: { - // common fields - root_keys_file: "/opt/insolar/config/root_member_keys.json", - root_balance: 1000000000, - majority_rule: 0, - min_roles: make_min_roles(), - pulsar_public_keys: [ "pulsar_public_key" ], + // common fields + root_keys_file: '/opt/insolar/config/root_member_keys.json', + node_keys_dir: '/opt/insolar/config/nodes', + discovery_keys_dir: '/opt/insolar/config/discovery', + keys_name_format: '/key-%02d.json', + root_balance: 1000000000, + majority_rule: 0, + min_roles: make_min_roles(), + pulsar_public_keys: ['pulsar_public_key'], - // generating discovery_nodes - local discovery_nodes_tmpl() = { - host: utils.host_template, - role: "%s", - keys_file: "/opt/insolar/config/nodes/keys/%s-%d.json", - cert_name: "%s-%d-cert.json" - }, + // generating discovery_nodes + local discovery_nodes_tmpl() = { + host: utils.host_template, + role: '%s', + cert_name: '%s-%d-cert.json', + }, - discovery_nodes: + discovery_nodes: [ - { - host: discovery_nodes_tmpl().host % [ id, insolar_params.tcp_transport_port ] , - keys_file: discovery_nodes_tmpl().keys_file % [ insolar_params.hostname, id ], - cert_name: discovery_nodes_tmpl().cert_name % [ insolar_params.hostname, id ], + { + host: discovery_nodes_tmpl().host % [id, insolar_params.tcp_transport_port], + cert_name: discovery_nodes_tmpl().cert_name % [insolar_params.hostname, id], - role: discovery_nodes_tmpl().role % utils.id_to_node_type( id ), - } - for id in std.range(0, utils.get_num_nodes - 1) - ] - } + role: discovery_nodes_tmpl().role % utils.id_to_node_type(id), + } + for id in std.range(0, utils.get_num_nodes - 1) + ], + }, } - diff --git a/ci/local-dev/manifests/ks/components/insolar/launch.sh b/ci/local-dev/manifests/ks/components/insolar/launch.sh index 51ee13d914..19805ca297 100644 --- a/ci/local-dev/manifests/ks/components/insolar/launch.sh +++ b/ci/local-dev/manifests/ks/components/insolar/launch.sh @@ -1,7 +1,8 @@ CONFIG_DIR=/opt/insolar/config GENESIS_CONFIG=$CONFIG_DIR/genesis.yaml NODES_DATA=$CONFIG_DIR/nodes -KEYS_DIR=$NODES_DATA/keys +DISCOVERY_KEYS=$CONFIG_DIR/discovery +CERTS_KEYS=$CONFIG_DIR/certs NUM_NODES=$(fgrep '"host":' $GENESIS_CONFIG | grep -cv "#" ) @@ -14,17 +15,12 @@ then echo "generate root member key" insolar -c gen_keys > $CONFIG_DIR/root_member_keys.json - echo "generate discovery node keys" - mkdir -vp $KEYS_DIR - for i in `seq 0 $((NUM_NODES-1))` - do - insolar -c gen_keys > $KEYS_DIR/seed-$i.json - done - echo "generate genesis" - mkdir -vp $NODES_DATA/certs + mkdir -vp $NODES_DATA + mkdir -vp $CERTS_KEYS mkdir -vp $CONFIG_DIR/data - insolard --config $CONFIG_DIR/insolar-genesis.yaml --genesis $GENESIS_CONFIG --keyout $NODES_DATA/certs + mkdir -vp $DISCOVERY_KEYS + insolard --config $CONFIG_DIR/insolar-genesis.yaml --genesis $GENESIS_CONFIG --keyout $CERTS_KEYS touch /opt/insolar/config/finished else while ! (/usr/bin/test -e /opt/insolar/config/finished) @@ -42,6 +38,6 @@ else echo "copy genesis" cp -vR $CONFIG_DIR/data /opt/work/ mkdir -vp /opt/work/config - cp -v $NODES_DATA/certs/$(ls $NODES_DATA/certs/ | grep $(hostname | sed 's/[^0-9]*//g')) /opt/work/config/node-cert.json - cp -v $KEYS_DIR/$(hostname).json /opt/work/config/node-keys.json + cp -v $CERTS_KEYS/$(hostname | awk -F'-' '{ printf "seed-%d-cert.json", $2 }') /opt/work/config/node-cert.json + cp -v $DISCOVERY_KEYS/$(hostname | awk -F'-' '{ printf "key-%02d.json", $2 }') /opt/work/config/node-keys.json fi diff --git a/ci/local-dev/manifests/ks/environments/dev/params.libsonnet b/ci/local-dev/manifests/ks/environments/dev/params.libsonnet index ad5c74c09f..5c3c74aaba 100644 --- a/ci/local-dev/manifests/ks/environments/dev/params.libsonnet +++ b/ci/local-dev/manifests/ks/environments/dev/params.libsonnet @@ -1,26 +1,27 @@ -local params = std.extVar("__ksonnet/params"); -local globals = import "globals.libsonnet"; -local envParams = params + { - components +: { - "insolar.insolar"+:{ - image+: { - image: "registry.insolar.io/insolard", - tag: "v0.7.6", - image_pull_policy: "IfNotPresent" - } - }, - "pulsar.insolar"+:{ - image+: { - image: "registry.insolar.io/insolard", - tag: "v0.7.6", - image_pull_policy: "IfNotPresent" - } - } +local params = std.extVar('__ksonnet/params'); +local globals = import 'globals.libsonnet'; +local envParams = params { + components+: { + 'insolar.insolar'+: { + image+: { + image: 'registry.insolar.io/insolard', + tag: 'f830c86', + image_pull_policy: 'IfNotPresent', + }, + }, + 'pulsar.insolar'+: { + image+: { + image: 'registry.insolar.io/insolard', + tag: 'f830c86', + image_pull_policy: 'IfNotPresent', + }, + }, }, }; { components: { - [x]: envParams.components[x] + globals, for x in std.objectFields(envParams.components) + [x]: envParams.components[x] + globals + for x in std.objectFields(envParams.components) }, }