Skip to content
Toggle navigation
P
Projects
G
Groups
S
Snippets
Help
CIRCLE
/
salt
This project
Loading...
Sign in
Toggle navigation
Go to a project
Project
Repository
Issues
17
Merge Requests
1
Wiki
Snippets
Members
Activity
Graph
Charts
Create a new issue
Commits
Issue Boards
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
A prog2-höz tartozó friss repo anyagok itt elérhetőek:
https://git.iit.bme.hu/
Commit
7555c4ae
authored
Dec 11, 2014
by
Bach Dániel
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
random fixes
parent
11c4e738
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
11 additions
and
4 deletions
+11
-4
salt/manager/files/compile.sh
+3
-0
salt/network/init.sls
+8
-4
No files found.
salt/manager/files/compile.sh
View file @
7555c4ae
...
...
@@ -5,6 +5,9 @@ source /home/{{ pillar['user'] }}/.virtualenvs/circle/bin/postactivate
MANAGE
=
"python /home/{{ pillar['user'] }}/circle/circle/manage.py"
bower install
$MANAGE
compileless
$MANAGE
compilejsi18n
-o
dashboard/static/jsi18n
COLLECTED
=
$(
$MANAGE
collectstatic
--noinput
|
awk
'/static files copied to/ {print $1}'
)
...
...
salt/network/init.sls
View file @
7555c4ae
...
...
@@ -10,9 +10,11 @@ linka:
- proto: manual
- pre_up_cmds:
- ip link add linka type veth peer name linkb
- ovs-vsctl --if-exists del-port cloud linka
- post_up_cmds:
- ovs-vsctl --may-exist add-port cloud linka
- /etc/init.d/openvswitch-switch restart
- /usr/bin/ovs-vsctl --if-exists del-port cloud linka
- /usr/bin/ovs-vsctl --may-exist add-port cloud linka
- ip link set linka up
- ip link set linkb up
- post_down_cmds:
- ip link del linka
...
...
@@ -26,13 +28,15 @@ man0:
network.managed:
- enabled: True
- type: eth
- proto:
none
- proto:
static
- ipaddr: {{ pillar['fwdriver']['portal_ip'] }}
- netmask: {{ pillar['fwdriver']['portal_netmask'] }}
- gateway: {{ pillar['fwdriver']['management_net'].split('/')[0] }}
- dns:
- 8.8.8.8
- 8.8.4.4
- pre_up_cmds:
- /etc/init.d/openvswitch-switch restart
- require:
- cmd: ovs-if
...
...
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