Skip to content

Commit 50c2624

Browse files
nguptaopensdsnguptaopensds
committed
Merge branch 'master' of https://github.com/sodafoundation/api into test_vg
2 parents dd805c7 + 7d8aebb commit 50c2624

14 files changed

Lines changed: 235 additions & 234 deletions

File tree

‎.travis.yml‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,8 @@ matrix:
3232

3333

3434
install:
35+
# TODO: Remove once source code is fixed for sodafoundation
36+
- ln -s $GOPATH/src/sodafoundation $GOPATH/src/opensds
3537
# Build OpenSDS Controller source code
3638
- make osdsapiserver
3739
- make osdsctl

‎Makefile‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@ metricexporter:
5050

5151
docker: build
5252
cp $(BUILD_DIR)/bin/osdsapiserver ./cmd/osdsapiserver
53-
docker build cmd/osdsapiserver -t opensdsio/opensds-apiserver:latest
53+
docker build cmd/osdsapiserver -t sodafoundation/apiserver:latest
5454

5555
test: build
5656
install/CI/test

‎cmd/osdsapiserver/Autobuildfile‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
# Docker build usage:
2-
# docker build . -t opensdsio/opensds-apiserver:latest
2+
# docker build . -t sodafoundation/apiserver:latest
33
# Docker run usage:
4-
# docker run -d --net=host -v /etc/opensds:/etc/opensds opensdsio/opensds-apiserver:latest
4+
# docker run -d --net=host -v /etc/opensds:/etc/opensds sodafoundation/apiserver:latest
55

66
FROM ubuntu:16.04
77
MAINTAINER Leon Wang <wanghui71leon@gmail.com>

‎cmd/osdsapiserver/Dockerfile‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,9 @@
11
# Docker build usage:
2-
# docker build . -t opensdsio/opensds-apiserver:latest
2+
# docker build . -t sodafoundation/apiserver:latest
33
# Docker run usage:
4-
# docker run -d --net=host -v /etc/opensds:/etc/opensds opensdsio/opensds-apiserver:latest
4+
# docker run -d --net=host -v /etc/opensds:/etc/opensds sodafoundation/apiserver:latest
55

66
FROM ubuntu:16.04
7-
MAINTAINER Leon Wang <wanghui71leon@gmail.com>
87

98
COPY osdsapiserver /usr/bin
109

‎docker-compose.yml‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
version: '2'
22
services:
33
osdsapiserver:
4-
image: 'opensdsio/opensds-apiserver:latest'
4+
image: 'sodafoundation/apiserver:latest'
55
tty: true
66
network_mode: "host"
77
volumes:
@@ -12,7 +12,7 @@ services:
1212
restart: on-failure
1313
command: /bin/bash -c '/usr/bin/osdsapiserver -logtostderr'
1414
osdslet:
15-
image: 'opensdsio/opensds-controller:latest'
15+
image: 'sodafoundation/controller:latest'
1616
tty: true
1717
network_mode: "host"
1818
volumes:
@@ -22,7 +22,7 @@ services:
2222
restart: on-failure
2323
command: /bin/bash -c '/usr/bin/osdslet -logtostderr'
2424
osdsdock:
25-
image: 'opensdsio/opensds-dock:latest'
25+
image: 'sodafoundation/dock:latest'
2626
tty: true
2727
privileged: true
2828
volumes:
@@ -52,7 +52,7 @@ services:
5252
privileged: true
5353
restart: on-failure
5454
osdsdashboard:
55-
image: 'opensdsio/dashboard:latest'
55+
image: 'sodafoundation/dashboard:latest'
5656
tty: true
5757
network_mode: "host"
5858
restart: on-failure

‎install/devsds/install.sh‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -163,7 +163,7 @@ else
163163
fi
164164

165165
echo
166-
echo "Execute commands blow to set up ENVs which are needed by OpenSDS CLI:"
166+
echo "Execute commands below to set up ENVs which are needed by SODA CLI:"
167167
echo "------------------------------------------------------------------"
168168
echo "export OPENSDS_AUTH_STRATEGY=$OPENSDS_AUTH_STRATEGY"
169169
echo "export OPENSDS_ENDPOINT=http://localhost:50040"

‎install/devsds/lib/opensds.sh‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -88,11 +88,11 @@ osds::opensds::install(){
8888

8989
export OPENSDS_AUTH_STRATEGY=$OPENSDS_AUTH_STRATEGY
9090
export OPENSDS_ENDPOINT=http://localhost:50040
91-
build/out/bin/osdsctl profile create '{"name": "default_block", "description": "default policy", "storageType": "block"}'
92-
build/out/bin/osdsctl profile create '{"name": "default_file", "description": "default policy", "storageType": "file", "provisioningProperties":{"ioConnectivity": {"accessProtocol": "NFS"},"DataStorage":{"StorageAccessCapability":["Read","Write","Execute"]}}}'
91+
${OPENSDS_DIR}/build/out/bin/osdsctl profile create '{"name": "default_block", "description": "default policy", "storageType": "block"}'
92+
${OPENSDS_DIR}/build/out/bin/osdsctl profile create '{"name": "default_file", "description": "default policy", "storageType": "file", "provisioningProperties":{"ioConnectivity": {"accessProtocol": "NFS"},"DataStorage":{"StorageAccessCapability":["Read","Write","Execute"]}}}'
9393

9494
if [ $? == 0 ]; then
95-
osds::echo_summary devsds installed successfully !!
95+
osds::echo_summary devsds installed successfully !!
9696
fi
9797
)
9898
}

‎install/kubernetes/opensds-all.yaml‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@ spec:
4848
spec:
4949
containers:
5050
- name: apiserver
51-
image: opensdsio/opensds-apiserver:latest
51+
image: sodafoundation/apiserver:latest
5252
imagePullPolicy: IfNotPresent
5353
command: ["bin/sh"]
5454
args: ["-c", "/usr/bin/osdsapiserver -logtostderr"]
@@ -99,7 +99,7 @@ spec:
9999
spec:
100100
containers:
101101
- name: controller
102-
image: opensdsio/opensds-controller:latest
102+
image: sodafoundation/controller:latest
103103
imagePullPolicy: IfNotPresent
104104
command: ["bin/sh"]
105105
args: ["-c", "/usr/bin/osdslet -logtostderr"]
@@ -155,7 +155,7 @@ spec:
155155
capabilities:
156156
add: ["SYS_ADMIN"]
157157
allowPrivilegeEscalation: true
158-
image: opensdsio/opensds-dock:latest
158+
image: sodafoundation/dock:latest
159159
imagePullPolicy: IfNotPresent
160160
command: ["bin/sh"]
161161
args: ["-c", "/usr/sbin/tgtd; /usr/bin/osdsdock -logtostderr"]
@@ -249,7 +249,7 @@ spec:
249249
spec:
250250
containers:
251251
- name: dashboard
252-
image: opensdsio/dashboard:latest
252+
image: sodafoundation/dashboard:latest
253253
env:
254254
- name: OPENSDS_AUTH_URL
255255
value: http://authchecker.opensds.svc.cluster.local/identity

‎install/kubernetes/opensds-apiserver-v1.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ spec:
3333
spec:
3434
containers:
3535
- name: apiserver
36-
image: opensdsio/opensds-apiserver:latest
36+
image: sodafoundation/apiserver:latest
3737
imagePullPolicy: IfNotPresent
3838
command: ["bin/sh"]
3939
args: ["-c", "/usr/bin/osdsapiserver -logtostderr"]

‎install/kubernetes/opensds-apiserver-v1beta.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ spec:
3333
spec:
3434
containers:
3535
- name: apiserver
36-
image: opensdsio/opensds-apiserver:latest
36+
image: sodafoundation/apiserver:latest
3737
imagePullPolicy: IfNotPresent
3838
command: ["bin/sh"]
3939
args: ["-c", "/usr/bin/osdsapiserver -logtostderr"]

0 commit comments

Comments
 (0)