Skip to content
Toggle navigation
P
Projects
G
Groups
S
Snippets
Help
Gelencsér Szabolcs
/
salt
This project
Loading...
Sign in
Toggle navigation
Go to a project
Project
Repository
Issues
0
Merge Requests
0
Wiki
Members
Activity
Graph
Charts
Create a new issue
Commits
Issue Boards
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Commit
2bbf64d0
authored
Nov 09, 2016
by
Szabolcs Gelencser
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Add Azure credentials, git repos with azure branches
parent
a0a63826
Show whitespace changes
Inline
Side-by-side
Showing
19 changed files
with
86 additions
and
12 deletions
+86
-12
pillar/agentdriver.sls
+2
-2
pillar/firewall.sls
+2
-2
pillar/installer.sls
+11
-0
pillar/manager.sls
+2
-2
pillar/monitor-client.sls
+2
-2
pillar/storagedriver.sls
+2
-2
pillar/vmdriver.sls
+2
-2
salt/agentdriver/files/postactivate
+8
-0
salt/agentdriver/gitrepo.sls
+2
-0
salt/fwdriver/files/postactivate
+9
-0
salt/fwdriver/gitrepo.sls
+2
-0
salt/manager/files/postactivate
+9
-0
salt/manager/gitrepo.sls
+2
-0
salt/monitor-client/files/postactivate
+9
-0
salt/monitor-client/gitrepo.sls
+2
-0
salt/storagedriver/files/postactivate
+8
-0
salt/storagedriver/gitrepo.sls
+2
-0
salt/vmdriver/files/postactivate
+8
-0
salt/vmdriver/gitrepo.sls
+2
-0
No files found.
pillar/agentdriver.sls
View file @
2bbf64d0
agentdriver:
repo_name: https://git.ik.bme.hu/
circle
/agentdriver.git
repo_revision:
master
repo_name: https://git.ik.bme.hu/
h3yduck
/agentdriver.git
repo_revision:
azure
pillar/firewall.sls
View file @
2bbf64d0
fwdriver:
repo_name: https://git.ik.bme.hu/
circle
/fwdriver.git
repo_revision:
master
repo_name: https://git.ik.bme.hu/
h3yduck
/fwdriver.git
repo_revision:
azure
user: fw
...
...
pillar/installer.sls
View file @
2bbf64d0
...
...
@@ -48,3 +48,13 @@
# external_if: eth0
# trunk_if: linkb
# management_if: ethy
# azure_subscription_id:
# azure_client_id:
# azure_client_secret:
# azure_tenant_id:
# azure_group_name:
# azure_region:
# azure_storage_account_name:
# azure_client_oauth_id:
# azure_client_url:
\ No newline at end of file
pillar/manager.sls
View file @
2bbf64d0
manager:
repo_name: https://git.ik.bme.hu/
circle
/cloud.git
repo_revision:
master
repo_name: https://git.ik.bme.hu/
h3yduck
/cloud.git
repo_revision:
azure
pillar/monitor-client.sls
View file @
2bbf64d0
monitor-client:
repo_name: https://git.ik.bme.hu/
circle
/monitor-client.git
repo_revision:
master
repo_name: https://git.ik.bme.hu/
h3yduck
/monitor-client.git
repo_revision:
azure
pillar/storagedriver.sls
View file @
2bbf64d0
storagedriver:
repo_name: https://git.ik.bme.hu/
circle
/storagedriver.git
repo_revision:
master
repo_name: https://git.ik.bme.hu/
h3yduck
/storagedriver.git
repo_revision:
azure
queue_name: storageserver
pillar/vmdriver.sls
View file @
2bbf64d0
vmdriver:
repo_name: https://git.ik.bme.hu/
circle
/vmdriver.git
repo_revision:
master
repo_name: https://git.ik.bme.hu/
h3yduck
/vmdriver.git
repo_revision:
azure
salt/agentdriver/files/postactivate
View file @
2bbf64d0
export AMQP_URI=amqp://{{ pillar['amqp']['user'] }}:{{ pillar['amqp']['password'] }}@{{ pillar['amqp']['host'] }}:{{ pillar['amqp']['port'] }}/{{ pillar['amqp']['vhost'] }}
export CACHE_URI={{ pillar['cache'] }}
export SUBSCRIPTION_ID={{ pillar["azure_subscription_id"] }}
export CLIENT_ID={{ pillar["azure_client_id"] }}
export SECRET={{ pillar["azure_client_secret"] }}
export TENANT={{ pillar["azure_tenant_id"] }}
export GROUP_NAME={{ pillar["azure_group_name"] }}
export REGION={{ pillar["azure_region"] }}
export STORAGE_NAME={{ pillar["azure_storage_account_name"] }}
\ No newline at end of file
salt/agentdriver/gitrepo.sls
View file @
2bbf64d0
...
...
@@ -7,5 +7,7 @@ gitrepo_agentdriver:
- rev: {{ pillar['agentdriver']['repo_revision'] }}
- target: /home/{{ pillar['user'] }}/agentdriver
- user: {{ pillar['user'] }}
- identity:
- {{ pillar['git_repo_key'] }}
- require:
- pkg: git
salt/fwdriver/files/postactivate
View file @
2bbf64d0
...
...
@@ -2,3 +2,11 @@ export GATEWAY={{ pillar['fwdriver']['gateway'] }}
export AMQP_URI=amqp://{{ pillar['amqp']['user'] }}:{{ pillar['amqp']['password'] }}@{{ pillar['amqp']['host'] }}:{{ pillar['amqp']['port'] }}/{{ pillar['amqp']['vhost'] }}
export CACHE_URI={{ pillar['cache'] }}
export BRIDGE_TYPE=NONE
export SUBSCRIPTION_ID={{ pillar["azure_subscription_id"] }}
export CLIENT_ID={{ pillar["azure_client_id"] }}
export SECRET={{ pillar["azure_client_secret"] }}
export TENANT={{ pillar["azure_tenant_id"] }}
export GROUP_NAME={{ pillar["azure_group_name"] }}
export REGION={{ pillar["azure_region"] }}
export STORAGE_NAME={{ pillar["azure_storage_account_name"] }}
\ No newline at end of file
salt/fwdriver/gitrepo.sls
View file @
2bbf64d0
...
...
@@ -7,5 +7,7 @@ gitrepo_fwdriver:
- rev: {{ pillar['fwdriver']['repo_revision'] }}
- target: /home/{{ pillar['fwdriver']['user'] }}/fwdriver
- user: {{ pillar['fwdriver']['user'] }}
- identity:
- {{ pillar['git_repo_key'] }}
- require:
- pkg: git
salt/manager/files/postactivate
View file @
2bbf64d0
...
...
@@ -34,3 +34,11 @@ export DEFAULT_FROM_EMAIL='root@localhost'
#LOCAL="/home//.virtualenvs/circle/bin/postactivate.local"
#test -f "$LOCAL" && . "$LOCAL"
export SUBSCRIPTION_ID={{ pillar["azure_subscription_id"] }}
export CLIENT_ID={{ pillar["azure_client_id"] }}
export SECRET={{ pillar["azure_client_secret"] }}
export TENANT={{ pillar["azure_tenant_id"] }}
export GROUP_NAME={{ pillar["azure_group_name"] }}
export REGION={{ pillar["azure_region"] }}
export STORAGE_NAME={{ pillar["azure_storage_account_name"] }}
\ No newline at end of file
salt/manager/gitrepo.sls
View file @
2bbf64d0
...
...
@@ -7,5 +7,7 @@ gitrepo:
- rev: {{ pillar['manager']['repo_revision'] }}
- target: /home/{{ pillar['user'] }}/circle
- user: {{ pillar['user'] }}
- identity:
- {{ pillar['git_repo_key'] }}
- require:
- pkg: git
salt/monitor-client/files/postactivate
View file @
2bbf64d0
...
...
@@ -4,3 +4,11 @@ export GRAPHITE_AMQP_USER='{{ pillar['graphite']['user'] }}'
export GRAPHITE_AMQP_PASSWORD='{{ pillar['graphite']['password'] }}'
export GRAPHITE_AMQP_QUEUE='{{ pillar['graphite']['queue'] }}'
export GRAPHITE_AMQP_VHOST='{{ pillar['graphite']['vhost'] }}'
export AZURE_SUBSCRIPTION_ID={{ pillar["azure_subscription_id"] }}
export AZURE_CLIENT_ID={{ pillar["azure_client_id"] }}
export AZURE_CLIENT_SECRET={{ pillar["azure_client_secret"] }}
export AZURE_TENANT_ID={{ pillar["azure_tenant_id"] }}
export AZURE_RESOURCE_GROUP={{ pillar["azure_group_name"] }}
export AZURE_CLIENT_OAUTH_ID={{ pillar["azure_client_oauth_id"] }}
export AZURE_CLIENT_URL={{ pillar["azure_client_url"] }}
\ No newline at end of file
salt/monitor-client/gitrepo.sls
View file @
2bbf64d0
...
...
@@ -7,5 +7,7 @@ gitrepo_monitor-client:
- rev: {{ pillar['monitor-client']['repo_revision'] }}
- target: /home/{{ pillar['user'] }}/monitor-client
- user: {{ pillar['user'] }}
- identity:
- {{ pillar['git_repo_key'] }}
- require:
- pkg: git
salt/storagedriver/files/postactivate
View file @
2bbf64d0
export AMQP_URI=amqp://{{ pillar['amqp']['user'] }}:{{ pillar['amqp']['password'] }}@{{ pillar['amqp']['host'] }}:{{ pillar['amqp']['port'] }}/{{ pillar['amqp']['vhost'] }}
export CACHE_URI={{ pillar['cache'] }}
export SUBSCRIPTION_ID={{ pillar["azure_subscription_id"] }}
export CLIENT_ID={{ pillar["azure_client_id"] }}
export SECRET={{ pillar["azure_client_secret"] }}
export TENANT={{ pillar["azure_tenant_id"] }}
export GROUP_NAME={{ pillar["azure_group_name"] }}
export REGION={{ pillar["azure_region"] }}
export STORAGE_NAME={{ pillar["azure_storage_account_name"] }}
\ No newline at end of file
salt/storagedriver/gitrepo.sls
View file @
2bbf64d0
...
...
@@ -7,5 +7,7 @@ gitrepo_storagedriver:
- rev: {{ pillar['storagedriver']['repo_revision'] }}
- target: /home/{{ pillar['user'] }}/storagedriver
- user: {{ pillar['user'] }}
- identity:
- {{ pillar['git_repo_key'] }}
- require:
- pkg: git
salt/vmdriver/files/postactivate
View file @
2bbf64d0
...
...
@@ -4,3 +4,10 @@ export LIBVIRT_URI=qemu:///system
export HYPERVISOR_TYPE=kvm
export NATIVE_OVS=True
export SUBSCRIPTION_ID={{ pillar["azure_subscription_id"] }}
export CLIENT_ID={{ pillar["azure_client_id"] }}
export SECRET={{ pillar["azure_client_secret"] }}
export TENANT={{ pillar["azure_tenant_id"] }}
export GROUP_NAME={{ pillar["azure_group_name"] }}
export REGION={{ pillar["azure_region"] }}
export STORAGE_NAME={{ pillar["azure_storage_account_name"] }}
\ No newline at end of file
salt/vmdriver/gitrepo.sls
View file @
2bbf64d0
...
...
@@ -7,5 +7,7 @@ gitrepo_vmdriver:
- rev: {{ pillar['vmdriver']['repo_revision'] }}
- target: /home/{{ pillar['user'] }}/vmdriver
- user: {{ pillar['user'] }}
- identity:
- {{ pillar['git_repo_key'] }}
- require:
- pkg: git
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