Specify Docker hostnames in generated Ansible playbooks (resolves IBM…

…-Blockchain#223) Signed-off-by: Simon Stone <sstone1@uk.ibm.com>
sstone1 · Jan 21, 2020 · 5d44604 · 5d44604
1 parent f414770
commit 5d44604
Show file tree

Hide file tree

Showing 3 changed files with 18 additions and 0 deletions.
diff --git a/generators/network/templates/playbook.yml b/generators/network/templates/playbook.yml
@@ -27,6 +27,7 @@
             enabled: false
           docker:
             name: "<%= dockerName %>_ca.org<%= i %>.example.com"
+            hostname: "ca.org<%= i %>.example.com"
             port: <%= allocatePort() %>
         peers:
           - &Org<%= i %>Peer1
@@ -38,12 +39,14 @@
               enabled: false
             docker:
               name: "<%= dockerName %>_peer0.org<%= i %>.example.com"
+              hostname: "peer0.org<%= i %>.example.com"
               port: <%= allocatePort() %>
               chaincode_name_prefix: "<%= dockerName %>"
               chaincode_port: <%= allocatePort() %>
               operations_port: <%= allocatePort() %>
               couchdb:
                 name: "<%= dockerName %>_couchdb0.org<%= i %>.example.com"
+                hostname: "couchdb0.org<%= i %>.example.com"
                 port: <%= allocatePort() %>
         nodes: "{{ playbook_dir }}/nodes/Org<%= i %>"
         wallet: "{{ playbook_dir }}/wallets/Org<%= i %>"
@@ -63,6 +66,7 @@
             enabled: false
           docker:
             name: "<%= dockerName %>_ca.orderer.example.com"
+            hostname: "ca.orderer.example.com"
             port: <%= allocatePort() %>
         orderer: &Orderer
           id: "Orderer"
@@ -77,6 +81,7 @@
               <%_ } _%>
           docker:
             name: "<%= dockerName %>_orderer.example.com"
+            hostname: "orderer.example.com"
             port: <%= allocatePort() %>
             operations_port: <%= allocatePort() %>
         nodes: "{{ playbook_dir }}/nodes/Orderer"

diff --git a/test/one-org-network.yml b/test/one-org-network.yml
@@ -26,6 +26,7 @@
             enabled: false
           docker:
             name: "localfabric_ca.org1.example.com"
+            hostname: "ca.org1.example.com"
             port: 17050
         peers:
           - &Org1Peer1
@@ -37,12 +38,14 @@
               enabled: false
             docker:
               name: "localfabric_peer0.org1.example.com"
+              hostname: "peer0.org1.example.com"
               port: 17051
               chaincode_name_prefix: localfabric
               chaincode_port: 17052
               operations_port: 17053
               couchdb:
                 name: "localfabric_couchdb0.org1.example.com"
+                hostname: "couchdb0.org1.example.com"
                 port: 17054
         nodes: "{{ playbook_dir }}/nodes/Org1"
         wallet: "{{ playbook_dir }}/wallets/Org1"
@@ -61,6 +64,7 @@
             enabled: false
           docker:
             name: "localfabric_ca.orderer.example.com"
+            hostname: "ca.orderer.example.com"
             port: 17055
         orderer: &Orderer
           id: "Orderer"
@@ -73,6 +77,7 @@
               - *Org1
           docker:
             name: "localfabric_orderer.example.com"
+            hostname: "orderer.example.com"
             port: 17056
             operations_port: 17057
         nodes: "{{ playbook_dir }}/nodes/Orderer"

diff --git a/test/two-org-network.yml b/test/two-org-network.yml
@@ -26,6 +26,7 @@
             enabled: false
           docker:
             name: "localfabric_ca.org1.example.com"
+            hostname: "ca.org1.example.com"
             port: 17050
         peers:
           - &Org1Peer1
@@ -37,12 +38,14 @@
               enabled: false
             docker:
               name: "localfabric_peer0.org1.example.com"
+              hostname: "peer0.org1.example.com"
               port: 17051
               chaincode_name_prefix: localfabric
               chaincode_port: 17052
               operations_port: 17053
               couchdb:
                 name: "localfabric_couchdb0.org1.example.com"
+                hostname: "couchdb0.org1.example.com"
                 port: 17054
         nodes: "{{ playbook_dir }}/nodes/Org1"
         wallet: "{{ playbook_dir }}/wallets/Org1"
@@ -61,6 +64,7 @@
             enabled: false
           docker:
             name: "localfabric_ca.org2.example.com"
+            hostname: "ca.org2.example.com"
             port: 17055
         peers:
           - &Org2Peer1
@@ -72,12 +76,14 @@
               enabled: false
             docker:
               name: "localfabric_peer0.org2.example.com"
+              hostname: "peer0.org2.example.com"
               port: 17056
               chaincode_name_prefix: localfabric
               chaincode_port: 17057
               operations_port: 17058
               couchdb:
                 name: "localfabric_couchdb0.org2.example.com"
+                hostname: "couchdb0.org2.example.com"
                 port: 17059
         nodes: "{{ playbook_dir }}/nodes/Org2"
         wallet: "{{ playbook_dir }}/wallets/Org2"
@@ -96,6 +102,7 @@
             enabled: false
           docker:
             name: "localfabric_ca.orderer.example.com"
+            hostname: "ca.orderer.example.com"
             port: 17060
         orderer: &Orderer
           id: "Orderer"
@@ -109,6 +116,7 @@
               - *Org2
           docker:
             name: "localfabric_orderer.example.com"
+            hostname: "orderer.example.com"
             port: 17061
             operations_port: 17062
         nodes: "{{ playbook_dir }}/nodes/Orderer"