Skip to content

Commit

Permalink
Update --wipe arparse docs, prep .spec for 1.1+
Browse files Browse the repository at this point in the history
This is a small commit that updates docs around using
the --wipe option and the switch host setup instructions.

We are also going to bump the RPM .spec version and prep
the file for upcoming 1.1+ changes that will involve the
addition/move of CherryPy and MongoDB / MongoEngine.

Change-Id: I8ccdf02d38ffbe50cecce43899855167a1547538
sadsfae committed Apr 20, 2018
1 parent bf4525c commit 62b1640
Showing 4 changed files with 17 additions and 4 deletions.
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
@@ -345,7 +345,7 @@ Creating a new schedule and assigning machines is currently done through the QUA
- *force* (needed for re-using an existing cloud)
- *cc-users* (Add additional people to the notifications)
- *cloud-ticket* (RT ticket used for the work, also appears in the assignments dynamic wiki)
- *nowipe* (do not reprovision machines going into this cloud, default is 0)
- *wipe* (whether to reprovision machines going into this cloud, default is 1 or wipe.

#### QUADS VLAN Options ####
- VLAN design (optional, will default to 0 below)
4 changes: 2 additions & 2 deletions docs/switch-host-setup.md
Original file line number Diff line number Diff line change
@@ -122,14 +122,14 @@ set interfaces xe-0/0/1:3 apply-groups QinQ_vl1140
```

## QUADS Host Network Setup
* For every bare-metal host you'll need an ```/etc/lab/ports/FQDN``` file that describes and maintains mappings
* For every bare-metal host you'll need an ```/opt/quads/data/ports/FQDN``` file that describes and maintains mappings
* Physical interface on each server and the corresponding mac address
* IP address of the switch the server is connected to
* switch-type label for vendor (currently unused, stub for supporting vendors outside Juniper)
* Physical switchport each host interface is connected to.
* You'll have a separate line per physical interface, connected to physical switchport per machine
```
cat /etc/lab/ports/c08-h13-r930.rdu.openstack.engineering.redhat.com
cat /opt/quads/data/ports/c08-h13-r930.engineering.example.com
```
```
em1,24:6e:96:0d:3d:90,10.12.67.247,switch-type,xe-0/0/3:0
13 changes: 12 additions & 1 deletion rpm/quads.spec
Original file line number Diff line number Diff line change
@@ -10,7 +10,7 @@
#### https://copr.fedorainfracloud.org/coprs/quadsdev/QUADS

%define name quads
%define version 0.99.2
%define version 1.0.0
%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.
@@ -24,12 +24,18 @@ Prefix: /opt/quads
BuildArch: noarch
Vendor: QUADS
Packager: QUADS
# required for quads-1.1+
#Requires: epel-release
Requires: PyYAML >= 3.10
Requires: ansible >= 2.3
Requires: expectk >= 5.0
Requires: python2-aexpect >= 1.4
Requires: python-requests >= 2.6
Requires: httpd >= 2.4
# required for quads-1.1+
#Requires: python-mongoengine >= 0.8
#Requires: mongodb >=2.6.12
#Requires: mongodb-server >=2.6.12
Url: http://github.com/redhat-performance/quads

%description
@@ -77,6 +83,8 @@ rm -rf %{buildroot}

%post
systemctl enable quads-daemon
# will be required for quads-1.1+
#systemctl enable mongod
[ ! -d /opt/quads/log ] && mkdir /opt/quads/log || true
[ ! -f /opt/quads/log/quads.log ] && touch /opt/quads/log/quads.log || true
[ ! -d /var/log/quads ] && mkdir /var/log/quads || true
@@ -91,6 +99,9 @@ fi;

%changelog

* Fri Apr 20 2018 - 1.0.0: Will Foster <wfoster@redhat.com>
- Bump version to match 1.0.0 tag

* Fri Oct 20 2017 - 0.99.2: Will Foster <wfoster@redhat.com>
- Add httpd dependency and visualization image files

2 changes: 2 additions & 0 deletions systemd/quads-daemon.service
Original file line number Diff line number Diff line change
@@ -6,6 +6,8 @@
[Unit]
Description = QUADS Daemon
Documentation = https://github.com/redhat-performance/quads
# will be required for quads-1.1+
#After=network.target mongod.service

[Service]
Type = simple

0 comments on commit 62b1640

Please sign in to comment.