@@ -32,8 +32,11 @@ PEERADMIN_CARD=PeerAdmin.card
32
32
CARD_SOURCE=~ /.composer
33
33
CARD_TARGET=cards
34
34
IP_ADDRESS=" 0.0.0.0"
35
+ ENV_ADDRESS=" 0.0.0.0"
36
+ COMPOSER_ADDRESS=" 0.0.0.0"
37
+ PAID=' false'
35
38
36
- while getopts " h:c:k:n:" opt;
39
+ while getopts " h:c:k:n:p: " opt;
37
40
do
38
41
case " $opt " in
39
42
h|\? )
55
58
CLUSTER_NAME=$OPTARG
56
59
fi
57
60
;;
61
+ p) showStep " option passed for PAID is: '$OPTARG '"
62
+ if [[ $OPTARG != " " ]]; then
63
+ PAID=$OPTARG
64
+ fi
65
+ ;;
58
66
esac
59
67
done
60
68
61
69
function getContext ()
62
70
{
63
- showStep " Retrieving Cluster configuration"
71
+ showStep " Retrieving Cluster configuration for $CLUSTER_NAME "
64
72
KUBECONFIG=$( bx cs cluster-config $CLUSTER_NAME | grep ' KUBECONFIG' | awk ' {print $2}' )
65
73
echo " KUBECONFIG to export is $KUBECONFIG "
66
74
export " $KUBECONFIG "
67
75
68
- showStep " Retrieving Kube IP Address"
69
- IP_ADDRESS=$( bx cs workers $CLUSTER_NAME | grep ' kube' | awk ' {print $2}' )
70
- echo " IP Address is $IP_ADDRESS "
76
+ if [[ $PAID == ' false' ]]; then
77
+ showStep " Retrieving Kube IP Address for FREE cluster"
78
+ IP_ADDRESS=$( bx cs workers $CLUSTER_NAME | grep ' kube' | awk ' {print $2}' )
79
+ ENV_ADDRESS=$IP_ADDRESS
80
+ COMPOSER_ADDRESS=$IP_ADDRESS
81
+ echo " IP Address is $IP_ADDRESS "
82
+ else
83
+ showStep " Retrieving CA and COMPOSER IP Addresses for PAID cluster"
84
+ # CA_ADDRESS=$(kubectl get pods -o wide | grep 'blockchain-ca' | awk '{print $6}')
85
+ COMPOSER_ADDRESS=$( bx cs workers Z2B | grep ' kube' | awk ' {print $2}' | head -n1)
86
+ CA_ADDRESS=$COMPOSER_ADDRESS
87
+ echo " IP Address for CA is $CA_ADDRESS "
88
+ echo " IP Address for COMPOSER is $COMPOSER_ADDRESS "
89
+ ENV_ADDRESS=$CA_ADDRESS
90
+ fi
71
91
72
92
showStep " updating env.json for $OS "
73
93
if [[ $OS == " Darwin" ]] || [[ $OS == " darwin" ]]; then
74
94
echo " updating for OSX"
75
- cat controller/env.json | sed -i ' .bak' ' s/\"kube_address":".*"/"kube_address":"' $IP_ADDRESS ' "/' controller/env.json
95
+ pwd
96
+ cat controller/env.json | sed -i ' .bak' ' s/\"kube_address":".*"/"kube_address":"' $ENV_ADDRESS ' "/' controller/env.json
76
97
else
77
98
echo " updating for Linux"
78
- cat controller/env.json | sed -i ' s/\"kube_address":".*"/"kube_address":"' $IP_ADDRESS ' "/' controller/env.json
99
+ cat controller/env.json | sed -i ' s/\"kube_address":".*"/"kube_address":"' $ENV_ADDRESS ' "/' controller/env.json
79
100
fi
80
101
}
81
102
@@ -114,7 +135,7 @@ function pauseForCard ()
114
135
{
115
136
CURRENT=$( pwd)
116
137
echo -e " ${RESET} pausing while you go to composer playground and download the PeerAdmin card."
117
- echo -e " ${GREEN} You can access the playground at ==> http://$IP_ADDRESS :31080${RESET} "
138
+ echo -e " ${GREEN} You can access the playground at ==> http://$COMPOSER_ADDRESS :31080${RESET} "
118
139
echo -e " Click on ${GREEN} Launch Now${RESET} and then ${GREEN} export the PeerAdmin card ${RESET} "
119
140
echo -e " after downloading the PeerAdmin card, ${GREEN} please copy it into your $CURRENT folder.${RESET} "
120
141
@@ -125,9 +146,9 @@ function pauseForCard ()
125
146
fi
126
147
while [ ! -f $PEERADMIN_CARD ]; do
127
148
if [ $( which xdg-open | grep ' xdg-open' -c ) -eq 0 ]; then
128
- open http://$IP_ADDRESS :31080
149
+ open http://$COMPOSER_ADDRESS :31080
129
150
else
130
- xdg-open http://$IP_ADDRESS :31080
151
+ xdg-open http://$COMPOSER_ADDRESS :31080
131
152
fi
132
153
read -n1 -r -p " And then press any key to continue..." key
133
154
done
@@ -137,7 +158,7 @@ function updateCard ()
137
158
{
138
159
showStep " updating $CURRENT /$PEERADMIN_CARD "
139
160
pushd ./cs-offerings/scripts/connection-profile
140
- ./update_card.sh -c $CURRENT /$PEERADMIN_CARD -a $IP_ADDRESS
161
+ ./update_card.sh -c $CURRENT /$PEERADMIN_CARD -a $COMPOSER_ADDRESS
141
162
popd
142
163
composer card import --file $PEERADMIN_CARD
143
164
composer card list
0 commit comments