Update ansible to use hyperledger-labs/fabric-ansible-collection

Signed-off-by: Tatsuya Sato <[email protected]>
hyperledger · Sep 29, 2023 · 992387c · 992387c
1 parent 764cbab
commit 992387c
Show file tree

Hide file tree

Showing 5 changed files with 23 additions and 23 deletions.
diff --git a/full-stack-asset-transfer-guide/infrastructure/kind_console_ingress/90-KIND-ingress.yml b/full-stack-asset-transfer-guide/infrastructure/kind_console_ingress/90-KIND-ingress.yml
@@ -5,6 +5,8 @@
     - name: Create kubernetes resources for the ingress
       k8s:
         definition: "{{ lookup('kubernetes.core.kustomize', dir='templates/ingress') }}"
+        #     shell: |
+        # kubectl apply -f templates/ingress
       register: resultingress
 
     - name: Wait for the ingress

diff --git a/...t-transfer-guide/infrastructure/kind_console_ingress/templates/ingress/kustomization.yaml b/...t-transfer-guide/infrastructure/kind_console_ingress/templates/ingress/kustomization.yaml
@@ -19,20 +19,18 @@ apiVersion: kustomize.config.k8s.io/v1beta1
 kind: Kustomization
 
 resources:
-  - https://github.com/kubernetes/ingress-nginx.git/deploy/static/provider/cloud?ref=controller-v1.1.2
+- https://github.com/kubernetes/ingress-nginx.git/deploy/static/provider/cloud?ref=controller-v1.1.2
 
-patchesStrategicMerge:
-  - ingress-nginx-controller.yaml
 
 # Remove the port `appProtocol` attribute as this is not accepted by all cloud providers
 patches:
-  - patch: |-
-      - op: remove
-        path: "/spec/ports/0/appProtocol"
-      - op: remove
-        path: "/spec/ports/1/appProtocol"
-    target:
-      kind: Service
-      name: ingress-nginx-controller
-      version: v1
-  - patch: ingress-nginx-controller.yaml
+- patch: |-
+    - op: remove
+      path: "/spec/ports/0/appProtocol"
+    - op: remove
+      path: "/spec/ports/1/appProtocol"
+  target:
+    kind: Service
+    name: ingress-nginx-controller
+    version: v1
+- path: ingress-nginx-controller.yaml
diff --git a/...ck-asset-transfer-guide/infrastructure/operator_console_playbooks/01-operator-install.yml b/...ck-asset-transfer-guide/infrastructure/operator_console_playbooks/01-operator-install.yml
@@ -10,4 +10,4 @@
     state: present
     wait_timeout: 3600
   roles:
-    - ibm.blockchain_platform.fabric_operator_crds
+    - hyperledger.fabric_ansible_collection.fabric_operator_crds
diff --git a/...ack-asset-transfer-guide/infrastructure/operator_console_playbooks/02-console-install.yml b/...ack-asset-transfer-guide/infrastructure/operator_console_playbooks/02-console-install.yml
@@ -10,4 +10,4 @@
     state: present
     wait_timeout: 3600
   roles:
-    - ibm.blockchain_platform.fabric_console
+    - hyperledger.fabric_ansible_collection.fabric_console
diff --git a/full-stack-asset-transfer-guide/justfile b/full-stack-asset-transfer-guide/justfile
@@ -339,7 +339,7 @@ ansible-ingress:
 
     docker run \
         --rm \
-        -v ${HOME}/.kube/:/home/ibp-user/.kube/ \
+        -v ${HOME}/.kube/:/home/hlf-user/.kube/ \
         -v ${CWDIR}/_cfg:/_cfg \
         -v $(pwd)/infrastructure/kind_console_ingress:/playbooks \
         --network=host ${EXTRAS} \
@@ -361,7 +361,7 @@ ansible-operator:
 
     docker run \
         --rm \
-        -v ${HOME}/.kube/:/home/ibp-user/.kube/ \
+        -v ${HOME}/.kube/:/home/hlf-user/.kube/ \
         -v ${CWDIR}/_cfg:/_cfg \
         -v $(pwd)/infrastructure/operator_console_playbooks:/playbooks ${EXTRAS} \
         --network=host \
@@ -380,7 +380,7 @@ ansible-console:
 
     docker run \
         --rm \
-        -v ${HOME}/.kube/:/home/ibp-user/.kube/ \
+        -v ${HOME}/.kube/:/home/hlf-user/.kube/ \
         -v $(pwd)/infrastructure/operator_console_playbooks:/playbooks  ${EXTRAS} \
         -v ${CWDIR}/_cfg:/_cfg \
         --network=host \
@@ -418,7 +418,7 @@ ansible-network: ansible-auth
     docker run \
         --rm \
         -u $(id -u) \
-        -v ${HOME}/.kube/:/home/ibp-user/.kube/ \
+        -v ${HOME}/.kube/:/home/hlf-user/.kube/ \
         -v ${CWDIR}/infrastructure/fabric_network_playbooks:/playbooks  ${EXTRAS} \
         -v ${CWDIR}/_cfg:/_cfg \
         --network=host \
@@ -469,7 +469,7 @@ ansible-deploy-chaincode:
     docker run \
         --rm \
         -u $(id -u) \
-        -v ${HOME}/.kube/:/home/ibp-user/.kube/ \
+        -v ${HOME}/.kube/:/home/hlf-user/.kube/ \
         -v ${CWDIR}/infrastructure/production_chaincode_playbooks:/playbooks ${EXTRAS} \
         -v ${CWDIR}/_cfg:/_cfg \
         --network=host \
@@ -479,7 +479,7 @@ ansible-deploy-chaincode:
     docker run \
         --rm \
         -u $(id -u) \
-        -v ${HOME}/.kube/:/home/ibp-user/.kube/ \
+        -v ${HOME}/.kube/:/home/hlf-user/.kube/ \
         -v ${CWDIR}/infrastructure/production_chaincode_playbooks:/playbooks ${EXTRAS} \
         -v ${CWDIR}/_cfg:/_cfg \
         --network=host \
@@ -489,7 +489,7 @@ ansible-deploy-chaincode:
     docker run \
         --rm \
         -u $(id -u) \
-        -v ${HOME}/.kube/:/home/ibp-user/.kube/ \
+        -v ${HOME}/.kube/:/home/hlf-user/.kube/ \
         -v ${CWDIR}/infrastructure/production_chaincode_playbooks:/playbooks ${EXTRAS} \
         -v ${CWDIR}/_cfg:/_cfg \
         --network=host \
@@ -509,7 +509,7 @@ ansible-ready-application:
     docker run \
         --rm \
         -u $(id -u) \
-        -v ${HOME}/.kube/:/home/ibp-user/.kube/ \
+        -v ${HOME}/.kube/:/home/hlf-user/.kube/ \
         -v ${CWDIR}/infrastructure/production_chaincode_playbooks:/playbooks ${EXTRAS} \
         -v ${CWDIR}/_cfg:/_cfg \
         --network=host \