From c05fddf139e2a7ba9032ed1d1710929b9679b59c Mon Sep 17 00:00:00 2001
From: Imran Iqbal <iqbalmy@hotmail.com>
Date: Mon, 16 May 2022 12:34:50 +0100
Subject: [PATCH] feat(macos): use `saltstack` as package to install
---
salt/osfamilymap.yaml | 1 +
test/integration/default/files/_mapdata/mac_os_x-10.yaml | 2 +-
test/integration/default/files/_mapdata/mac_os_x-11.yaml | 2 +-
test/integration/default/files/_mapdata/mac_os_x-12.yaml | 2 +-
4 files changed, 4 insertions(+), 3 deletions(-)
diff --git a/salt/osfamilymap.yaml b/salt/osfamilymap.yaml
index 6f03da8..e2e48a6 100644
--- a/salt/osfamilymap.yaml
+++ b/salt/osfamilymap.yaml
@@ -138,6 +138,7 @@ Windows:
rootuser: {{ rootuser | d('') }}
MacOS:
+ salt_master: saltstack
salt_minion: salt
salt_minion_pkg_source: ''
salt_minion_pkg_hash: ''
diff --git a/test/integration/default/files/_mapdata/mac_os_x-10.yaml b/test/integration/default/files/_mapdata/mac_os_x-10.yaml
index b6678b7..b8f0fa7 100644
--- a/test/integration/default/files/_mapdata/mac_os_x-10.yaml
+++ b/test/integration/default/files/_mapdata/mac_os_x-10.yaml
@@ -101,7 +101,7 @@ values:
rootuser: runner
salt_api: salt-api
salt_cloud: salt-cloud
- salt_master: salt-master
+ salt_master: saltstack
salt_master_macos_plist_hash: 8435331b2d48ca8f0759f216e5b15ec9171a4216b1441328c732c6906728b7c9
salt_minion: salt
salt_minion_macos_plist_hash: 26b33da12e0d8960ee96b488c8352002c22a377c19bf3df3f986a1e49eca8b20
diff --git a/test/integration/default/files/_mapdata/mac_os_x-11.yaml b/test/integration/default/files/_mapdata/mac_os_x-11.yaml
index b6678b7..b8f0fa7 100644
--- a/test/integration/default/files/_mapdata/mac_os_x-11.yaml
+++ b/test/integration/default/files/_mapdata/mac_os_x-11.yaml
@@ -101,7 +101,7 @@ values:
rootuser: runner
salt_api: salt-api
salt_cloud: salt-cloud
- salt_master: salt-master
+ salt_master: saltstack
salt_master_macos_plist_hash: 8435331b2d48ca8f0759f216e5b15ec9171a4216b1441328c732c6906728b7c9
salt_minion: salt
salt_minion_macos_plist_hash: 26b33da12e0d8960ee96b488c8352002c22a377c19bf3df3f986a1e49eca8b20
diff --git a/test/integration/default/files/_mapdata/mac_os_x-12.yaml b/test/integration/default/files/_mapdata/mac_os_x-12.yaml
index b6678b7..b8f0fa7 100644
--- a/test/integration/default/files/_mapdata/mac_os_x-12.yaml
+++ b/test/integration/default/files/_mapdata/mac_os_x-12.yaml
@@ -101,7 +101,7 @@ values:
rootuser: runner
salt_api: salt-api
salt_cloud: salt-cloud
- salt_master: salt-master
+ salt_master: saltstack
salt_master_macos_plist_hash: 8435331b2d48ca8f0759f216e5b15ec9171a4216b1441328c732c6906728b7c9
salt_minion: salt
salt_minion_macos_plist_hash: 26b33da12e0d8960ee96b488c8352002c22a377c19bf3df3f986a1e49eca8b20
--
GitLab