Merge pull request #168 from greg-hellings/docker_cleanups

greg-hellings · web-flow · commit 6b6952967022 · 2017-09-13T11:44:59.000-05:00
Docker cleanups
diff --git a/CHANGELOG b/CHANGELOG
@@ -1,4 +1,6 @@
 v 0.8.3 (next)
+- Clean up TravisCI tests
+- Clean up Docker UID variable for OpenShift support
 - Stop Jenkins process before upgrading
 - Avoid modifying Beaker during upgrades
 - Make jenkins user passwords optional, to avoid unnecessarily changing them
diff --git a/cinch/group_vars/jenkins_docker_slave b/cinch/group_vars/jenkins_docker_slave
@@ -1,6 +1,3 @@
 repositories: "{{ jenkins_slave_repositories }}"
 
 download_repositories: "{{ jenkins_slave_download_repositories }}"
-
-# For certain OpenShift instances a value of '1000090000' is recommended.
-jenkins_user_uid: 1000090000
diff --git a/cinch/roles/jenkins_master/tasks/ensure_up.yml b/cinch/roles/jenkins_master/tasks/ensure_up.yml
@@ -5,9 +5,17 @@
   tags:
     - jenkins_check_mode
 
+- name: discover valid hostname for containers
+  set_fact:
+    _jenkins_host: 'localhost'
+  when: ansible_connection == 'docker'
+  tags:
+    - jenkins_check_mode
+
 - name: discover valid hostname
   set_fact:
     _jenkins_host: "{{ ansible_host | default(inventory_hostname | default('localhost')) }}"
+  when: ansible_connection != 'docker'
   tags:
     - jenkins_check_mode
 
diff --git a/inventory/cent6_jswarm_docker/group_vars/all b/inventory/cent6_jswarm_docker/group_vars/all
@@ -0,0 +1,2 @@
+# For certain OpenShift instances a value of '1000090000' is recommended.
+jenkins_user_uid: 1000090000
diff --git a/inventory/cent7_jswarm_docker/group_vars/all b/inventory/cent7_jswarm_docker/group_vars/all
@@ -0,0 +1,3 @@
+# For certain OpenShift instances a value of '1000090000' is recommended.
+jenkins_user_uid: 1000090000
+
diff --git a/inventory/cent7_master_docker/group_vars/all b/inventory/cent7_master_docker/group_vars/all
@@ -0,0 +1,3 @@
+# For certain OpenShift instances a value of '1000090000' is recommended.
+jenkins_user_uid: 1000090000
+
diff --git a/inventory/fedora_jswarm_docker/group_vars/all b/inventory/fedora_jswarm_docker/group_vars/all
@@ -0,0 +1,3 @@
+# For certain OpenShift instances a value of '1000090000' is recommended.
+jenkins_user_uid: 1000090000
+
diff --git a/inventory/fedora_master_docker/group_vars/all b/inventory/fedora_master_docker/group_vars/all
@@ -0,0 +1,3 @@
+# For certain OpenShift instances a value of '1000090000' is recommended.
+jenkins_user_uid: 1000090000
+

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,2 @@`
	`1`	`+# For certain OpenShift instances a value of '1000090000' is recommended.`
	`2`	`+jenkins_user_uid: 1000090000`
Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,3 @@`
	`1`	`+# For certain OpenShift instances a value of '1000090000' is recommended.`
	`2`	`+jenkins_user_uid: 1000090000`
	`3`	`+`