Simplify after open sourcing repos, add node-prep target
Change-Id: I51f0725abe5ac927cf51c5b507eecf7936079c76
diff --git a/Makefile b/Makefile
index 68b682e..73cdf4e 100644
--- a/Makefile
+++ b/Makefile
@@ -43,6 +43,8 @@
cpu_model := $(shell lscpu | grep 'Model:' | awk '{print $$2}')
os_vendor := $(shell lsb_release -i -s)
os_release := $(shell lsb_release -r -s)
+USER := $(shell whoami)
+
omec: $(M)/system-check $(M)/omec
oaisim: $(M)/oaisim
@@ -120,6 +122,7 @@
sudo cp -f /etc/kubernetes/admin.conf $(HOME)/.kube/config
sudo chown $(shell id -u):$(shell id -g) $(HOME)/.kube/config
kubectl wait pod -n kube-system --for=condition=Ready --all
+ sudo adduser $(USER) docker
touch $@
$(M)/helm-ready: | $(M)/k8s-ready
@@ -127,11 +130,11 @@
helm repo add cord https://charts.opencord.org
helm repo add atomix https://charts.atomix.io
helm repo add onosproject https://charts.onosproject.org
- @if [ "$(REPO_PASSWORD)" ]; then \
- helm repo add aether --username ${REPO_USERNAME} --password ${REPO_PASSWORD} https://charts.aetherproject.org; \
- fi
+ helm repo add aether https://charts.aetherproject.org
touch $@
+node-prep: | $(M)/k8s-ready $(M)/fabric $(M)/oaisim-lo
+
/opt/cni/bin/simpleovs: | $(M)/k8s-ready
sudo cp $(RESOURCEDIR)/simpleovs /opt/cni/bin/
@@ -220,20 +223,23 @@
cd $(BUILD); git clone https://github.com/opencord/openairinterface.git
download-ue-image: | $(M)/k8s-ready
- sudo docker pull ${OAISIM_UE_IMAGE}
- sudo docker tag ${OAISIM_UE_IMAGE} omecproject/lte-uesoftmodem:1.1.0
+ sg docker -c "docker pull ${OAISIM_UE_IMAGE} && \
+ docker tag ${OAISIM_UE_IMAGE} omecproject/lte-uesoftmodem:1.1.0"
touch $(M)/ue-image
$(M)/ue-image: | $(M)/k8s-ready $(BUILD)/openairinterface
cd $(BUILD)/openairinterface; \
- sudo docker build . --target lte-uesoftmodem \
+ sg docker -c "docker build . --target lte-uesoftmodem \
--build-arg build_base=omecproject/oai-base:1.1.0 \
--file Dockerfile.ue \
- --tag omecproject/lte-uesoftmodem:1.1.0
+ --tag omecproject/lte-uesoftmodem:1.1.0"
touch $@
-$(M)/oaisim: | $(M)/ue-image $(M)/omec
+$(M)/oaisim-lo:
sudo ip addr add 127.0.0.2/8 dev lo || true
+ touch $@
+
+$(M)/oaisim: | $(M)/ue-image $(M)/omec $(M)/oaisim-lo
$(eval mme_iface=$(shell ip -4 route list default | awk -F 'dev' '{ print $$2; exit }' | awk '{ print $$1 }'))
helm upgrade --install $(HELM_GLOBAL_ARGS) --namespace omec oaisim cord/oaisim -f $(OAISIM_VALUES) \
--set config.enb.networks.s1_mme.interface=$(mme_iface) \
diff --git a/configs/authentication b/configs/authentication
index ac9ae56..f0b537a 100644
--- a/configs/authentication
+++ b/configs/authentication
@@ -2,10 +2,6 @@
#
# SPDX-License-Identifier: Apache-2.0
-# Configure auth for private Helm repos. Override with your credentials.
-REPO_USERNAME := onfstaff
-REPO_PASSWORD :=
-
# Configure auth for private Docker registry. Override with credentials
# obtained from https://registry.aetherproject.org.
REGISTRY_USERNAME := myuser