chore: ansible improvements

ansible/ansible.cfg

@@ -4,6 +4,8 @@ host_key_checking = False
 gather_timeout = 20
 timeout = 50
 forks = 20
+stdout_callback = yaml
+bin_ansible_callbacks = True
 
 [ssh_connection]
 ssh_args = "-o ControlMaster=auto -o ControlPersist=60s"

ansible/roles/dashd/tasks/main.yml

@@ -51,6 +51,7 @@
     - '{{ dashd_home }}:/dash'
     network_mode: host
     command: 'dashd -conf={{ dashd_home }}/.dashcore/dash.conf -datadir={{ dashd_home }}/.dashcore'
+    container_default_behavior: compatibility
 
 - name: wait for rpc to be available
   shell: dash-cli getblockchaininfo

ansible/roles/insight/tasks/main.yml

@@ -19,12 +19,12 @@
     state: present
     restarted: yes
     pull: yes
-
+  register: output
 
 - name: check Insight container
   assert:
-    that: 'insight.insight.state.running'
+    that: 'output.services.insight.insight.state.running'
 
 - name: check Insight Proxy container
   assert:
-    that: 'insight_proxy.insight_proxy.state.running'
+    that: 'output.services.insight_proxy.insight_proxy.state.running'

lib/cli/services.sh

@@ -13,7 +13,7 @@ function services_list() {
 
     cd terraform/aws
 
-    terraform output services
+    terraform output -raw services
 
     cd ../..
 }

lib/cli/terraform.sh

@@ -59,7 +59,7 @@ function terraform_run_command() {
 
     # Create the inventory file for Ansible
 
-    terraform output ansible_inventory > ../../${INVENTORY_FILE}
+    terraform output -raw ansible_inventory > ../../${INVENTORY_FILE}
 
     cd ../../
 }
@@ -74,7 +74,7 @@ function terraform_output_inventory() {
 
         terraform workspace select "$NETWORK_NAME"
 
-        terraform output ansible_inventory > ../../${INVENTORY_FILE}
+        terraform output -raw ansible_inventory > ../../${INVENTORY_FILE}
 
         echo "Ansible inventory file successfully created."
 

lib/configGenerator/generateAnsibleConfig.js

@@ -2,7 +2,7 @@ const fs = require('fs').promises;
 
 const { PrivateKey } = require('@dashevo/dashcore-lib');
 
-const { PrivateKey: BlsPrivateKey } = require('bls-signatures');
+const BlsSignatures = require('bls-signatures');
 
 const yaml = require('js-yaml');
 
@@ -71,6 +71,9 @@ async function generateAnsibleConfig(network, networkName, masternodesCount, see
     const ownerPrivateKey = new PrivateKey(undefined, network);
     const collateralPrivateKey = new PrivateKey(undefined, network);
 
+    const blsSignatures = await BlsSignatures();
+    const { PrivateKey: BlsPrivateKey } = blsSignatures;
+
     const randomBytes = new Uint8Array(crypto.randomBytes(256));
     const operatorPrivateKey = BlsPrivateKey.fromBytes(randomBytes, true);
     const operatorPublicKey = operatorPrivateKey.getPublicKey();
@@ -129,7 +132,7 @@ async function generateAnsibleConfig(network, networkName, masternodesCount, see
     config.seed_nodes[`seed-${i}`].node_key = generateTenderdashNodeKeys();
   }
 
-  const data = yaml.safeDump(config);
+  const data = yaml.dump(config);
 
   await fs.writeFile(`networks/${networkName}.yml`, `---\n\n${data}`);
 }

lib/test/readYamlFiles.js

@@ -9,7 +9,7 @@ const yaml = require('js-yaml');
 module.exports = function readYamlFiles(...files) {
   const objectsArray = files.map((file) => {
     const fileString = fs.readFileSync(file, 'utf8');
-    return yaml.safeLoad(fileString);
+    return yaml.load(fileString);
   });
 
   return merge(...objectsArray);

lib/test/wait.js

@@ -1,3 +1,3 @@
 module.exports = function wait(ms) {
-  return new Promise(res => setTimeout(res, ms));
+  return new Promise((res) => setTimeout(res, ms));
 };