From 87fcacae041dba53d337fcc11f8d0c22e2bf0ee8 Mon Sep 17 00:00:00 2001 From: EKbfh Date: Wed, 18 Nov 2020 16:26:44 +0300 Subject: [PATCH 1/2] Fix migration for all logins --- .bumpversion.cfg | 2 +- CHANGELOG.md | 19 +++++++++++++++++++ VERSION | 2 +- contrib/k8s/noc-tower/Chart.yaml | 2 +- tower/models/environment.py | 2 +- tower/ui/desktop_ui.js | 2 +- 6 files changed, 24 insertions(+), 5 deletions(-) diff --git a/.bumpversion.cfg b/.bumpversion.cfg index e1f45e83..990549d6 100644 --- a/.bumpversion.cfg +++ b/.bumpversion.cfg @@ -1,5 +1,5 @@ [bumpversion] -current_version = 0.4.8 +current_version = 1.0.3 commit = False tag = False serialize = {major}.{minor}.{patch} diff --git a/CHANGELOG.md b/CHANGELOG.md index 841f3a23..948ad481 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,22 @@ +## 1.0.3 (2020-11-18) +### Release Notes +* Fix tower default playbook repository url. + +## 1.0.2 (2020-11-14) +### Release Notes +* Fix tower version and tag. + +## 1.0.1 (2020-11-13) +### Release Notes +* Fix ansible version to 2.9.14 + +## 1.0.0 (2020-11-13) +### Release Notes +* Python3 full support +* Login default session_ttl migration +* Ansible repository default migration +* Clean old joblogs, ./bin/tower-joblog clean command + ## 0.4.8 (2020-03-XX) ### Release Notes * Fix pool edit diff --git a/VERSION b/VERSION index 3eefcb9d..ee90284c 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -1.0.0 +1.0.4 diff --git a/contrib/k8s/noc-tower/Chart.yaml b/contrib/k8s/noc-tower/Chart.yaml index 42ccd48b..91a7811a 100644 --- a/contrib/k8s/noc-tower/Chart.yaml +++ b/contrib/k8s/noc-tower/Chart.yaml @@ -1,7 +1,7 @@ name: noc-tower description: NocTower version: 0.0.1 -appVersion: 1.0.0 +appVersion: 1.0.3 keywords: - NocProject sources: diff --git a/tower/models/environment.py b/tower/models/environment.py index 85b2ebf9..424aa373 100644 --- a/tower/models/environment.py +++ b/tower/models/environment.py @@ -50,7 +50,7 @@ class Environment(Model): ) # Installation name as shown in interface header installation_name = CharField(default="Unconfigured installation") - playbook_link = CharField(default="git+https://github.com/nocproject/ansible_deploy@microservices") + playbook_link = CharField(default="git+https://github.com/nocproject/noc@stable") # Web settings web_host = CharField(default="127.0.0.1:8000") # json-serialized service configuration diff --git a/tower/ui/desktop_ui.js b/tower/ui/desktop_ui.js index d399d069..d8e8cd1a 100644 --- a/tower/ui/desktop_ui.js +++ b/tower/ui/desktop_ui.js @@ -55,7 +55,7 @@ var desktop = { { id: "version", icon: "info", - value: "Version: 1.0.0" + value: "Version: 1.0.3" } ] } -- GitLab From a65f1b497d412d422f4633a89cdb61a00da71d53 Mon Sep 17 00:00:00 2001 From: EKbfh Date: Wed, 18 Nov 2020 13:28:41 +0000 Subject: [PATCH 2/2] Update VERSION --- VERSION | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/VERSION b/VERSION index ee90284c..21e8796a 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -1.0.4 +1.0.3 -- GitLab