Skip to content
Permalink
Browse files

QUADS 1.1.2 release, add support for r640 Dell.

* Bump version, rufus mailman, RPM minor version to 1.1.2
* Add support for Dell r640 servers
* Cron entry example added for foreman_heal.py
* Set foreman_heal.py cron for every 3 hours
* Happy New Year!

Change-Id: If2c3bf8e85ad7da62540c34a56bbc3ab9ec1c019
  • Loading branch information
sadsfae committed Dec 17, 2019
1 parent 4e74e68 commit ad73a38381e0aa466587bc2039c15565830dd5ea
Showing with 19 additions and 9 deletions.
  1. +5 −4 bin/quads-cli
  2. +3 −0 conf/idrac_interfaces.yml
  3. +2 −1 conf/quads.yml
  4. +2 −0 cron/quads
  5. +2 −2 quads/config.py
  6. +1 −1 quads/tools/reports.py
  7. +4 −1 rpm/quads.spec
@@ -663,11 +663,11 @@ if __name__ == '__main__':
group.add_argument('--find-free-cloud', dest='action', action='store_const', const='free_cloud',
help='List available hosts on a specific time frame')
group.add_argument('--report-available', dest='action', action='store_const', const='report_available',
help='Quads reporting server availability')
help='QUADS reporting server availability')
group.add_argument('--report-scheduled', dest='action', action='store_const', const='report_scheduled',
help='Quads reporting detailed scheduled assignments')
help='QUADS reporting detailed scheduled assignments')
group.add_argument('--report-detailed', dest='action', action='store_const', const='report_detailed',
help='Quads reporting scheduled assignments')
help='QUADS reporting scheduled assignments')
parser.add_argument('--host', dest='host', type=str, default=None, help='Specify the host to query')
parser.add_argument('--cloud-only', dest='cloudonly', type=str, default=None,
help='Limit full report to hosts only in this cloud')
@@ -703,7 +703,8 @@ if __name__ == '__main__':
help='External command to move a host')
parser.add_argument('--dry-run', dest='dryrun', action='store_true', default=None,
help="Don't update state when used with --move-hosts")
parser.add_argument('--log-path', dest='logpath', type=str, default=None, help='Path to quads log file')
parser.add_argument('--log-path', dest='logpath', type=str, default=None,
help='Path to QUADS log file')
parser.add_argument('--host-type', dest='hosttype', type=str, default=None,
help='Open-ended identifier for host: util, baremetal, aws, openstack, libvirt, etc.')
parser.add_argument('--vlan', dest='vlan', type=int, default=None,
@@ -3,15 +3,18 @@
# We will store store Dell racadm interface description
# to server type mappings here
#
# Also see /opt/quads/quads/config.py SUPPORTED list if adding system types.
#
director_r620_interfaces: NIC.Slot.2-4,HardDisk.List.1-1,NIC.Slot.2-1,NIC.Slot.2-2,NIC.Slot.2-3,NIC.Integrated.1-3-1
director_r630_interfaces: NIC.Integrated.1-2-1,HardDisk.List.1-1,NIC.Slot.2-1-1
director_r640_interfaces: NIC.Slot.3-1,HardDisk.List.1-1,NIC.Slot.3-2,NIC.Integrated.1-1-1
director_r720xd_interfaces: NIC.Slot.4-2-1,HardDisk.List.1-1,NIC.Integrated.1-3-1
director_r730xd_interfaces: NIC.Integrated.1-2-1,HardDisk.List.1-1,NIC.Integrated.1-3-1
director_r740xd_interfaces: NIC.Integrated.1-1-1,HardDisk.List.1-1,NIC.Integrated.1-3-1
director_r930_interfaces: NIC.Integrated.1-2-1,HardDisk.List.1-1,NIC.Integrated.1-3-1
foreman_r620_interfaces: NIC.Integrated.1-3-1,HardDisk.List.1-1,NIC.Slot.2-4,NIC.Slot.2-1,NIC.Slot.2-2,NIC.Slot.2-3
foreman_r630_interfaces: NIC.Slot.2-1-1,HardDisk.List.1-1,NIC.Integrated.1-2-1
foreman_r640_interfaces: NIC.Integrated.1-1-1,HardDisk.List.1-1,NIC.Slot.3-1,NIC.Slot.3-2
foreman_r720xd_interfaces: NIC.Integrated.1-3-1,HardDisk.List.1-1,NIC.Slot.4-2-1
foreman_r730xd_interfaces: NIC.Integrated.1-3-1,HardDisk.List.1-1,NIC.Integrated.1-2-1
foreman_r740xd_interfaces: NIC.Integrated.1-3-1,HardDisk.List.1-1,NIC.Integrated.1-1-1
@@ -11,7 +11,7 @@ data_dir: .
# display name for QUADS email notifications
mail_display_name: "QUADS Scheduler"
# set header for User-Agent:
mail_user_agent: "Rufus Postman 1.1.1"
mail_user_agent: "Rufus Postman 1.1.2"
domain: example.com
log: /opt/quads/log/quads.log
quads_base_url: http://127.0.0.1:8080/
@@ -201,4 +201,5 @@ validation_grace_period: 120

# switch specific config
# sw_vlan_first - The first VLAN ID used for the first interface of cloud01
# this defaults to 1100 unless set otherwise.
sw_vlan_first: 1100
@@ -31,6 +31,7 @@ PYTHONPATH=/opt/quads
# 0 0 * * * flock -n /tmp/notify.lock -c "docker exec quads quads/tools/notify.py" 1>/dev/null 2>&1
# 0 0 * * * flock -n /tmp/simpletableweb.lock -c "docker exec quads quads/tools/simple_table_web.py" 1>/dev/null 2>&1
# * * * * * flock -n /tmp/makeinstackenv.lock -c "docker exec quads quads/tools/make_instackenv_json.py" 1>/dev/null 2>&1
# 0 */3 * * 1-6 python /opt/quads/quads/tools/foreman_heal.py 1>/dev/null 2>&1
#########################################
##### NON-CONTAINER QUADS SERVER ENTRIES
##### ONLY USE WITH RPM OR SOURCE INSTALL
@@ -41,4 +42,5 @@ PYTHONPATH=/opt/quads
# 0 0 * * * flock -n /tmp/notify.lock -c "/opt/quads/quads/tools/notify.py" 1>/dev/null 2>&1
# 0 0 * * * flock -n /tmp/simpletableweb.lock -c "/opt/quads/quads/tools/simple_table_web.py" 1>/dev/null 2>&1
# * * * * * flock -n /tmp/makeinstackenv.lock -c "/opt/quads/quads/tools/make_instackenv_json.py" 1>/dev/null 2>&1
# 0 */3 * * 1-6 python /opt/quads/quads/tools/foreman_heal.py 1>/dev/null 2>&1
########################################
@@ -24,9 +24,9 @@ def quads_load_config(quads_config):
quads_config_file = os.path.join(os.path.dirname(__file__), "../conf/quads.yml")
conf = quads_load_config(quads_config_file)

QUADSVERSION = "1.1.1"
QUADSVERSION = "1.1.2"
QUADSCODENAME = "gaúcho"
SUPPORTED = ["r620", "r630", "r720", "r730xd", "r930", "r730", "r740xd", "r720xd"]
SUPPORTED = ["r620", "r630", "r640", "r720", "r730xd", "r930", "r730", "r740xd", "r720xd"]
SUPERMICRO = ["1029p", "1029u", "1028r", "6029p", "6018r", "6048r", "5039ms", "6049p"]
OFFSETS = {"em1": 0, "em2": 1, "em3": 2, "em4": 3}
TEMPLATES_PATH = os.path.join(os.path.dirname(__file__), "templates")
@@ -19,7 +19,7 @@ def report_available(_logger, _start, _end):

hosts = Host.objects()

_logger.info(f"Quads report for {start.date()} to {end.date()}:")
_logger.info(f"QUADS report for {start.date()} to {end.date()}:")

days = 0
total_allocated_month = 0
@@ -14,7 +14,7 @@

%define name quads-dev
%define reponame quads
%define version 1.1.1
%define version 1.1.2
%define build_timestamp %{lua: print(os.date("%Y%m%d"))}

Summary: Automated future scheduling, documentation, end-to-end provisioning and assignment of servers and networks.
@@ -115,6 +115,9 @@ fi;

%changelog

* Wed Jan 08 2020 Will Foster <wfoster@redhat.com>
- 1.1.2 release

* Thu Oct 31 2019 Will Foster <wfoster@redhat.com>
- 1.1.1 release

0 comments on commit ad73a38

Please sign in to comment.
You can’t perform that action at this time.