From b175c1404f36a3f3bdce6e3992317f02359d7e1d Mon Sep 17 00:00:00 2001
From: George Adams <george.adams@uk.ibm.com>
Date: Thu, 5 Jul 2018 11:55:46 +0100
Subject: [PATCH] add release-macstadium-macos10.11-x64-1

---
 ansible/inventory.yml                                 | 3 +++
 ansible/roles/baselayout/tasks/main.yml               | 8 ++++++++
 ansible/roles/java-base/tasks/main.yml                | 9 ++++++++-
 ansible/roles/package-upgrade/tasks/partials/brew.yml | 4 ++--
 4 files changed, 21 insertions(+), 3 deletions(-)

diff --git a/ansible/inventory.yml b/ansible/inventory.yml
index 28936255a..29f537d2d 100644
--- a/ansible/inventory.yml
+++ b/ansible/inventory.yml
@@ -63,6 +63,9 @@ hosts:
     - packetnet:
         centos7-arm64-1: {ip: 147.75.104.218}
 
+    - macstadium:
+        macos10.11-x64-1: {ip: 207.254.58.162, port: 10013, user: administrator}
+
     - marist:
         zos13-s390x-1: {ip: 148.100.36.135, user: Unix1}
 
diff --git a/ansible/roles/baselayout/tasks/main.yml b/ansible/roles/baselayout/tasks/main.yml
index 728c4e786..d8d3d30c7 100644
--- a/ansible/roles/baselayout/tasks/main.yml
+++ b/ansible/roles/baselayout/tasks/main.yml
@@ -20,6 +20,14 @@
         and not os|startswith("macos")
   hostname: name="{{ safe_hostname }}"
 
+- name: Set hostname to inventory_hostname macOS
+  command: "{{ item }}"
+  with_items:
+    - "sudo scutil --set HostName {{ inventory_hostname }}.nodejs.org"
+    - "sudo scutil --set ComputerName {{ inventory_hostname }}.nodejs.org"
+    - "dscacheutil -flushcache"
+  when: os|startswith("macos")
+
 - name: disable joyent smartconnect
   when: os|startswith("smartos")
   notify: restart sshd
diff --git a/ansible/roles/java-base/tasks/main.yml b/ansible/roles/java-base/tasks/main.yml
index bbd41b86c..a8b5e4238 100644
--- a/ansible/roles/java-base/tasks/main.yml
+++ b/ansible/roles/java-base/tasks/main.yml
@@ -55,7 +55,14 @@
   ignore_errors: yes
 
 - name: install java
-  when: java.rc > 0 and not os|startswith("zos") and arch != "ppc64" and not inventory_hostname|regex_search('-arm(v6l|v7l|64)_pi')
+  when:
+    - java.rc > 0 and not os|startswith("zos") and arch != "ppc64" and not inventory_hostname|regex_search('-arm(v6l|v7l|64)_pi')
+    - java.rc > 0 and not os|startswith("macos")
+  package: name="{{ java_package_name }}" state=present
+
+- name: install java (macOS)
+  become_user: administrator
+  when: java.rc > 0 and os|startswith("macos")
   package: name="{{ java_package_name }}" state=present
 
 - name: install webupd8 oracle java 8 extras
diff --git a/ansible/roles/package-upgrade/tasks/partials/brew.yml b/ansible/roles/package-upgrade/tasks/partials/brew.yml
index e5bc54b15..951d998b5 100644
--- a/ansible/roles/package-upgrade/tasks/partials/brew.yml
+++ b/ansible/roles/package-upgrade/tasks/partials/brew.yml
@@ -10,7 +10,7 @@
     ignore_errors: yes
 
   - name: Install xcode-tools
-    script: files/partials/install-xcode.sh
+    script: files/install-xcode.sh
     when: xcode.rc > 1
 
   - name: Check if Homebrew is already installed
@@ -20,7 +20,7 @@
 
   - name: Install Homebrew
     become_user: administrator
-    script: files/partials/install-homebrew.sh
+    script: files/install-homebrew.sh
     when: not brew.stat.exists
 
   - name: Upgrade installed packages