From c40b50dfc4299ed901e0edba3f60a12274c01888 Mon Sep 17 00:00:00 2001 From: jacky06 Date: Mon, 17 Sep 2018 01:02:43 -0400 Subject: [PATCH] Add cloudkitty dashboard Change-Id: Ia9edd43aecce88291053357f7184607486318868 Closes-Bug: #1792858 --- defaults/main.yml | 10 ++++++++++ .../cloudkitty-horizon-panel-c3b616273b21d7aa.yaml | 9 +++++++++ tasks/horizon_install_source.yml | 1 + 3 files changed, 20 insertions(+) create mode 100644 releasenotes/notes/cloudkitty-horizon-panel-c3b616273b21d7aa.yaml diff --git a/defaults/main.yml b/defaults/main.yml index 1fe96adb..66fbf8d0 100644 --- a/defaults/main.yml +++ b/defaults/main.yml @@ -40,6 +40,10 @@ horizon_git_install_branch: master blazar_dashboard_git_repo: https://git.openstack.org/openstack/blazar-dashboard blazar_dashboard_git_install_branch: master +## The git source/branch for Cloudkitty UI plugin +cloudkitty_dashboard_git_repo: https://git.openstack.org/openstack/cloudkitty-dashboard +cloudkitty_dashboard_git_install_branch: master + ## The git source/branch for the Magnum UI plugin magnum_dashboard_git_repo: https://git.openstack.org/openstack/magnum-ui magnum_dashboard_git_install_branch: master @@ -68,6 +72,7 @@ heat_dashboard_git_install_branch: master horizon_developer_constraints: - "git+{{ horizon_git_repo }}@{{ horizon_git_install_branch }}#egg=horizon" - "git+{{ blazar_dashboard_git_repo }}@{{ blazar_dashboard_git_install_branch }}#egg=blazar-dashboard" + - "git+{{ cloudkitty_dashboard_git_repo }}@{{ cloudkitty_dashboard_git_install_branch }}#egg=cloudkitty_dashboard" - "git+{{ magnum_dashboard_git_repo }}@{{ magnum_dashboard_git_install_branch }}#egg=magnum-ui" - "git+{{ designate_dashboard_git_repo }}@{{ designate_dashboard_git_install_branch }}#egg=designate_dashboard" - "git+{{ tacker_dashboard_git_repo }}@{{ tacker_dashboard_git_install_branch }}#egg=tacker_horizon" @@ -240,6 +245,9 @@ horizon_launch_instance_defaults: ## Blazar UI Panel horizon_enable_blazar_ui: False +## Cloudkitty UI Panel +horizon_enable_cloudkitty_ui: False + ## Ironic UI Panel horizon_enable_ironic_ui: False @@ -349,6 +357,8 @@ horizon_pip_packages: # Simplify this when we are no longer using the py_pkgs plugin horizon_blazar_optional_pip_packages: - blazar_dashboard +horizon_cloudkitty_optional_pip_packages: + - cloudkitty_dashboard horizon_designate_optional_pip_packages: - designate_dashboard horizon_heat_optional_pip_packages: diff --git a/releasenotes/notes/cloudkitty-horizon-panel-c3b616273b21d7aa.yaml b/releasenotes/notes/cloudkitty-horizon-panel-c3b616273b21d7aa.yaml new file mode 100644 index 00000000..6d470e4c --- /dev/null +++ b/releasenotes/notes/cloudkitty-horizon-panel-c3b616273b21d7aa.yaml @@ -0,0 +1,9 @@ +--- +features: + - | + The cloudkitty dashboard is available in Horizon. Deployers can enable + the panel by setting the following Ansible variable: + + .. code-block:: yaml + + horizon_enable_cloudkitty_ui: True diff --git a/tasks/horizon_install_source.yml b/tasks/horizon_install_source.yml index 4872ff93..8423c9b8 100644 --- a/tasks/horizon_install_source.yml +++ b/tasks/horizon_install_source.yml @@ -70,6 +70,7 @@ venv_pip_packages: >- {{ horizon_pip_packages + horizon_optional_pip_packages + (horizon_enable_blazar_ui | bool) | ternary(horizon_blazar_optional_pip_packages, []) + + (horizon_enable_cloudkitty_ui | bool) | ternary(horizon_cloudkitty_optional_pip_packages, []) + (horizon_enable_designate_ui | bool) | ternary(horizon_designate_optional_pip_packages, []) + (horizon_enable_heat_ui | bool) | ternary(horizon_heat_optional_pip_packages, []) + (horizon_enable_ironic_ui | bool) | ternary(horizon_ironic_optional_pip_packages, []) +