Change the order of setup-cni.sh parameters 25/2125/1
authorTrevor Tao <trevor.tao@arm.com>
Mon, 16 Dec 2019 08:03:16 +0000 (16:03 +0800)
committerTrevor Tao <trevor.tao@arm.com>
Mon, 16 Dec 2019 08:03:16 +0000 (16:03 +0800)
commit56dd5e0f2164b37b40ac1daa188ccc618b4cbd19
tree50eb8c6a25558478c380ad0df1b488dabfe2c182
parentc7e6c9181a2b88210ae0f86b8d231f51991d0c42
Change the order of setup-cni.sh parameters

To facilitate the manual installation of various CNIs
by using setup-cni.sh, the order of setup-cni.sh parameters
is changed as:
1. CNI_TYPE
2. POD_NETWORK_CIDR
3. CLUSTER_IP
4. As-is ...

The reason to do in this way is that the CLUSTER_IP parameter
is only needed by Calico CNI, but the CNI_TYPE and POD_NETWORK_CIDR
is needed by all CNIs when we do it manually (by calling
setup-cni.sh directly).

Signed-off-by: Trevor Tao <trevor.tao@arm.com>
Change-Id: I5e41f23ed882ed8bb7e9ab74e4d6a9237532d060
src/foundation/scripts/setup-cni.sh
src/foundation/scripts/startup.sh