From 5635dd9e1b7b4e1a71742561585018a7d89d0f21 Mon Sep 17 00:00:00 2001 From: Phil Sphicas Date: Tue, 17 Dec 2019 18:22:13 -0800 Subject: [PATCH] Uplift Promenade Changes to Promenade since last uplift: 1a1c69c Fix: genesis.sh and join.sh rendering fix 04ddbcd promenade/HostSystem/v1 schema cleanup 3674a86 Merge "Ubuntu 18.04, configure chrony" f5ad002 Ubuntu 18.04, configure chrony 6480741 Probes: Ensure newline between key and cert in probe concat Change-Id: Ic0b4413e57813a499536a7c97cbf3eb40be27b5a --- Pipfile | 2 +- Pipfile.lock | 2 +- requirements.txt | 2 +- vcs-requirements.env | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/Pipfile b/Pipfile index c126955c..8d5bf88c 100644 --- a/Pipfile +++ b/Pipfile @@ -27,7 +27,7 @@ docker = ">=3.7.2" PyYAML = "~=5.1" deckhand = {git = "https://opendev.org/airship/deckhand.git",ref = "51dcea4fa12b0bcce65c381c286e61378a0826e2"} shipyard-client = {git = "https://opendev.org/airship/shipyard.git",ref = "72ca47e5c9ae8b7b1dcccd7742be6499f0411650",subdirectory = "src/bin/shipyard_client"} -promenade = {git = "https://opendev.org/airship/promenade.git",ref = "d476b8a3b5a4977ac9f0e5f89e5e24cae9953216"} +promenade = {git = "https://opendev.org/airship/promenade.git",ref = "1a1c69c064a96b3bf0ecdea073abe7ad14bdb06c"} oslo-utils = "~=3.41.0" six = "<=1.12.0" diff --git a/Pipfile.lock b/Pipfile.lock index a0ea5764..274c2b0a 100644 --- a/Pipfile.lock +++ b/Pipfile.lock @@ -229,7 +229,7 @@ }, "promenade": { "git": "https://opendev.org/airship/promenade.git", - "ref": "d476b8a3b5a4977ac9f0e5f89e5e24cae9953216" + "ref": "1a1c69c064a96b3bf0ecdea073abe7ad14bdb06c" }, "pycparser": { "hashes": [ diff --git a/requirements.txt b/requirements.txt index b3798583..4f100f83 100644 --- a/requirements.txt +++ b/requirements.txt @@ -9,7 +9,7 @@ cryptography==2.3.1 debtcollector==1.22.0 docker==4.1.0 git+https://opendev.org/airship/deckhand.git@51dcea4fa12b0bcce65c381c286e61378a0826e2#egg=deckhand -git+https://opendev.org/airship/promenade.git@d476b8a3b5a4977ac9f0e5f89e5e24cae9953216#egg=promenade +git+https://opendev.org/airship/promenade.git@1a1c69c064a96b3bf0ecdea073abe7ad14bdb06c#egg=promenade git+https://opendev.org/airship/shipyard.git@72ca47e5c9ae8b7b1dcccd7742be6499f0411650#egg=shipyard-client&subdirectory=src/bin/shipyard_client gitdb2==2.0.6 gitpython==2.1.14 diff --git a/vcs-requirements.env b/vcs-requirements.env index ff9a91f0..646a3cc2 100644 --- a/vcs-requirements.env +++ b/vcs-requirements.env @@ -1,3 +1,3 @@ DECKHAND_VERSION=commit/51dcea4fa12b0bcce65c381c286e61378a0826e2 SHIPYARD_VERSION=commit/72ca47e5c9ae8b7b1dcccd7742be6499f0411650 -PROMENADE_VERSION=commit/d476b8a3b5a4977ac9f0e5f89e5e24cae9953216 +PROMENADE_VERSION=commit/1a1c69c064a96b3bf0ecdea073abe7ad14bdb06c