aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--INFO.yaml15
-rw-r--r--deployments/Dockerfile4
-rw-r--r--vagrant/playbooks/krd-vars.yml2
3 files changed, 10 insertions, 11 deletions
diff --git a/INFO.yaml b/INFO.yaml
index 1d62bdbe..2bd41fdb 100644
--- a/INFO.yaml
+++ b/INFO.yaml
@@ -34,6 +34,7 @@ repositories:
- 'multicloud-openstack-windriver'
- 'multicloud-azure'
- 'multicloud-k8s'
+ - 'multicloud-oom'
committers:
- <<: *onap_multicloud_ptl
- name: 'Anbing Zhang'
@@ -51,16 +52,6 @@ committers:
company: 'ATT'
id: 'bh526r'
timezone: 'America/Palo Alto'
- - name: 'Liang Ke'
- email: 'lokyse@163.com'
- company: 'VMWare'
- id: 'liangke'
- timezone: 'China/Beijing'
- - name: 'yun huang'
- email: 'yun.huang@windriver.com'
- company: 'Windriver'
- id: 'cloudhuang'
- timezone: ''
- name: 'Victor Morales'
email: 'victor.morales@intel.com'
company: 'Intel'
@@ -91,3 +82,7 @@ tsc:
name: 'Huang Haibin'
name: 'Sudhakar Reddy'
link: 'http://ircbot.wl.linuxfoundation.org/meetings/onap-meeting/2018/onap-meeting.2018-08-16-13.45.html'
+ - type: 'Remove'
+ name: 'yun huang'
+ name: 'Ke Liang'
+ name: 'Andrew Philip'
diff --git a/deployments/Dockerfile b/deployments/Dockerfile
index 770f0e8d..d22aeb11 100644
--- a/deployments/Dockerfile
+++ b/deployments/Dockerfile
@@ -24,6 +24,7 @@ ENV OVN_CENTRAL_ADDRESS "127.0.0.1:6641"
EXPOSE 8081
+RUN groupadd -r onap && useradd -r -g onap onap
RUN apt-get update && apt-get install -y -qq apt-transport-https curl \
&& echo "deb https://packages.wand.net.nz xenial main" > /etc/apt/sources.list.d/wand.list \
&& curl https://packages.wand.net.nz/keyring.gpg -o /etc/apt/trusted.gpg.d/wand.gpg \
@@ -32,5 +33,8 @@ RUN apt-get update && apt-get install -y -qq apt-transport-https curl \
WORKDIR /opt/multicloud/k8s
ADD ./k8plugin ./
ADD ./*.so ./
+RUN chown onap:onap /opt/multicloud/k8s -R
+
+USER onap
CMD ["./k8plugin"]
diff --git a/vagrant/playbooks/krd-vars.yml b/vagrant/playbooks/krd-vars.yml
index 5d1a088a..81e11c11 100644
--- a/vagrant/playbooks/krd-vars.yml
+++ b/vagrant/playbooks/krd-vars.yml
@@ -58,6 +58,6 @@ ovn4nfv_version: 5026d1d89b05eac5e004279b742df6745a73d93a
ovn4nfv_url: "https://git.opnfv.org/ovn4nfv-k8s-plugin/"
go_version: '1.11'
-kubespray_version: 2.8.0
+kubespray_version: 2.8.2
kubectl_version: 1.12.2
helm_client_version: 2.9.1