Add Azure credentials, git repos with azure branches

pillar/agentdriver.sls

 agentdriver:
 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

 fwdriver:
 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
   user: fw
 
 

pillar/installer.sls

@@ -48,3 +48,13 @@
 #  external_if: eth0
 #  external_if: eth0
 #  trunk_if: linkb
 #  trunk_if: linkb
 #  management_if: ethy
 #  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

 manager:
 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

 monitor-client:
 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

 storagedriver:
 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
   queue_name: storageserver

pillar/vmdriver.sls

 vmdriver:
 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

 export AMQP_URI=amqp://{{ pillar['amqp']['user'] }}:{{ pillar['amqp']['password'] }}@{{ pillar['amqp']['host'] }}:{{ pillar['amqp']['port'] }}/{{ pillar['amqp']['vhost'] }}
 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 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

@@ -7,5 +7,7 @@ gitrepo_agentdriver:
     - rev: {{ pillar['agentdriver']['repo_revision'] }}
     - rev: {{ pillar['agentdriver']['repo_revision'] }}
     - target: /home/{{ pillar['user'] }}/agentdriver
     - target: /home/{{ pillar['user'] }}/agentdriver
     - user: {{ pillar['user'] }}
     - user: {{ pillar['user'] }}
+    - identity:
+      - {{ pillar['git_repo_key'] }}
     - require:
     - require:
       - pkg: git
       - pkg: git

salt/fwdriver/files/postactivate

@@ -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 AMQP_URI=amqp://{{ pillar['amqp']['user'] }}:{{ pillar['amqp']['password'] }}@{{ pillar['amqp']['host'] }}:{{ pillar['amqp']['port'] }}/{{ pillar['amqp']['vhost'] }}
 export CACHE_URI={{ pillar['cache'] }}
 export CACHE_URI={{ pillar['cache'] }}
 export BRIDGE_TYPE=NONE
 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

@@ -7,5 +7,7 @@ gitrepo_fwdriver:
     - rev: {{ pillar['fwdriver']['repo_revision'] }}
     - rev: {{ pillar['fwdriver']['repo_revision'] }}
     - target: /home/{{ pillar['fwdriver']['user'] }}/fwdriver
     - target: /home/{{ pillar['fwdriver']['user'] }}/fwdriver
     - user: {{ pillar['fwdriver']['user'] }}
     - user: {{ pillar['fwdriver']['user'] }}
+    - identity:
+      - {{ pillar['git_repo_key'] }}
     - require:
     - require:
       - pkg: git
       - pkg: git

salt/manager/files/postactivate

@@ -34,3 +34,11 @@ export DEFAULT_FROM_EMAIL='root@localhost'
 
 
 #LOCAL="/home//.virtualenvs/circle/bin/postactivate.local"
 #LOCAL="/home//.virtualenvs/circle/bin/postactivate.local"
 #test -f "$LOCAL" && . "$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

@@ -7,5 +7,7 @@ gitrepo:
     - rev: {{ pillar['manager']['repo_revision']  }}
     - rev: {{ pillar['manager']['repo_revision']  }}
     - target: /home/{{ pillar['user'] }}/circle
     - target: /home/{{ pillar['user'] }}/circle
     - user: {{ pillar['user'] }}
     - user: {{ pillar['user'] }}
+    - identity:
+      - {{ pillar['git_repo_key'] }}
     - require:
     - require:
       - pkg: git
       - pkg: git

salt/monitor-client/files/postactivate

@@ -4,3 +4,11 @@ export GRAPHITE_AMQP_USER='{{ pillar['graphite']['user'] }}'
 export GRAPHITE_AMQP_PASSWORD='{{ pillar['graphite']['password'] }}'
 export GRAPHITE_AMQP_PASSWORD='{{ pillar['graphite']['password'] }}'
 export GRAPHITE_AMQP_QUEUE='{{ pillar['graphite']['queue'] }}'
 export GRAPHITE_AMQP_QUEUE='{{ pillar['graphite']['queue'] }}'
 export GRAPHITE_AMQP_VHOST='{{ pillar['graphite']['vhost'] }}'
 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

@@ -7,5 +7,7 @@ gitrepo_monitor-client:
     - rev: {{ pillar['monitor-client']['repo_revision'] }}
     - rev: {{ pillar['monitor-client']['repo_revision'] }}
     - target: /home/{{ pillar['user'] }}/monitor-client
     - target: /home/{{ pillar['user'] }}/monitor-client
     - user: {{ pillar['user'] }}
     - user: {{ pillar['user'] }}
+    - identity:
+      - {{ pillar['git_repo_key'] }}
     - require:
     - require:
       - pkg: git
       - pkg: git

salt/storagedriver/files/postactivate

 export AMQP_URI=amqp://{{ pillar['amqp']['user'] }}:{{ pillar['amqp']['password'] }}@{{ pillar['amqp']['host'] }}:{{ pillar['amqp']['port'] }}/{{ pillar['amqp']['vhost'] }}
 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 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

@@ -7,5 +7,7 @@ gitrepo_storagedriver:
     - rev: {{ pillar['storagedriver']['repo_revision'] }}
     - rev: {{ pillar['storagedriver']['repo_revision'] }}
     - target: /home/{{ pillar['user'] }}/storagedriver
     - target: /home/{{ pillar['user'] }}/storagedriver
     - user: {{ pillar['user'] }}
     - user: {{ pillar['user'] }}
+    - identity:
+      - {{ pillar['git_repo_key'] }}
     - require:
     - require:
       - pkg: git
       - pkg: git

salt/vmdriver/files/postactivate

@@ -4,3 +4,10 @@ export LIBVIRT_URI=qemu:///system
 export HYPERVISOR_TYPE=kvm
 export HYPERVISOR_TYPE=kvm
 export NATIVE_OVS=True
 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

@@ -7,5 +7,7 @@ gitrepo_vmdriver:
     - rev: {{ pillar['vmdriver']['repo_revision'] }}
     - rev: {{ pillar['vmdriver']['repo_revision'] }}
     - target: /home/{{ pillar['user'] }}/vmdriver
     - target: /home/{{ pillar['user'] }}/vmdriver
     - user: {{ pillar['user'] }}
     - user: {{ pillar['user'] }}
+    - identity:
+      - {{ pillar['git_repo_key'] }}
     - require:
     - require:
       - pkg: git
       - pkg: git