From 1f40de78d19e97f2b52446becbddb59a77516d15 Mon Sep 17 00:00:00 2001 From: Monty Taylor Date: Thu, 23 Aug 2018 21:53:02 -0500 Subject: Import jim's changes to zuulv3 talk --- src/zuulv3/images/architecture.ans | 38 ++++++++++++++++---------------- src/zuulv3/images/orig/title.ans | 40 ++++++++++++++++------------------ src/zuulv3/images/title.ans | 44 ++++++++++++++++++++------------------ src/zuulv3/images/zuul.ans | 31 ++++++++++++--------------- 4 files changed, 75 insertions(+), 78 deletions(-) (limited to 'src/zuulv3/images') diff --git a/src/zuulv3/images/architecture.ans b/src/zuulv3/images/architecture.ans index 0698ccc..ad308eb 100644 --- a/src/zuulv3/images/architecture.ans +++ b/src/zuulv3/images/architecture.ans @@ -4,42 +4,42 @@   - ┌─────────────┐ + ┌─────────────┐  - ┌───────┤ Zuul Merger │ + ┌───────┤ Zuul Merger │     - │ └──────┬──────┘ + ┌────┴───┐ └──┬───┬──────┘  - │ │ + ┌──┤ Gerrit ├──┐ │ │  - │ │ + │ └────────┘ │ ┌─┘ │  -  ┌────┴───┐ ┌──┴───┐ ┌───────────────┐ +   │ ┌────────┐ │ │ ┌──┴───┐ ┌───────────────┐  - ┌───────┤ Gerrit ├───────┤ Zuul ├─────┤ Zuul Executor │ + ┌─────┼──┤  Web  ├──┼────┤ Zuul ├─────┤ Zuul Executor │   - ____ └────────┘ └──┬───┘ │ ┌───────┐ │ + ____ │ └────┬───┘ │ │ └──┬───┘ │ ┌───────┐ │  - |... | │ │  │Ansible│ │  + |... | │ ┌────┴───┐ │ │ │ │  │Ansible│ │  - |... | │ └───┴───┬───┴───┘ + |... | ├──┤ GitHub ├──┼─┘ │ └───┴───┬───┴───┘  -/______\ ┌────┴─────┐ │ +/______\ │ └────────┘ │ ┌────┴─────┐ │  - o │ Nodepool │ │ + o │ ┌────────┐ │ │ Nodepool │ │  - -|-   └────┬─────┘ │ + -|- └──┤ Finger ├──┘ └────┬─────┘ │  - / \ │ │ + / \ └────────┘ │ │  - Dev Cloud │  │ + Dev Cloud │  │  -  Node 1 ─────────────┤ +  Node 1 ─────────────┤  -  ...  │ +  ...  │  -  Node 2 ─────────────┘ +  Node 2 ─────────────┘  -(Not to scale)   +(Not to scale)     \ No newline at end of file diff --git a/src/zuulv3/images/orig/title.ans b/src/zuulv3/images/orig/title.ans index 82ef305..8442c58 100644 --- a/src/zuulv3/images/orig/title.ans +++ b/src/zuulv3/images/orig/title.ans @@ -1,42 +1,40 @@ - ______________ .. .. ______________ +͵  -( (  \ \_____)____(_____/ /  ) ) + Ĵ  - \ ) `'   `' ( / +   - )/   \( - - /'  REST APIs and the Return of the  `\  +  -O   ___ ___ _ _ ___ ___ _ ___   O +  -  / __/ _ \| \| / __|/ _ \| | | __|  +  - | (_| (_) | .` \__ \ (_) | |__| _|   +  _____ _  -  \___\___/|_|\_|___/\___/|____|___|  + |__ / _ _ _| |  -  + / / | | | | | | |  - Application  + / /| |_| | |_| | |  -  + /____\__,_|\__,_|_|  -O  James E. Blair   O +  - \. ./  +  - )\  ,____ ____,  /( +  - / ) / ____\ ____ /____ \ ( \ +  -( (_________/_/ ) ( \_\_________) ) +  - ~-'  `' `'  `-~  +   - + Ĵ  - +͵   diff --git a/src/zuulv3/images/title.ans b/src/zuulv3/images/title.ans index c784327..8857086 100644 --- a/src/zuulv3/images/title.ans +++ b/src/zuulv3/images/title.ans @@ -1,45 +1,47 @@ - ______________ .──. .──. ______________ +══════════════════════╡│││╞═════════════════════  -( (  \ \_____)____(_____/ /  ) ) + ────────────────────┤│├───────────────────  - \ ) `─────'   `─────' ( / + ──────────────────│─────────────────  - )/   \( - - /'  REST APIs and the Return of the  `\  +  -O   ___ ___ _ _ ___ ___ _ ___   O +  -│  / __/ _ \| \| / __|/ _ \| | | __| │ +  -│ | (_| (_) | .` \__ \ (_) | |__| _|  │ +  _____ _  -│  \___\___/|_|\_|___/\___/|____|___| │ + |__ / _ _ _| |  -│ │ + / / | | | | | | |  -│ Application │ + / /| |_| | |_| | |  -│ │ + /____\__,_|\__,_|_|  -O  James E. Blair   O +  - \. ./  +  - )\  ,____ ____,  /( + Monty Taylor  - / ) / ____\ ____ /____ \ ( \ + irc: mordred  -( (_________/_/ ) ( \_\_________) ) + twitter: @e_monty  - ~-'  `──' `──'  `-~  + Red Hat   - + ──────────────────│───────────────── + + ────────────────────┤│├─────────────────── + +══════════════════════╡│││╞═════════════════════    - \ No newline at end of file + diff --git a/src/zuulv3/images/zuul.ans b/src/zuulv3/images/zuul.ans index 6369083..44094b8 100644 --- a/src/zuulv3/images/zuul.ans +++ b/src/zuulv3/images/zuul.ans @@ -9,28 +9,25 @@  - -  _____ _ - - |__ / _ _ _| | - - / / | | | | | | | - - / /| |_| | |_| | | - - /____\__,_|\__,_|_| - - - - + + ╱╲ + ╱ ╲ + ──────────────── + ╲┌─┬────────┬─┐╱ + ├─┼────────┼─┤ + ╱│ │ ▏ │ │╲ + ╱ │ │ ▏ │ │ ╲ + ╱ │ │ ▏ │ │ ╲ + ╱ │ │ ▏ │ │ ╲ + ────┴─┴────────┴─┴──── + + Z U U L    - - - ──────────────────│───────────────── + ──────────────────│─────────────────  ────────────────────┤│├───────────────────  -- cgit v1.2.3