saving uncommitted changes in /etc prior to emerge run

diff --git a/.etckeeper b/.etckeeper
index 0bd3598bdde09abd17df837143fe88572903c847..50992d7fc7c8b2457f8f248272c8cbe0fe2c66e7 100755 (executable)
--- a/.etckeeper
+++ b/.etckeeper
@@ -874,7 +874,18 @@ maybe chmod 0644 'salt/pki/master/minions/storage1501.dc2.us.profitbricks.net'
 maybe chmod 0644 'salt/pki/master/minions/storage1601.dc2.us.profitbricks.net'
 maybe chmod 0644 'salt/pki/master/minions/storage1604.dc2.us.profitbricks.net'
 maybe chmod 0644 'salt/pki/master/minions/storage2.stage.pb.local'
+maybe chmod 0644 'salt/pki/master/minions/storage3.stage.pb.local'
+maybe chmod 0644 'salt/pki/master/minions/storage4.stage.pb.local'
 maybe chmod 0644 'salt/pki/master/minions/storage7.stage.pb.local.pub'
+maybe chmod 0644 'salt/pki/master/minions/ztest-ftp.pb.local'
+maybe chmod 0644 'salt/pki/master/minions/ztest-pserver1.pb.local'
+maybe chmod 0644 'salt/pki/master/minions/ztest-pserver2.pb.local'
+maybe chmod 0644 'salt/pki/master/minions/ztest-storage1.pb.local'
+maybe chmod 0644 'salt/pki/master/minions/ztest-storage2.pb.local'
+maybe chmod 0644 'salt/pki/master/minions/ztest-storage3.pb.local'
+maybe chmod 0644 'salt/pki/master/minions/ztest-storage4.pb.local'
+maybe chmod 0644 'salt/pki/master/minions/ztest-storage5.stage.pb.local'
+maybe chmod 0644 'salt/pki/master/minions/ztest-storage6.stage.pb.local'
 maybe chmod 0755 'salt/pki/master/minions_autosign'
 maybe chmod 0755 'salt/pki/master/minions_denied'
 maybe chmod 0770 'salt/pki/master/minions_pre'

diff --git a/salt/pki/master/minions/storage3.stage.pb.local b/salt/pki/master/minions/storage3.stage.pb.local
new file mode 100644 (file)
index 0000000..fa74ca6
--- /dev/null
+++ b/salt/pki/master/minions/storage3.stage.pb.local
@@ -0,0 +1,14 @@
+-----BEGIN PUBLIC KEY-----
+MIICIjANBgkqhkiG9w0BAQEFAAOCAg8AMIICCgKCAgEAwEieIGOkv/YX3z/MwtMa
+EpBRXMWWmrRewww4eWgcwUtY0ZCEBn9VsJcI8j4wQT5SDkTWlM/m+tLSG2bbWb1A
+uVGHmsQvA0kYKVCecyryKLdG8Ad34r5UW54Mqeynxhtr19KVvGBPoWKXhGU/9iGQ
+Om8yMsgsdumQj09PD/QUsnpV77eAIQr2kquhaWmPiQb7C2rQg3HSm9iKDcfxYi+1
+W2/KOsbVxsu3aIIIL70VrF83ykzHFk6erpQDD10z3BRQ2NwrmS6Q/hFTQr3PqVfC
+FpJ4dQI3DYcsK4uFuh1BU6Yn+KHcr4BOYwekII/5xI3lrRHZ9htlCQa8ukJN+Ubq
+HgsN8l2lONgjLn2P5Fo+TH2dglYtL8pMCi360gX55PwqYayVIrFy5QhmcukMMeXI
+odTGqtPOEtrtrMW0Cewm73hE02g1LhGkzkq6Oc5l3sb+M5ySf09qx3IqNMT8ad1q
+6jr1IU0rT0BYh47efNo/gAv5vkxExUthI4BqO8FkaCJXhHGKJ8G6VTh0jccY5uRY
+9lvU4nnR3psMVAGGA70yoJNscy15legpV+co62AQRZrnF0QoS605cyCd3PqFlxnK
+sLlWhzjcXB0+QR163da4tjl9Qveu8hyTYy3WyVej53r7kTXuEogvBWrvSUofI9PF
+fy+Qm1Rv6quUO6ly+oTlOe0CAwEAAQ==
+-----END PUBLIC KEY-----

diff --git a/salt/pki/master/minions/storage4.stage.pb.local b/salt/pki/master/minions/storage4.stage.pb.local
new file mode 100644 (file)
index 0000000..cc99d20
--- /dev/null
+++ b/salt/pki/master/minions/storage4.stage.pb.local
@@ -0,0 +1,14 @@
+-----BEGIN PUBLIC KEY-----
+MIICIjANBgkqhkiG9w0BAQEFAAOCAg8AMIICCgKCAgEAuo9prwFfN49w8G3U3EZ3
+qQTcqv4yZptuaGtY75YSLtiDyKbfL/h6r8+1cE11Ppjs01lafqghqJ+PYb/iIf/E
+maf4OONZMVxBmDQ+iMr0ew5KHVLLBQRYhVlGYWAx7k2N9T3Y3cixrslFOqIelocW
+KrrXy9Ku0jBTZ2bm2/hSIUJUHKe9H0PrUuG33PbOD0NM++kElC6kEXyifZnjsIUI
+L9E98WFC77xxi866jClTdWZn7rxJYPjd/9HIpmDp5s07oBBd3WB9BCkIq0mQt/gt
+cu9M0sXh+B/zNuIg9JVnMYQOM42Wom43HUR45D+0uOsvvwo5li18+sEwB6vV4Faj
+K0YTrtciWO5+CSXLaqKN5W2S3toWeoMUNqCbelgEjE/nZQIfQDQS/GCrAGlxIWsA
+Lo/AFz2mOE32rYP6Y0/GaehX5nY4PcSGQiKOHYkfQzyI3ZCscDdm4e+xoDr3yjLF
+IYO9Itp9RY9b8MD7nxkElmcRTvv+OJZl65ixiGz7tX8UNhvY0g2Ht+rEDGWbM2MQ
+oi5lDohZc214R8lb3QaM4yg1WLB3iXwgovVIjEzvCITQiRj3wspzwwp4RMF5jG4p
+eK5D23bDU9LW+BGuNHI5U4oV+ZHdv6E3v2e0TozNmbeUDQX/hXgOFh8uekPiqK+H
+eHhuKuWAR6RG07g2OamGcNECAwEAAQ==
+-----END PUBLIC KEY-----

diff --git a/salt/pki/master/minions/ztest-ftp.pb.local b/salt/pki/master/minions/ztest-ftp.pb.local
new file mode 100644 (file)
index 0000000..aed69cb
--- /dev/null
+++ b/salt/pki/master/minions/ztest-ftp.pb.local
@@ -0,0 +1,9 @@
+-----BEGIN PUBLIC KEY-----
+MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAkc5Hifs2QB6f4zzYi18P
+cYm3xVOLmuyA3hCWbaj40m7IjUg1egFwCvueycRq15DHilTm5NQFdTMyJ8mMwA2N
+5+R+6t6HaikeYuCkGZiviAjdAy2wI7Ba1HgkantzH208SokW+k4lFoVG4feQjiDK
+eHqjOg9EL/djoDH0tnpTIh5bbdH3xGubL2CdAPfB/DEZhLIk6GtSezhTB0RUpSHg
+jNL+czXjLP6kL6mjBHzntmkdE5whNAz3lVxbZsS8CJc/13HvChCYrnliqZqK//bp
+MXE73OMen06pFrh5dcuNmmaPnFRJFgZbLY7T+6rzfrlvOUtIsjQIr1nrRdINaxmy
+zQIDAQAB
+-----END PUBLIC KEY-----
\ No newline at end of file

diff --git a/salt/pki/master/minions/ztest-pserver1.pb.local b/salt/pki/master/minions/ztest-pserver1.pb.local
new file mode 100644 (file)
index 0000000..20e44ce
--- /dev/null
+++ b/salt/pki/master/minions/ztest-pserver1.pb.local
@@ -0,0 +1,9 @@
+-----BEGIN PUBLIC KEY-----
+MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA5T/Ql0/OVE6dO+fDtjLc
+41WMyS50CUFetTa44NPst4tF6q7tTl3jsnWSonU+HounXqUU5Dmb2vBRoUoX7LFK
+Bi4PhM2aZtKkOYSontvVujvkpcImAkauvXT1mSNGDv/Y/bn2dXCFgqUZhJI64dgn
+iCXucZVZn/ovaj1TQ5aDoQtAD0HXA/8pkMJWuUq/G5ndTqtXusOJIXmeVAwb8jYj
+812vZrwErUvdx8NMS+qwvFUN1eOgYXWca+yQWT38i+pzGu2G1DBq6hNsESvAcO6N
+4g+H2DcuGWcpdZhaiNIB6B14CKXNPMHib8yu1v4NqlnwSyelArs0A5OMWEARRGYe
+UwIDAQAB
+-----END PUBLIC KEY-----
\ No newline at end of file

diff --git a/salt/pki/master/minions/ztest-pserver2.pb.local b/salt/pki/master/minions/ztest-pserver2.pb.local
new file mode 100644 (file)
index 0000000..eeac01e
--- /dev/null
+++ b/salt/pki/master/minions/ztest-pserver2.pb.local
@@ -0,0 +1,9 @@
+-----BEGIN PUBLIC KEY-----
+MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAyei5DRwa6GaAKqHgYBvz
+FWRwD6dzV6TFkw5Iu0qVynL/XjQxKgTO7dZnZEy5OrCvMO1cXN4v9EBqTHO5gGms
+s7S3ohm9yFxolp7DMekj8mq1TVqepfkktAoV9Y1VOyt+Xgz8lgqtve70g97goDt7
+VylrCep+h9RS7kESo5lUvBNwQXKp6N22TWw4ZqUAOtKAXRXm6hMYrXa3U3G2h/Fr
+iRjlbvV1L7+3pJtzncezhtrwXmVxGb25wMLbpzSgSu/JCRxlax5KYK79uXZ616mb
+aJZkHKohznZvNJPNyZ1LMqUDB3SmOpCpQVOT1TO0qxoBbkK/Rr7kBU6u4/vqtOpd
+QQIDAQAB
+-----END PUBLIC KEY-----

diff --git a/salt/pki/master/minions/ztest-storage1.pb.local b/salt/pki/master/minions/ztest-storage1.pb.local
new file mode 100644 (file)
index 0000000..cb3e6b8
--- /dev/null
+++ b/salt/pki/master/minions/ztest-storage1.pb.local
@@ -0,0 +1,9 @@
+-----BEGIN PUBLIC KEY-----
+MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAu/EcaUU6w5Y+6N3I/ALL
+fu1I/E39rkdW8u2T79ZfTNA+/FNs8fCRpeauZI/RAn4hYOBDfhwRNtNqwuvkRfQr
+xNopv/yFyAsWy/XoS9zIzYpM25TSgHQWyYt2rnneJ8BGHxUcaHU6lbeVhsNFqvJ8
+Itq8zVok3NDtqrAV8+Clb0KfLkdcYeydp1OgWrvGKYagHZ2FZj44F+7oqyxRESJE
+Vww3z8hlwyG+KqYTzDOUExkZ3uVO0SCpnMPeNKR4SEFJ/Rpttxmdnac2kFpD9b2n
+QcUqrbzCB7kaAFMjBKWeXTCb5DbqzB20mo0lYtG26mBlNymmcVUMMv3A+vp66YMf
+swIDAQAB
+-----END PUBLIC KEY-----
\ No newline at end of file

diff --git a/salt/pki/master/minions/ztest-storage2.pb.local b/salt/pki/master/minions/ztest-storage2.pb.local
new file mode 100644 (file)
index 0000000..d436720
--- /dev/null
+++ b/salt/pki/master/minions/ztest-storage2.pb.local
@@ -0,0 +1,9 @@
+-----BEGIN PUBLIC KEY-----
+MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAofVFi4YKpbvAeq3Jq1Du
+LwUixwuh82qBJlDx3SvtSXiFwbjYIoLczI38uWkC5mARaHdpEwZo0w11xFsepP4e
+RXPMyOFMyyXkAKX9LqUTO35MX2Flhxbg/HTyyK/7A4Dz/2o/+4jnlN45uyHNujE0
+HVoY7TBeyqUMOUNP2DG2vt6kSUFl2UswiHt7vThQDclxKuYNRh/OiC1+S/zlIqT5
+9zpbQijVvBWRFCOe1Vd0qtVQzVUjVEOUZxbObBueiLXEbwXWTFsSxMDhkw5ziC6C
+5bgydoIu+q9ZXH7UeX4JWcgJKwaqhlLiF6Rxh9eo992Mc7GfvWR9HF4YuLUgjsRr
+cwIDAQAB
+-----END PUBLIC KEY-----
\ No newline at end of file

diff --git a/salt/pki/master/minions/ztest-storage3.pb.local b/salt/pki/master/minions/ztest-storage3.pb.local
new file mode 100644 (file)
index 0000000..3152633
--- /dev/null
+++ b/salt/pki/master/minions/ztest-storage3.pb.local
@@ -0,0 +1,9 @@
+-----BEGIN PUBLIC KEY-----
+MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAzKcMfUjurUVjMre8u1Nb
+5F2nYgI9cTJ/lJ/fIGUiS2+XJUguJ1Gr12r2hjRr9Yyn6D0+sZhvgAm9mTDgkvfl
+RgV9uUTN2+Mndr3FbGikthzR9SmOT72LuUX2txDRlNK0J1pqZndvmEvp4FrvZjCN
+FUzyT+nABGU3bOi8IzjOwKuZG1M+JDUJNZQwk5wLXFRh/xqfa/i1nXiteill9ZrD
+8gmfIUa/XDkhGUh6dbEkRTnmDW6ShDaCqphMnkLtOEv5l0TeZ9lxEyE1ibJWg9bY
+SRWvzYsz44dky8jgy8H39sm6SbS4quk408iMzNQ4crdIylXIVRKtNMdv/02z0q/H
+GQIDAQAB
+-----END PUBLIC KEY-----
\ No newline at end of file

diff --git a/salt/pki/master/minions/ztest-storage4.pb.local b/salt/pki/master/minions/ztest-storage4.pb.local
new file mode 100644 (file)
index 0000000..d2edbea
--- /dev/null
+++ b/salt/pki/master/minions/ztest-storage4.pb.local
@@ -0,0 +1,9 @@
+-----BEGIN PUBLIC KEY-----
+MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAoPaEfQOl8hbA20sfVo4x
+7vRH9JI0E7xUTWnorA5nBVdtlq+7l/s/4ufALLBtigfdIHlRCqkBzFOwlD3WuOH3
+mxA3yBAcZS2iKlIIDsQQMLYDbeKSWAlwT6zNS5omNHqzZH/0rMrthbs5KY7IXPXp
+8pJvtKVYgeGE33H9sfDv8O/iUX4HB/jy6N3tFBx/M99qVoFLBenI83D8u8SG0dPr
+dxiYyonl0SKprgHJX22rcXfzMfBGfmc6BsSfN9I9ql3UyMAE2DCgLCX1q1VIQtf1
+bUoSJ/i4fHLmLLvULWubDSowghqBniQrAToHCP5NZNzzIUiQcqVuWnKTNYgftGDI
+zQIDAQAB
+-----END PUBLIC KEY-----
\ No newline at end of file

diff --git a/salt/pki/master/minions/ztest-storage5.stage.pb.local b/salt/pki/master/minions/ztest-storage5.stage.pb.local
new file mode 100644 (file)
index 0000000..dfd2b82
--- /dev/null
+++ b/salt/pki/master/minions/ztest-storage5.stage.pb.local
@@ -0,0 +1,9 @@
+-----BEGIN PUBLIC KEY-----
+MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAkuXzQRESwCKzS4Djo2+K
+CtWz+OYHlbaYpiv5qAwdudmQuoGhI1cCoIG7m8Lh1tGNueDxXKCGgRA0a0afVIat
+LFzGSxW4aHeNkPlQYOxFr4aVzhyV0N9K49lJa+uYaQhxbQaANuyKcR3Y5K3WBuI7
+dQVlgA2IqAZa0pQAfzS603X4vD9xPYneHGgcV9OEqouVu2X6ulK/WR0JiYGK1tVX
+aBHsou1pEeZh1wKjk/feHiOj9GhqD0vZfLIn1oLeqvQJ8b0wqtqKGVuoA8kbN8dQ
+Q9Qgohj6nBxZfBRgkb35eOUyTh06IFxyMhWnIQW9Bw9AOYrf+MvaTcZJr7VmAusl
+PwIDAQAB
+-----END PUBLIC KEY-----
\ No newline at end of file

diff --git a/salt/pki/master/minions/ztest-storage6.stage.pb.local b/salt/pki/master/minions/ztest-storage6.stage.pb.local
new file mode 100644 (file)
index 0000000..61a40d5
--- /dev/null
+++ b/salt/pki/master/minions/ztest-storage6.stage.pb.local
@@ -0,0 +1,9 @@
+-----BEGIN PUBLIC KEY-----
+MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAvVi1YxORRFZ4lDy33rFg
+CKMd6Zl9/BKPU1/8csY/iurTQDbvbrg/B8Ft4TDncX1Ki2GrFWg8aU5Rj4Taiokd
+KYL7spZXZO/gMrjuuD0LxUlPYTsq8aJfKQCuvLa7+LJoRyHWsVaKy4EDE1GU7V7U
+CTpkwnOMqG6ERmelmguwKiMa5qlCt3cjUM/lAnFr5YS9fZMFpWnLgFne7gAu0IzO
+wK/1Ym86ge4UemGodZxeBaVn95AkZMnjUqVYYwFefBqGKiyhpgCz7yW6pGmq+tuL
+VAXqemzMcIcaceM/BYqMAUFSUwYX94mjuXJa0+G3x9uqY5OobAXHDEGTzTCWKIHP
+ewIDAQAB
+-----END PUBLIC KEY-----
\ No newline at end of file