-
Notifications
You must be signed in to change notification settings - Fork 724
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
[fabric] Update adding a new channel (#2452)
Primary Changes -------------- 1.Update adding a new channel playbook to be compatible with version 2.5.4 2.Fixed the bug with elimination of ServiceAccount and ClusterRoleBinding Modifications ----------------------- docs/source/archive/certificates/fabric.md platforms/hyperledger-fabric/charts/fabric-osnadmin-channel-create platforms/hyperledger-fabric/configuration/add-new-channel.yaml platforms/hyperledger-fabric/configuration/roles/create/channel_artifacts platforms/hyperledger-fabric/configuration/roles/create/genesis platforms/hyperledger-fabric/configuration/roles/create/new_orderer platforms/hyperledger-fabric/configuration/roles/create/new_organization/orderer_org/syschannel platforms/hyperledger-fabric/configuration/roles/create/orderers platforms/hyperledger-fabric/configuration/roles/create/osnchannels platforms/hyperledger-fabric/configuration/roles/create/refresh_certs/create_channel_block platforms/hyperledger-fabric/configuration/roles/delete/vault_secrets platforms/hyperledger-fabric/configuration/roles/upgrade/application-capabilities/tasks/orderer-group/update_block_orderer.yaml platforms/hyperledger-fabric/configuration/roles/upgrade/orderer-binary platforms/hyperledger-fabric/configuration/roles/upgrade/orderer-capabilities platforms/shared/configuration/roles/create/shared_helm_component/templates/vault_kubernetes_job.tpl fixes #2439 #2443 Signed-off-by: mgCepeda <marina.gomez.cepeda@accenture.com>
- Loading branch information
Showing
19 changed files
with
142 additions
and
55 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
43 changes: 43 additions & 0 deletions
43
...edger-fabric/configuration/roles/create/channel_artifacts/tasks/fetch_orderers_certs.yaml
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,43 @@ | ||
|
||
# Fetch msp files from Vault | ||
- name: Check if orderers tls certs already created | ||
shell: | | ||
vault kv get -field=server.crt {{ organization.vault.secret_path | default('secretsv2') }}/crypto/ordererOrganizations/{{ organization.name | lower }}-net/orderers/{{ orderer.name }}.{{ organization.name | lower }}-net/tls > server.crt | ||
mkdir -p ./build/crypto-config/ordererOrganizations/{{ organization.name | lower }}-net/orderers/{{ orderer.name }}.{{ organization.name | lower }}-net/tls | ||
mv server.crt ./build/crypto-config/ordererOrganizations/{{ organization.name | lower }}-net/orderers/{{ orderer.name }}.{{ organization.name | lower }}-net/tls | ||
environment: | ||
VAULT_ADDR: "{{ organization.vault.url }}" | ||
VAULT_TOKEN: "{{ organization.vault.root_token }}" | ||
loop: "{{ orderers }}" | ||
loop_control: | ||
loop_var: orderer | ||
|
||
# Fetch msp files from Vault | ||
- name: Check if msp admincerts already created | ||
shell: | | ||
vault kv get -field=admincerts {{ organization.vault.secret_path | default('secretsv2') }}/crypto/ordererOrganizations/{{ organization.name | lower }}-net/users/admin/msp > Admin@{{ organization.name | lower }}-net-cert.pem | ||
mkdir -p ./build/crypto-config/ordererOrganizations/{{ organization.name | lower }}-net/msp/admincerts/ | ||
mv Admin@{{ organization.name | lower }}-net-cert.pem ./build/crypto-config/ordererOrganizations/{{ organization.name | lower }}-net/msp/admincerts/ | ||
environment: | ||
VAULT_ADDR: "{{ organization.vault.url }}" | ||
VAULT_TOKEN: "{{ organization.vault.root_token }}" | ||
|
||
# Fetch msp files from Vault | ||
- name: Check if msp cacerts already created | ||
shell: | | ||
vault kv get -field=cacerts {{ organization.vault.secret_path | default('secretsv2') }}/crypto/ordererOrganizations/{{ organization.name | lower }}-net/users/admin/msp > ca-{{ organization.name | lower }}-net-{{ organization.services.ca.grpc.port }}.pem | ||
mkdir -p ./build/crypto-config/ordererOrganizations/{{ organization.name | lower }}-net/msp/cacerts/ | ||
mv ca-{{ organization.name | lower }}-net-{{ organization.services.ca.grpc.port }}.pem ./build/crypto-config/ordererOrganizations/{{ organization.name | lower }}-net/msp/cacerts/ | ||
environment: | ||
VAULT_ADDR: "{{ organization.vault.url }}" | ||
VAULT_TOKEN: "{{ organization.vault.root_token }}" | ||
|
||
# Fetch msp files from Vault | ||
- name: Check if msp tlscacerts already created | ||
shell: | | ||
vault kv get -field=tlscacerts {{ organization.vault.secret_path | default('secretsv2') }}/crypto/ordererOrganizations/{{ organization.name | lower }}-net/users/admin/msp > ca-{{ organization.name | lower }}-net-{{ organization.services.ca.grpc.port }}.pem | ||
mkdir -p ./build/crypto-config/ordererOrganizations/{{ organization.name | lower }}-net/msp/tlscacerts/ | ||
mv ca-{{ organization.name | lower }}-net-{{ organization.services.ca.grpc.port }}.pem ./build/crypto-config/ordererOrganizations/{{ organization.name | lower }}-net/msp/tlscacerts/ | ||
environment: | ||
VAULT_ADDR: "{{ organization.vault.url }}" | ||
VAULT_TOKEN: "{{ organization.vault.root_token }}" |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.