From 0461d795177fd916e2c1cda5fbcde90a0bdf6bdd Mon Sep 17 00:00:00 2001 From: Donovan Francesco Date: Thu, 4 Aug 2016 11:44:59 +0200 Subject: [PATCH] Adding Magnum-UI Horizon support This patch adds the git source for the Magnum dashboard for Horizon to ensure that the python package is built and installable. Some minor changes are also made to the other dashboard plugins to ensure that they are built based on the correct host group memberships. Change-Id: Ie57fd875f17534215a21fc0ad2e2071b352b366d Implements: blueprint role-magnum --- .../defaults/repo_packages/openstack_services.yml | 10 +++++++--- playbooks/inventory/group_vars/horizon_all.yml | 1 + ...izon-magnum-dashboard-support-e41ac6fb6bc14946.yaml | 5 +++++ 3 files changed, 13 insertions(+), 3 deletions(-) create mode 100644 releasenotes/notes/add-horizon-magnum-dashboard-support-e41ac6fb6bc14946.yaml diff --git a/playbooks/defaults/repo_packages/openstack_services.yml b/playbooks/defaults/repo_packages/openstack_services.yml index cbd51adaf8..6b75afd0ae 100644 --- a/playbooks/defaults/repo_packages/openstack_services.yml +++ b/playbooks/defaults/repo_packages/openstack_services.yml @@ -83,19 +83,23 @@ horizon_git_install_branch: f9ba1ecc2f47a2b3fd2816dfba62f8ab9eaf343f # HEAD of " horizon_git_dest: "/opt/horizon_{{ horizon_git_install_branch | replace('/', '_') }}" horizon_git_project_group: horizon_all - - ## Horizon Ironic dashboard plugin ironic_dashboard_git_repo: https://git.openstack.org/openstack/ironic-ui ironic_dashboard_git_install_branch: 8f554eb3a9dc6eacbfc86b4a58250d17dbb41e43 # HEAD of "master" as of 01.08.2016 ironic_dashboard_git_dest: "/opt/ironic_dashboard_{{ ironic_dashboard_git_install_branch | replace('/', '_') }}" +ironic_dashboard_git_project_group: horizon_all +## Horizon Magnum dashboard plugin +magnum_dashboard_git_repo: https://git.openstack.org/openstack/magnum-ui +magnum_dashboard_git_install_branch: bbdd887f9172b520ff26c4df97e6ad6fbedc8864 # HEAD of "master" as of 4.08.2016 +magnum_dashboard_git_dest: "/opt/magnum_dashboard_{{ magnum_dashboard_git_install_branch | replace('/', '_') }}" +magnum_dashboard_git_project_group: horizon_all ## Horizon LBaaS dashboard plugin neutron_lbaas_dashboard_git_repo: https://git.openstack.org/openstack/neutron-lbaas-dashboard neutron_lbaas_dashboard_git_install_branch: 0d25bbd63b2392f07e1f37e3d94119883858d3dd # HEAD of "master" as of 01.08.2016 neutron_lbaas_dashboard_git_dest: "/opt/neutron_lbaas_dashboard_{{ neutron_lbaas_dashboard_git_install_branch | replace('/', '_') }}" -neutron_lbaas_dashboard_git_project_group: neutron_agent +neutron_lbaas_dashboard_git_project_group: horizon_all ## Keystone service diff --git a/playbooks/inventory/group_vars/horizon_all.yml b/playbooks/inventory/group_vars/horizon_all.yml index 23eeba3890..1e8dd36f47 100644 --- a/playbooks/inventory/group_vars/horizon_all.yml +++ b/playbooks/inventory/group_vars/horizon_all.yml @@ -17,6 +17,7 @@ horizon_external_ssl: "{{ openstack_external_ssl }}" horizon_service_region: "{{ service_region }}" horizon_enable_cinder_backup: "{{ cinder_service_backup_program_enabled is defined and cinder_service_backup_program_enabled | bool }}" horizon_enable_ironic_ui: "{{ (groups['ironic_all'] is defined) and (groups['ironic_all'] | length > 0) }}" +horizon_enable_magnum_ui: "{{ (groups['magnum_all'] is defined) and (groups['magnum_all'] | length > 0) }}" # NOTE(mhayden): neutron-lbaas is a separate plugin and requires the full # namespace to be specified. Also, LBaaS v1 was removed in Newton. horizon_enable_neutron_lbaas: "{{ neutron_plugin_base is defined and 'neutron_lbaas.services.loadbalancer.plugin.LoadBalancerPluginv2' in neutron_plugin_base }}" diff --git a/releasenotes/notes/add-horizon-magnum-dashboard-support-e41ac6fb6bc14946.yaml b/releasenotes/notes/add-horizon-magnum-dashboard-support-e41ac6fb6bc14946.yaml new file mode 100644 index 0000000000..2a1e94bdf4 --- /dev/null +++ b/releasenotes/notes/add-horizon-magnum-dashboard-support-e41ac6fb6bc14946.yaml @@ -0,0 +1,5 @@ +--- +features: + - Adds support for the horizon magnum-ui dashboard. The + dashboard will be automatically enabled if any magnum + hosts are defined.