diff --git a/config/config_custom.php.dist b/config/config_custom.php.dist index 50c09d5c8769a35144225b26528d2078b8234068..88d249c3d5d7781529bc66b907cf89c12fc39185 100644 --- a/config/config_custom.php.dist +++ b/config/config_custom.php.dist @@ -90,9 +90,13 @@ return [ 'plugins'=>[ 'rollout'=>[ - 'default'=>[], + 'default'=>[ + 'plugin'=>'default', + ], /* 'ssh'=>[ + 'plugin'=>'ssh', + 'label'=>'Puppet via SSH', 'user'=>'imldeployment', 'privatekey'=>'', '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 [ 'command'=>'/usr/local/bin/puppetrun.sh', ], 'awx'=>[ + 'plugin'=>'awx', + 'label'=>'AWX - awx.example.com', 'url'=>'https://awx.example.com/api/v2', // no ending "/" 'user'=>'ciserver', 'password'=>'ciserver', diff --git a/config/config_defaults.php b/config/config_defaults.php index d0e3681d30855628657c846863e813401308a909..3c8d7ceffc3242fd5650605e18de1962b5dd747a 100644 --- a/config/config_defaults.php +++ b/config/config_defaults.php @@ -144,9 +144,12 @@ return [ 'zip'=>[], ], 'rollout'=>[ - 'default'=>[], + 'default'=>[ + 'plugin'=>'default', + ], /* 'ssh'=>[ + 'plugin'=>'ssh', 'user'=>'deployment', 'privatekey'=>'', '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 [ 'command'=>'/usr/local/bin/puppetrun.sh', ], 'awx'=>[ + 'plugin'=>'awx', + 'label'=>'AWX - awx.example.com', 'url'=>'https://awx.example.com/api/v2', // no ending "/" 'user'=>'ciserver', 'password'=>'ciserver', diff --git a/hooks/templates/config_custom.php.erb b/hooks/templates/config_custom.php.erb index e128b89b9492e10c972785da2b79bc7824072458..8788cb193f0abdc5ddeab4224e4bc95e0411f090 100644 --- a/hooks/templates/config_custom.php.erb +++ b/hooks/templates/config_custom.php.erb @@ -71,6 +71,8 @@ return [ 'rollout'=>[ 'default'=>[], 'ssh'=>[ + 'plugin'=>'ssh', + 'label'=>'SSH', 'user'=>'<%= @replace["rollout-ssh-user"] %>', 'privatekey'=>'', '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 [ 'command'=>'<%= @replace["rollout-ssh-command"] %>', ], 'awx'=>[ + 'plugin'=>'awx', + 'label'=>'AWX', 'url'=>'<%= @replace["rollout-axw-url"] %>', // no ending "/" 'user'=>'<%= @replace["rollout-axw-user"] %>', 'password'=>'<%= @replace["rollout-axw-password"] %>', @@ -85,6 +89,16 @@ return [ 'tags'=>'<%= @replace["rollout-axw-tags"] %>', // '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, + ], ], ],