Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
C
CONF
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Registry
Registry
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
UvA
CONF
Commits
8de510db
Commit
8de510db
authored
Mar 11, 2020
by
Spiros Koulouzis
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
fixed typo
parent
65aa14d8
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
5 additions
and
5 deletions
+5
-5
install_k8s.yml
ansible_playbooks/install_k8s.yml
+1
-1
k8s_service.py
deployer/service/k8s_service.py
+1
-1
tosca.py
deployer/service/tosca.py
+3
-3
No files found.
ansible_playbooks/install_k8s.yml
View file @
8de510db
...
...
@@ -12,7 +12,7 @@
#line: nameserver 8.8.8.8
-
name
:
Wait for automatic system updates
shell
:
while sudo fuser /var/lib/dpkg/{{ item }} >/dev/null 2>&1; do sleep
1
; done;
shell
:
while sudo fuser /var/lib/dpkg/{{ item }} >/dev/null 2>&1; do sleep
3
; done;
with_items
:
-
lock
-
lock-frontend
...
...
deployer/service/k8s_service.py
View file @
8de510db
...
...
@@ -237,6 +237,6 @@ def get_service_urls(vms, tosca_template_json):
docker_name
=
next
(
iter
(
docker
))
docker_ports
=
docker
[
docker_name
][
'properties'
][
'ports'
][
0
]
.
split
(
':'
)
node_port
=
int
(
docker_ports
[
0
])
url
=
'http
s
://'
+
k8_master
+
':'
+
str
(
node_port
)
url
=
'http://'
+
k8_master
+
':'
+
str
(
node_port
)
urls
[
docker_name
]
=
url
return
urls
deployer/service/tosca.py
View file @
8de510db
...
...
@@ -47,12 +47,12 @@ def add_dashboard_url(dashboard_url, tosca_template_dict):
return
tosca_template_dict
def
add_service_url
(
serviceu
rls_url
,
tosca_template_dict
):
def
add_service_url
(
serviceu
_urls
,
tosca_template_dict
):
node_templates
=
tosca_template_dict
[
'topology_template'
][
'node_templates'
]
for
node_name
in
node_templates
:
if
node_templates
[
node_name
][
'type'
]
==
'
"
tosca.nodes.ARTICONF.Container.Application.Docker'
:
if
node_templates
[
node_name
][
'type'
]
==
'tosca.nodes.ARTICONF.Container.Application.Docker'
:
if
'attributes'
not
in
node_templates
[
node_name
]:
node_templates
[
node_name
][
'attributes'
]
=
{}
attributes
=
node_templates
[
node_name
][
'attributes'
]
attributes
[
'service_url'
]
=
serviceu
rls_url
[
node_name
]
attributes
[
'service_url'
]
=
serviceu
_urls
[
node_name
]
return
tosca_template_dict
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment