update configurations for phosphor-led-manager
phosphor-led-manager no longer assumes any default led priority.
The behavior was changed in
https://github.com/openbmc/phosphor-led-manager/commit/5a9f651949c133ed0868d72734c4ac82c75a7656
and
https://github.com/openbmc/phosphor-led-manager/commit/55badf7979f57d5f9ed2db726eebf35e84d0dac5
The led priority needs to be configured, so updating all configurations
here.
Before, led-manager assumed a default led priority of 'Blink'.
So this patch is just making that explicit in the existing
configurations. There should be no behavior change from this patch.
Change-Id: I74aabb567ccf6682d56877f8bb42e636fc1746f6
Signed-off-by: Alexander Hansen <alexander.hansen@9elements.com>
diff --git a/meta-facebook/meta-bletchley/recipes-phosphor/leds/bletchley-led-manager-config/led.yaml b/meta-facebook/meta-bletchley/recipes-phosphor/leds/bletchley-led-manager-config/led.yaml
index 4dc9058..f08d8b4 100644
--- a/meta-facebook/meta-bletchley/recipes-phosphor/leds/bletchley-led-manager-config/led.yaml
+++ b/meta-facebook/meta-bletchley/recipes-phosphor/leds/bletchley-led-manager-config/led.yaml
@@ -4,24 +4,28 @@
bmc_booted:
sys_log_id:
Action: 'On'
+ Priority: 'Blink'
enclosure_fault:
sys_log_id:
Action: 'Blink'
DutyOn: 50
Period: 1000
+ Priority: 'Blink'
enclosure_identify:
sys_log_id:
Action: 'Blink'
DutyOn: 50
Period: 400
+ Priority: 'Blink'
enclosure_identify_blink:
sys_log_id:
Action: 'Blink'
DutyOn: 50
Period: 400
+ Priority: 'Blink'
#====================
# Fan 0
@@ -29,14 +33,18 @@
fan0_fault:
fan0_amber:
Action: 'On'
+ Priority: 'Blink'
fan0_blue:
Action: 'Off'
+ Priority: 'Blink'
fan0_good:
fan0_amber:
Action: 'Off'
+ Priority: 'Blink'
fan0_blue:
Action: 'On'
+ Priority: 'Blink'
#====================
# Fan 1
@@ -44,14 +52,18 @@
fan1_fault:
fan1_amber:
Action: 'On'
+ Priority: 'Blink'
fan1_blue:
Action: 'Off'
+ Priority: 'Blink'
fan1_good:
fan1_amber:
Action: 'Off'
+ Priority: 'Blink'
fan1_blue:
Action: 'On'
+ Priority: 'Blink'
#====================
# Fan 2
@@ -59,14 +71,18 @@
fan2_fault:
fan2_amber:
Action: 'On'
+ Priority: 'Blink'
fan2_blue:
Action: 'Off'
+ Priority: 'Blink'
fan2_good:
fan2_amber:
Action: 'Off'
+ Priority: 'Blink'
fan2_blue:
Action: 'On'
+ Priority: 'Blink'
#====================
# Fan 3
@@ -74,14 +90,18 @@
fan3_fault:
fan3_amber:
Action: 'On'
+ Priority: 'Blink'
fan3_blue:
Action: 'Off'
+ Priority: 'Blink'
fan3_good:
fan3_amber:
Action: 'Off'
+ Priority: 'Blink'
fan3_blue:
Action: 'On'
+ Priority: 'Blink'
#====================
# Sled 1
@@ -89,22 +109,26 @@
sled1_fault:
sled1_amber:
Action: 'On'
+ Priority: 'Blink'
sled1_good:
sled1_blue:
Action: 'On'
+ Priority: 'Blink'
sled1_identify:
sled1_amber:
Action: 'Blink'
DutyOn: 50
Period: 400
+ Priority: 'Blink'
sled1_identify_blink:
sled1_amber:
Action: 'Blink'
DutyOn: 50
Period: 400
+ Priority: 'Blink'
#====================
# Sled 2
@@ -112,22 +136,26 @@
sled2_fault:
sled2_amber:
Action: 'On'
+ Priority: 'Blink'
sled2_good:
sled2_blue:
Action: 'On'
+ Priority: 'Blink'
sled2_identify:
sled2_amber:
Action: 'Blink'
DutyOn: 50
Period: 400
+ Priority: 'Blink'
sled2_identify_blink:
sled2_amber:
Action: 'Blink'
DutyOn: 50
Period: 400
+ Priority: 'Blink'
#====================
# Sled 3
@@ -135,22 +163,26 @@
sled3_fault:
sled3_amber:
Action: 'On'
+ Priority: 'Blink'
sled3_good:
sled3_blue:
Action: 'On'
+ Priority: 'Blink'
sled3_identify:
sled3_amber:
Action: 'Blink'
DutyOn: 50
Period: 400
+ Priority: 'Blink'
sled3_identify_blink:
sled3_amber:
Action: 'Blink'
DutyOn: 50
Period: 400
+ Priority: 'Blink'
#====================
# Sled 4
@@ -158,22 +190,26 @@
sled4_fault:
sled4_amber:
Action: 'On'
+ Priority: 'Blink'
sled4_good:
sled4_blue:
Action: 'On'
+ Priority: 'Blink'
sled4_identify:
sled4_amber:
Action: 'Blink'
DutyOn: 50
Period: 400
+ Priority: 'Blink'
sled4_identify_blink:
sled4_amber:
Action: 'Blink'
DutyOn: 50
Period: 400
+ Priority: 'Blink'
#====================
# Sled 5
@@ -181,22 +217,26 @@
sled5_fault:
sled5_amber:
Action: 'On'
+ Priority: 'Blink'
sled5_good:
sled5_blue:
Action: 'On'
+ Priority: 'Blink'
sled5_identify:
sled5_amber:
Action: 'Blink'
DutyOn: 50
Period: 400
+ Priority: 'Blink'
sled5_identify_blink:
sled5_amber:
Action: 'Blink'
DutyOn: 50
Period: 400
+ Priority: 'Blink'
#====================
# Sled 6
@@ -204,19 +244,23 @@
sled6_fault:
sled6_amber:
Action: 'On'
+ Priority: 'Blink'
sled6_good:
sled6_blue:
Action: 'On'
+ Priority: 'Blink'
sled6_identify:
sled6_amber:
Action: 'Blink'
DutyOn: 50
Period: 400
+ Priority: 'Blink'
sled6_identify_blink:
sled6_amber:
Action: 'Blink'
DutyOn: 50
Period: 400
+ Priority: 'Blink'
diff --git a/meta-facebook/meta-catalina/recipes-phosphor/leds/phosphor-led-manager/led-group-config.json b/meta-facebook/meta-catalina/recipes-phosphor/leds/phosphor-led-manager/led-group-config.json
index d6e817d..7247bb7 100644
--- a/meta-facebook/meta-catalina/recipes-phosphor/leds/phosphor-led-manager/led-group-config.json
+++ b/meta-facebook/meta-catalina/recipes-phosphor/leds/phosphor-led-manager/led-group-config.json
@@ -6,6 +6,7 @@
{
"Name" : "bmc_heartbeat_amber",
"Action" : "Blink",
+ "Priority" : "Blink",
"DutyOn" : 50,
"Period" : 1000
}
@@ -17,6 +18,7 @@
{
"Name": "fp_id_amber",
"Action": "Blink",
+ "Priority" : "Blink",
"DutyOn": 50,
"Period": 1000
}
diff --git a/meta-facebook/meta-harma/recipes-phosphor/leds/phosphor-led-manager/led-group-config.json b/meta-facebook/meta-harma/recipes-phosphor/leds/phosphor-led-manager/led-group-config.json
index f4aa51e..23e7f8b 100644
--- a/meta-facebook/meta-harma/recipes-phosphor/leds/phosphor-led-manager/led-group-config.json
+++ b/meta-facebook/meta-harma/recipes-phosphor/leds/phosphor-led-manager/led-group-config.json
@@ -6,6 +6,7 @@
{
"Name" : "bmc_heartbeat_amber",
"Action" : "Blink",
+ "Priority" : "Blink",
"DutyOn" : 50,
"Period" : 1000
}
@@ -27,6 +28,7 @@
{
"Name": "fp_id_amber",
"Action": "Blink",
+ "Priority" : "Blink",
"DutyOn": 50,
"Period": 1000
}
diff --git a/meta-facebook/meta-minerva/recipes-phosphor/leds/phosphor-led-manager/led-group-config.json b/meta-facebook/meta-minerva/recipes-phosphor/leds/phosphor-led-manager/led-group-config.json
index 53f6cba..d6e385f 100644
--- a/meta-facebook/meta-minerva/recipes-phosphor/leds/phosphor-led-manager/led-group-config.json
+++ b/meta-facebook/meta-minerva/recipes-phosphor/leds/phosphor-led-manager/led-group-config.json
@@ -6,6 +6,7 @@
{
"Name" : "bmc_heartbeat_amber",
"Action" : "Blink",
+ "Priority" : "Blink",
"DutyOn" : 50,
"Period" : 1000
}
@@ -27,6 +28,7 @@
{
"Name": "fp_id_amber",
"Action": "Blink",
+ "Priority" : "Blink",
"DutyOn": 50,
"Period": 250
}
@@ -37,11 +39,13 @@
"members": [
{
"Name": "fan_status_led",
- "Action": "On"
+ "Action": "On",
+ "Priority" : "Blink"
},
{
"Name": "fan_fault_led_n",
- "Action": "On"
+ "Action": "On",
+ "Priority" : "Blink"
}
]
}
diff --git a/meta-facebook/meta-yosemite4/recipes-phosphor/leds/yosemite4-led-manager-config/led.yaml b/meta-facebook/meta-yosemite4/recipes-phosphor/leds/yosemite4-led-manager-config/led.yaml
index 7f89492..523b996 100644
--- a/meta-facebook/meta-yosemite4/recipes-phosphor/leds/yosemite4-led-manager-config/led.yaml
+++ b/meta-facebook/meta-yosemite4/recipes-phosphor/leds/yosemite4-led-manager-config/led.yaml
@@ -1,143 +1,191 @@
fan0_ok:
fan0_blue:
Action: "On"
+ Priority: 'Blink'
fan0_amber:
Action: "Off"
+ Priority: 'Blink'
fan0_fail:
fan0_blue:
Action: "Off"
+ Priority: 'Blink'
fan0_amber:
Action: "On"
+ Priority: 'Blink'
fan1_ok:
fan1_blue:
Action: "On"
+ Priority: 'Blink'
fan1_amber:
Action: "Off"
+ Priority: 'Blink'
fan1_fail:
fan1_blue:
Action: "Off"
+ Priority: 'Blink'
fan1_amber:
Action: "On"
+ Priority: 'Blink'
fan2_ok:
fan2_blue:
Action: "On"
+ Priority: 'Blink'
fan2_amber:
Action: "Off"
+ Priority: 'Blink'
fan2_fail:
fan2_blue:
Action: "Off"
+ Priority: 'Blink'
fan2_amber:
Action: "On"
+ Priority: 'Blink'
fan3_ok:
fan3_blue:
Action: "On"
+ Priority: 'Blink'
fan3_amber:
Action: "Off"
+ Priority: 'Blink'
fan3_fail:
fan3_blue:
Action: "Off"
+ Priority: 'Blink'
fan3_amber:
Action: "On"
+ Priority: 'Blink'
fan4_ok:
fan4_blue:
Action: "On"
+ Priority: 'Blink'
fan4_amber:
Action: "Off"
+ Priority: 'Blink'
fan4_fail:
fan4_blue:
Action: "Off"
+ Priority: 'Blink'
fan4_amber:
Action: "On"
+ Priority: 'Blink'
fan5_ok:
fan5_blue:
Action: "On"
+ Priority: 'Blink'
fan5_amber:
Action: "Off"
+ Priority: 'Blink'
fan5_fail:
fan5_blue:
Action: "Off"
+ Priority: 'Blink'
fan5_amber:
Action: "On"
+ Priority: 'Blink'
fan6_ok:
fan6_blue:
Action: "On"
+ Priority: 'Blink'
fan6_amber:
Action: "Off"
+ Priority: 'Blink'
fan6_fail:
fan6_blue:
Action: "Off"
+ Priority: 'Blink'
fan6_amber:
Action: "On"
+ Priority: 'Blink'
fan7_ok:
fan7_blue:
Action: "On"
+ Priority: 'Blink'
fan7_amber:
Action: "Off"
+ Priority: 'Blink'
fan7_fail:
fan7_blue:
Action: "Off"
+ Priority: 'Blink'
fan7_amber:
Action: "On"
+ Priority: 'Blink'
fan8_ok:
fan8_blue:
Action: "On"
+ Priority: 'Blink'
fan8_amber:
Action: "Off"
+ Priority: 'Blink'
fan8_fail:
fan8_blue:
Action: "Off"
+ Priority: 'Blink'
fan8_amber:
Action: "On"
+ Priority: 'Blink'
fan9_ok:
fan9_blue:
Action: "On"
+ Priority: 'Blink'
fan9_amber:
Action: "Off"
+ Priority: 'Blink'
fan9_fail:
fan9_blue:
Action: "Off"
+ Priority: 'Blink'
fan9_amber:
Action: "On"
+ Priority: 'Blink'
fan10_ok:
fan10_blue:
Action: "On"
+ Priority: 'Blink'
fan10_amber:
Action: "Off"
+ Priority: 'Blink'
fan10_fail:
fan10_blue:
Action: "Off"
+ Priority: 'Blink'
fan10_amber:
Action: "On"
+ Priority: 'Blink'
fan11_ok:
fan11_blue:
Action: "On"
+ Priority: 'Blink'
fan11_amber:
Action: "Off"
+ Priority: 'Blink'
fan11_fail:
fan11_blue:
Action: "Off"
+ Priority: 'Blink'
fan11_amber:
Action: "On"
+ Priority: 'Blink'