Skip to content

Commit 0f9f5a7

Browse files
committed
recreate master, jenkins/artifactory vols ok
1 parent 51b7d10 commit 0f9f5a7

File tree

2 files changed

+12
-15
lines changed

2 files changed

+12
-15
lines changed

group_vars/all

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -65,9 +65,7 @@ ec2_vol_worker_swap: {
6565
# ami-6d03030d --> https://wiki.debian.org/Cloud/AmazonEC2Image/Stretch
6666
# the network interface specifies everything relevant (configured manually via the ec2 console, along with security groups and the IAM instance profile stuff)
6767
ec2_instances: [
68-
{name: "jenkins-master", instance_type: "m4.large", image: "ami-6d03030d", network_interface: "eni-f9c808fc", instance_profile_name: "JenkinsMaster", groupname: ["master"], volumes: ["{{ec2_vol_jenkins}}", "{{ec2_vol_artifactory}}"]},
69-
{name: "jenkins-worker-publish", instance_type: "c4.xlarge" , image: "ami-6d03030d", network_interface: "eni-f00ecef5", instance_profile_name: "JenkinsWorkerPublish", groupname: ["worker", "publisher"], volumes: ["{{ec2_vol_worker}}"]},
70-
# TODO: ec2_vol_worker_swap
68+
{name: "jenkins-master", instance_type: "m4.large", image: "ami-6d03030d", network_interface: "eni-0ea0c09ec4a3df295", instance_profile_name: "JenkinsMaster", groupname: ["master"], volumes: ["{{ec2_vol_jenkins}}", "{{ec2_vol_artifactory}}"]},
7169
{name: "jenkins-worker-behemoth-1", instance_type: "c4.2xlarge", image: "ami-6d03030d", network_interface: "eni-0e0ccc0b", instance_profile_name: "JenkinsWorker", groupname: ["worker"], volumes: ["{{ec2_vol_behemoth}}", "{{ec2_vol_worker_swap}}"]},
7270
{name: "jenkins-worker-behemoth-2", instance_type: "c4.2xlarge", image: "ami-6d03030d", network_interface: "eni-8f0dcd8a", instance_profile_name: "JenkinsWorker", groupname: ["worker"], volumes: ["{{ec2_vol_behemoth}}", "{{ec2_vol_worker_swap}}"]},
7371
{name: "jenkins-worker-behemoth-3", instance_type: "c4.2xlarge", image: "ami-6d03030d", network_interface: "eni-33478936", instance_profile_name: "JenkinsWorker", groupname: ["worker"], volumes: ["{{ec2_vol_behemoth}}", "{{ec2_vol_worker_swap}}"]},
@@ -81,7 +79,6 @@ ec2_instances: [
8179
# notes:
8280
# - the ip addresses are ultimately defined by the network interface argument for the ec2 instance
8381
jenkins_nodes: [
84-
{host: "172.31.2.2", privateKeyFile: "/var/lib/jenkins/.ssh/id_worker_publisher"}, # 876bcf12-d295-4791-b5bb-98e1d12be978 public_ip: "54.67.33.167"
8582
{host: "172.31.2.3", privateKeyFile: "/var/lib/jenkins/.ssh/id_worker"}, # 954dd564-ce8c-43d1-bcc5-97abffc81c57 public_ip: "54.153.2.9"
8683
{host: "172.31.2.4", privateKeyFile: "/var/lib/jenkins/.ssh/id_worker"}, # 954dd564-ce8c-43d1-bcc5-97abffc81c57 public_ip: "54.153.1.99"
8784
{host: "172.31.2.5", privateKeyFile: "/var/lib/jenkins/.ssh/id_worker"}, # 954dd564-ce8c-43d1-bcc5-97abffc81c57 public_ip: "54.183.156.89"

site.yml

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -42,15 +42,15 @@
4242
- worker
4343

4444
# To create the inital jenkins config, use `ansible-playbook site.yml --tags boot_jenkins` (after first doing a normal run)
45-
- name: Bootstrap jenkins
46-
hosts: master
47-
gather_facts: yes
48-
remote_user: "{{admin_user}}"
49-
become: true
50-
tasks:
51-
- include_tasks: roles/jenkins/tasks/bootstrap.yml
52-
tags:
53-
- boot_jenkins
45+
# - name: Bootstrap jenkins
46+
# hosts: master
47+
# gather_facts: yes
48+
# remote_user: "{{admin_user}}"
49+
# become: true
50+
# tasks:
51+
# - include_tasks: roles/jenkins/tasks/bootstrap.yml
52+
# tags:
53+
# - boot_jenkins
5454

5555
- name: Finish jenkins bootstrap using jenkins cli
5656
hosts: localhost
@@ -59,5 +59,5 @@
5959
become: false
6060
tasks:
6161
- include_tasks: roles/jenkins/tasks/bootstrap-cli.yml
62-
tags:
63-
- boot_jenkins
62+
# tags:
63+
# - boot_jenkins

0 commit comments

Comments
 (0)