From 11c1dcc1bca257075ff3214b4b0284996d7923c8 Mon Sep 17 00:00:00 2001 From: Ricardo Carrillo Cruz Date: Wed, 12 Aug 2015 13:50:07 +0200 Subject: [PATCH] Add initial Jenkins master orchestration --- roles/bootstrap_puppetmaster/tasks/main.yml | 5 +++++ roles/bootstrap_puppetmaster/templates/jenkins.yaml.j2 | 8 ++++++++ 2 files changed, 13 insertions(+) create mode 100644 roles/bootstrap_puppetmaster/templates/jenkins.yaml.j2 diff --git a/roles/bootstrap_puppetmaster/tasks/main.yml b/roles/bootstrap_puppetmaster/tasks/main.yml index bfad55a..ed5272e 100644 --- a/roles/bootstrap_puppetmaster/tasks/main.yml +++ b/roles/bootstrap_puppetmaster/tasks/main.yml @@ -51,6 +51,11 @@ src=zuul.yaml.j2 dest=/etc/puppet/hieradata/production/fqdn/{{ groups['meta-infra_type_zuul'][0] }}.yaml +- name: Deploy Jenkins master server template for hiera + template: > + src=jenkins.yaml.j2 + dest=/etc/puppet/hieradata/production/fqdn/{{ groups['meta-infra_type_jenkins'][0] }}.yaml + - name: Start puppet agent service service: name=puppet enabled=yes state=started diff --git a/roles/bootstrap_puppetmaster/templates/jenkins.yaml.j2 b/roles/bootstrap_puppetmaster/templates/jenkins.yaml.j2 new file mode 100644 index 0000000..16dc933 --- /dev/null +++ b/roles/bootstrap_puppetmaster/templates/jenkins.yaml.j2 @@ -0,0 +1,8 @@ +--- +classes: + - jenkins::master + +jenkins::master::ssl_cert_file: /etc/ssl/certs/ssl-cert-snakeoil.pem +jenkins::master::ssl_key_file: /etc/ssl/private/ssl-cert-snakeoil.key +jenkins::master::jenkins_ssh_private_key: "%{hiera('jenkins_ssh_private_key')}" +jenkins::master::jenkins_ssh_public_key: "%{hiera('jenkins_ssh_public_key')}"