Merge pull request #17 from Andrea-Campanella/version-one
Adding VERSION unique variable to set all the charts version.
diff --git a/README.md b/README.md
index ed1222f..e569414 100644
--- a/README.md
+++ b/README.md
@@ -59,6 +59,12 @@
WITH_BBSIM=yes voltha up
```
+To start a specific version of VOLTHA, e.g. 2.2, you could use the following command:
+```
+source releases/voltha-2.2 && voltha up
+```
+Please check the `releases` folder to see the available ones.
+
| OPTION | DEFAULT | DESCRIPTION |
| ------------------------------- | ---------------------------- | ----------------------------------------------------------------------------------- |
| `TYPE` | minimal | `minimal` or `full` and determines number of cluster nodes and etcd cluster members |
@@ -75,6 +81,7 @@
| `INSTALL_KUBECTL` | yes | Should a copy of `kubectl` be installed locally? |
| `INSTALL_HELM` | yes | Should a copy of `helm` be installed locallly? |
| `VOLTHA_LOG_LEVEL` | WARN | Log level to set for VOLTHA core processes |
+| `ONOS_CHART_VERSION` | latest | Version of helm chart for ONOS |
| `VOLTHA_CHART` | onf/voltha | Helm chart to used to install voltha |
| `VOLTHA_ADAPTER_SIM_CHART` | onf/voltha-adapter-simulated | Helm chart to use to install simulated device adapter |
| `VOLTHA_ADAPTER_OPEN_OLT_CHART` | onf/voltha-adapter-openolt | Helm chart to use to install OpenOlt adapter |
diff --git a/releases/voltha-2.2 b/releases/voltha-2.2
new file mode 100644
index 0000000..dce7a0d
--- /dev/null
+++ b/releases/voltha-2.2
@@ -0,0 +1,6 @@
+export VOLTHA_CHART_VERSION=2.2.0
+export VOLTHA_BBSIM_CHART_VERSION=3.0.7
+export VOLTHA_ADAPTER_SIM_CHART_VERSION=2.2.3
+export VOLTHA_ADAPTER_OPEN_OLT_CHART_VERSION=2.2.0
+export VOLTHA_ADAPTER_OPEN_ONU_CHART_VERSION=2.2.0
+export ONOS_CHART_VERSION=1.1.4
diff --git a/voltha b/voltha
index 4debfd2..7e26832 100755
--- a/voltha
+++ b/voltha
@@ -94,6 +94,7 @@
VOLTHA_ADAPTER_OPEN_OLT_CHART_VERSION=${VOLTHA_ADAPTER_OPEN_OLT_CHART_VERSION:-latest}
VOLTHA_ADAPTER_OPEN_ONU_CHART=${VOLTHA_ADAPTER_OPEN_ONU_CHART:-onf/voltha-adapter-openonu}
VOLTHA_ADAPTER_OPEN_ONU_CHART_VERSION=${VOLTHA_ADAPTER_OPEN_ONU_CHART_VERSION:-latest}
+ONOS_CHART_VERSION=${ONOS_CHART_VERSION:-latest}
EXTRA_HELM_INSTALL_ARGS=
HAVE_GO=$(which go >/dev/null 2>&1 && echo "yes" || echo "no")
@@ -162,6 +163,7 @@
VOLTHA_ADAPTER_OPEN_OLT_CHART_VERSION \
VOLTHA_ADAPTER_OPEN_ONU_CHART \
VOLTHA_ADAPTER_OPEN_ONU_CHART_VERSION \
+ ONOS_CHART_VERSION \
ONOS_API_PORT \
ONOS_SSH_PORT \
VOLTHA_API_PORT \
@@ -986,7 +988,7 @@
bspin "Verify ONOS installed $BIRD"
if [ $(helm list --deployed --short --namespace default "^onos\$" | wc -l) -ne 1 ]; then
espin $NOT_VERIFIED
- EXTRA_HELM_FLAGS="$SET_TAG $EXTRA_HELM_FLAGS" helm_install - default onos onf/onos latest "Install ONOS"
+ EXTRA_HELM_FLAGS="$SET_TAG $EXTRA_HELM_FLAGS" helm_install - default onos onf/onos $ONOS_CHART_VERSION "Install ONOS"
else
espin $VERIFIED
fi