[CE-185][CE-191] Fix build target change errors

Fabric build target docker has been reduced not to build zookeeper, kafka and couchdb images. This change breaks the ansible agent when deployer wants to use ansible agent to build fabric off of the latest code, since the build now does not produce these images, during the deployment process, these docker images will be missing. This change will allow a deployer to specify image tags for zookeeper, kafka, couchdb and fabric-ca. This change will also upgrade the default fabric release to 1.0.5 which was described in [CE-185] Change-Id: Idbb93c73a2d187591be598b13b704ac48f59dcba Signed-off-by: tongliofcary <litong01@us.ibm.com>
hyperledger-cello · Dec 13, 2017 · 3bcb3e3 · 3bcb3e3
1 parent c0cefd0
commit 3bcb3e3
Show file tree

Hide file tree

Showing 12 changed files with 33 additions and 23 deletions.
diff --git a/scripts/worker_node/download_images.sh b/scripts/worker_node/download_images.sh
@@ -14,10 +14,10 @@ fi
 
 # pull fabric images
 ARCH=`uname -m | sed 's|i686|x86|' | sed 's|x86_64|x64|'`
-BASEIMAGE_RELEASE=0.3.1
-BASE_VERSION=1.0.0
-PROJECT_VERSION=1.0.0
-IMG_TAG=1.0.0
+BASEIMAGE_RELEASE=0.3.2
+BASE_VERSION=1.0.5
+PROJECT_VERSION=1.0.5
+IMG_TAG=1.0.5
 
 echo_b "Downloading fabric images from DockerHub...with tag = ${IMG_TAG}... need a while"
 # TODO: we may need some checking on pulling result?

diff --git a/src/agent/ansible/roles/deploy_compose/fabricsetup/tasks/apply.yml b/src/agent/ansible/roles/deploy_compose/fabricsetup/tasks/apply.yml
@@ -30,7 +30,7 @@
     clihost: ""
     filterstr: ""
     thetag: "{{ rawarch.stdout + '-' + fabric.baseimage_tag }}"
-    catag: "{{ rawarch.stdout + '-' + fabric.ca.tag }}"
+    helpertag: "{{ rawarch.stdout + '-' + fabric.helper_tag }}"
 
 - name: Make sure that working directory is clean
   become: true

diff --git a/src/agent/ansible/roles/deploy_compose/fabricsetup/templates/ca-compose.j2 b/src/agent/ansible/roles/deploy_compose/fabricsetup/templates/ca-compose.j2
@@ -6,7 +6,7 @@ services:
 {% for ca in cas %}
   {{ ca.name }}:
     container_name: {{ ca.name}}
-    image: hyperledger/fabric-ca:{{ catag }}
+    image: hyperledger/fabric-ca:{{ (fabric.helper_tag == "") | ternary(thetag, helpertag) }}
     network_mode: bridge
     hostname: {{ ca.name}}
     environment:

diff --git a/src/agent/ansible/roles/deploy_compose/fabricsetup/templates/kafka-compose.j2 b/src/agent/ansible/roles/deploy_compose/fabricsetup/templates/kafka-compose.j2
@@ -6,7 +6,7 @@ services:
 {% for kafka in kafkas %}
   {{ kafka }}:
     container_name: {{ kafka }}
-    image: hyperledger/fabric-kafka:{{ thetag }}
+    image: hyperledger/fabric-kafka:{{ (fabric.helper_tag == "") | ternary(thetag, helpertag) }}
     restart: always
     network_mode: bridge
     hostname: {{ kafka }}

diff --git a/src/agent/ansible/roles/deploy_compose/fabricsetup/templates/peer-compose.j2 b/src/agent/ansible/roles/deploy_compose/fabricsetup/templates/peer-compose.j2
@@ -7,7 +7,7 @@ services:
 {% if fabric.peer_db == 'CouchDB' %}
   couchdb-{{ peer.name }}:
     container_name: couchdb-{{ peer.name }}
-    image: hyperledger/fabric-couchdb:{{ thetag }}
+    image: hyperledger/fabric-couchdb:{{ (fabric.helper_tag == "") | ternary(thetag, helpertag) }}
     network_mode: bridge
     hostname: couchdb-{{ peer.name }}
 {% endif %}

diff --git a/src/agent/ansible/roles/deploy_compose/fabricsetup/templates/zookeeper-compose.j2 b/src/agent/ansible/roles/deploy_compose/fabricsetup/templates/zookeeper-compose.j2
@@ -6,7 +6,7 @@ services:
 {% for zookeeper in zookeepers %}
   {{ zookeeper }}:
     container_name: {{ zookeeper }}
-    image: hyperledger/fabric-zookeeper:{{ thetag }}
+    image: hyperledger/fabric-zookeeper:{{ (fabric.helper_tag == "") | ternary(thetag, helpertag) }}
     network_mode: bridge
     hostname: {{ zookeeper }}
     restart: always

diff --git a/src/agent/ansible/roles/deploy_k8s/fabricsetup/tasks/apply.yml b/src/agent/ansible/roles/deploy_k8s/fabricsetup/tasks/apply.yml
@@ -29,7 +29,7 @@
     allpeers: "{{ [] }}"
     clihost: ""
     thetag: "{{ rawarch.stdout + '-' + fabric.baseimage_tag }}"
-    catag: "{{ rawarch.stdout + '-' + fabric.ca.tag }}"
+    helpertag: "{{ rawarch.stdout + '-' + fabric.helper_tag }}"
     filterstr: ""
     k8s_server: "{{ hostvars[groups['allnodes'][0]].private_ip }}"
 

diff --git a/src/agent/ansible/roles/deploy_k8s/fabricsetup/templates/fabric-pod.j2 b/src/agent/ansible/roles/deploy_k8s/fabricsetup/templates/fabric-pod.j2
@@ -15,7 +15,7 @@ spec:
   restartPolicy: Always
   containers:
     - name: {{ zookeeper }}
-      image: hyperledger/fabric-zookeeper:{{ thetag }}
+      image: hyperledger/fabric-zookeeper:{{ (fabric.helper_tag == "") | ternary(thetag, helpertag) }}
       imagePullPolicy: IfNotPresent
       env:
         - { name: "ZOO_MY_ID", value: "{{ zoo_ids[zookeeper] }}" }
@@ -53,7 +53,7 @@ spec:
   restartPolicy: Always
   containers:
     - name: {{ kafka }}
-      image: hyperledger/fabric-kafka:{{ thetag }}
+      image: hyperledger/fabric-kafka:{{ (fabric.helper_tag == "") | ternary(thetag, helpertag) }}
       imagePullPolicy: IfNotPresent
       env:
         - { name: "KAFKA_MESSAGE_MAX_BYTES", value: "103809024" }
@@ -96,7 +96,7 @@ spec:
         path: {{ fabricworkdir }}/run/keyfiles/{{ ca.org }}
   containers:
     - name: {{ ca.name }}
-      image: hyperledger/fabric-ca:{{ catag }}
+      image: hyperledger/fabric-ca:{{ (fabric.helper_tag == "") | ternary(thetag, helpertag) }}
       imagePullPolicy: IfNotPresent
       env:
         - { name: "FABRIC_CA_HOME", value: "/etc/hyperledger/fabric-ca-server-config/ca" }
@@ -152,7 +152,7 @@ spec:
   containers:
 {% if fabric.peer_db == 'CouchDB' %}
     - name: couchdb-{{ peer.name }}
-      image: hyperledger/fabric-couchdb:{{ thetag }}
+      image: hyperledger/fabric-couchdb:{{ (fabric.helper_tag == "") | ternary(thetag, helpertag) }}
       imagePullPolicy: IfNotPresent
       securityContext:
         privileged: true

diff --git a/src/agent/ansible/vars/bc1st.yml b/src/agent/ansible/vars/bc1st.yml
@@ -5,7 +5,9 @@ GIT_URL: "http://gerrit.hyperledger.org/r/fabric"
 # The gerrit patch set reference, should be automatically set by gerrit
 # GERRIT_REFSPEC: "refs/changes/23/11523/3" # 1.0.0
 # GERRIT_REFSPEC: "refs/changes/47/12047/3" # 1.0.1
-GERRIT_REFSPEC: "refs/changes/13/13113/1"
+# GERRIT_REFSPEC: "refs/changes/13/13113/1"
+# GERRIT_REFSPEC: "refs/tags/v1.0.4" # 1.0.4
+GERRIT_REFSPEC: "refs/tags/v1.0.5" # 1.0.5
 
 # This variable defines fabric network attributes
 fabric: {
@@ -48,6 +50,8 @@ fabric: {
     }
   },
 
-  baseimage_tag: "1.0.2",
-  ca: { tag: "1.0.2", admin: "admin", adminpw: "adminpw" }
+  baseimage_tag: "1.0.5",
+  # This tag defines image tag for containers such as kafka, zookeeper and couchdb
+  helper_tag: "",
+  ca: { admin: "admin", adminpw: "adminpw" }
 }
diff --git a/src/agent/ansible/vars/bc2nd.yml b/src/agent/ansible/vars/bc2nd.yml
@@ -16,12 +16,14 @@ fabric: {
   network: {
     fabric001: {
       peers: ["leader@peer1st.mad","anchor@peer2nd.mad"],
-      orderers: ["1storderer.sin"],
+      orderers: ["orderer1st.sin"],
       zookeepers: ["zookeeper1st"],
       kafkas: ["kafka1st"]
     }
   },
 
-  baseimage_tag: "1.0.2",
-  ca: { tag: "1.0.2", admin: "admin", adminpw: "adminpw" }
+  baseimage_tag: "1.0.5",
+  # This tag defines image tag for containers such as kafka, zookeeper and couchdb
+  helper_tag: "",
+  ca: { admin: "admin", adminpw: "adminpw" }
 }
diff --git a/src/agent/ansible/vars/vb.yml b/src/agent/ansible/vars/vb.yml
diff --git a/src/agent/ansible/vars/vb1st.yml b/src/agent/ansible/vars/vb1st.yml
@@ -5,7 +5,9 @@ GIT_URL: "http://gerrit.hyperledger.org/r/fabric"
 # The gerrit patch set reference, should be automatically set by gerrit
 # GERRIT_REFSPEC: "refs/changes/23/11523/3" # 1.0.0
 # GERRIT_REFSPEC: "refs/changes/47/12047/3" # 1.0.1
-GERRIT_REFSPEC: "refs/changes/13/13113/1"
+# GERRIT_REFSPEC: "refs/changes/13/13113/1"
+# GERRIT_REFSPEC: "refs/tags/v1.0.4" # 1.0.4
+GERRIT_REFSPEC: "refs/tags/v1.0.5" # 1.0.5
 
 # This variable defines fabric network attributes
 fabric: {
@@ -41,6 +43,8 @@ fabric: {
     }
   },
 
-  baseimage_tag: "1.0.2",
-  ca: { tag: "1.0.2", admin: "admin", adminpw: "adminpw" }
+  baseimage_tag: "1.0.5",
+  # This tag defines image tag for containers such as kafka, zookeeper and couchdb
+  helper_tag: "",
+  ca: { admin: "admin", adminpw: "adminpw" }
 }