Skip to content
Snippets Groups Projects
Commit 4835a378 authored by Hahn Axel (hahn)'s avatar Hahn Axel (hahn)
Browse files

update configuration files

parent f8ae8902
No related branches found
No related tags found
1 merge request!72OP#7651 CI Server: beide AWX ansteuerbar machen https://projects.iml.unibe.ch/work_packages/7651
...@@ -90,9 +90,13 @@ return [ ...@@ -90,9 +90,13 @@ return [
'plugins'=>[ 'plugins'=>[
'rollout'=>[ 'rollout'=>[
'default'=>[], 'default'=>[
'plugin'=>'default',
],
/* /*
'ssh'=>[ 'ssh'=>[
'plugin'=>'ssh',
'label'=>'Puppet via SSH',
'user'=>'imldeployment', 'user'=>'imldeployment',
'privatekey'=>'', 'privatekey'=>'',
'addkeycommand'=>'/usr/bin/ssh-keygen -R %s; /usr/bin/ssh-keyscan -t rsa %s >> /home/www-data/.ssh/known_hosts', 'addkeycommand'=>'/usr/bin/ssh-keygen -R %s; /usr/bin/ssh-keyscan -t rsa %s >> /home/www-data/.ssh/known_hosts',
...@@ -100,6 +104,8 @@ return [ ...@@ -100,6 +104,8 @@ return [
'command'=>'/usr/local/bin/puppetrun.sh', 'command'=>'/usr/local/bin/puppetrun.sh',
], ],
'awx'=>[ 'awx'=>[
'plugin'=>'awx',
'label'=>'AWX - awx.example.com',
'url'=>'https://awx.example.com/api/v2', // no ending "/" 'url'=>'https://awx.example.com/api/v2', // no ending "/"
'user'=>'ciserver', 'user'=>'ciserver',
'password'=>'ciserver', 'password'=>'ciserver',
......
...@@ -144,9 +144,12 @@ return [ ...@@ -144,9 +144,12 @@ return [
'zip'=>[], 'zip'=>[],
], ],
'rollout'=>[ 'rollout'=>[
'default'=>[], 'default'=>[
'plugin'=>'default',
],
/* /*
'ssh'=>[ 'ssh'=>[
'plugin'=>'ssh',
'user'=>'deployment', 'user'=>'deployment',
'privatekey'=>'', 'privatekey'=>'',
'addkeycommand'=>'/usr/bin/ssh-keygen -R %s; /usr/bin/ssh-keyscan -t rsa %s >> /home/www-data/.ssh/known_hosts', 'addkeycommand'=>'/usr/bin/ssh-keygen -R %s; /usr/bin/ssh-keyscan -t rsa %s >> /home/www-data/.ssh/known_hosts',
...@@ -154,6 +157,8 @@ return [ ...@@ -154,6 +157,8 @@ return [
'command'=>'/usr/local/bin/puppetrun.sh', 'command'=>'/usr/local/bin/puppetrun.sh',
], ],
'awx'=>[ 'awx'=>[
'plugin'=>'awx',
'label'=>'AWX - awx.example.com',
'url'=>'https://awx.example.com/api/v2', // no ending "/" 'url'=>'https://awx.example.com/api/v2', // no ending "/"
'user'=>'ciserver', 'user'=>'ciserver',
'password'=>'ciserver', 'password'=>'ciserver',
......
...@@ -71,6 +71,8 @@ return [ ...@@ -71,6 +71,8 @@ return [
'rollout'=>[ 'rollout'=>[
'default'=>[], 'default'=>[],
'ssh'=>[ 'ssh'=>[
'plugin'=>'ssh',
'label'=>'SSH',
'user'=>'<%= @replace["rollout-ssh-user"] %>', 'user'=>'<%= @replace["rollout-ssh-user"] %>',
'privatekey'=>'', 'privatekey'=>'',
'addkeycommand'=>'/usr/bin/ssh-keygen -R %s; /usr/bin/ssh-keyscan -t rsa %s >> /home/www-data/.ssh/known_hosts', 'addkeycommand'=>'/usr/bin/ssh-keygen -R %s; /usr/bin/ssh-keyscan -t rsa %s >> /home/www-data/.ssh/known_hosts',
...@@ -78,6 +80,8 @@ return [ ...@@ -78,6 +80,8 @@ return [
'command'=>'<%= @replace["rollout-ssh-command"] %>', 'command'=>'<%= @replace["rollout-ssh-command"] %>',
], ],
'awx'=>[ 'awx'=>[
'plugin'=>'awx',
'label'=>'AWX',
'url'=>'<%= @replace["rollout-axw-url"] %>', // no ending "/" 'url'=>'<%= @replace["rollout-axw-url"] %>', // no ending "/"
'user'=>'<%= @replace["rollout-axw-user"] %>', 'user'=>'<%= @replace["rollout-axw-user"] %>',
'password'=>'<%= @replace["rollout-axw-password"] %>', 'password'=>'<%= @replace["rollout-axw-password"] %>',
...@@ -85,6 +89,16 @@ return [ ...@@ -85,6 +89,16 @@ return [
'tags'=>'<%= @replace["rollout-axw-tags"] %>', 'tags'=>'<%= @replace["rollout-axw-tags"] %>',
// 'ignore-ssl-error'=>false, // 'ignore-ssl-error'=>false,
], ],
'awx.aae'=>[
'plugin'=>'awx',
'label'=>'AWX',
'url'=>'<%= @replace["rollout-axw-aae-url"] %>', // no ending "/"
'user'=>'<%= @replace["rollout-axw-aae-user"] %>',
'password'=>'<%= @replace["rollout-axw-aae-password"] %>',
'jobtemplate'=>'<%= @replace["rollout-axw-aae-jobtemplate"] %>',
'tags'=>'<%= @replace["rollout-axw-aae-tags"] %>',
// 'ignore-ssl-error'=>false,
],
], ],
], ],
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment