From fd56198717e48fbffdbd867a0aa7173f5d0ed314 Mon Sep 17 00:00:00 2001 From: Alex Schultz Date: Mon, 20 May 2019 10:01:51 -0600 Subject: [PATCH] Ensure openstack clients are installed We need to ensure the openstack clients are installed on controllers for the deployed server case. This should be handled by the overcloud images themselves, however if the images are not used we should make sure the clients get installed with our OpenstackClients service. Change-Id: If7fad9f24c7294c2d749fc3838b1fb71182930fc Related-Bug: #1829769 (cherry picked from commit 885715855b19ec71ab362d92233478f3afb5a696) --- roles/Controller.yaml | 1 + roles/ControllerAllNovaStandalone.yaml | 1 + roles/ControllerNoCeph.yaml | 1 + roles/ControllerNovaStandalone.yaml | 1 + roles/ControllerOpenstack.yaml | 1 + roles/ControllerStorageNfs.yaml | 2 ++ roles_data.yaml | 1 + 7 files changed, 8 insertions(+) diff --git a/roles/Controller.yaml b/roles/Controller.yaml index 31a53ede54..37d0afa600 100644 --- a/roles/Controller.yaml +++ b/roles/Controller.yaml @@ -155,6 +155,7 @@ - OS::TripleO::Services::OctaviaWorker - OS::TripleO::Services::OpenDaylightApi - OS::TripleO::Services::OpenDaylightOvs + - OS::TripleO::Services::OpenStackClients - OS::TripleO::Services::OVNDBs - OS::TripleO::Services::OVNController - OS::TripleO::Services::Pacemaker diff --git a/roles/ControllerAllNovaStandalone.yaml b/roles/ControllerAllNovaStandalone.yaml index fc2fb7ba3f..46fc64dbcc 100644 --- a/roles/ControllerAllNovaStandalone.yaml +++ b/roles/ControllerAllNovaStandalone.yaml @@ -107,6 +107,7 @@ - OS::TripleO::Services::OctaviaWorker - OS::TripleO::Services::OpenDaylightApi - OS::TripleO::Services::OpenDaylightOvs + - OS::TripleO::Services::OpenStackClients - OS::TripleO::Services::OVNDBs - OS::TripleO::Services::OVNController - OS::TripleO::Services::Pacemaker diff --git a/roles/ControllerNoCeph.yaml b/roles/ControllerNoCeph.yaml index 18d47d987c..0c7c72e384 100644 --- a/roles/ControllerNoCeph.yaml +++ b/roles/ControllerNoCeph.yaml @@ -148,6 +148,7 @@ - OS::TripleO::Services::OctaviaWorker - OS::TripleO::Services::OpenDaylightApi - OS::TripleO::Services::OpenDaylightOvs + - OS::TripleO::Services::OpenStackClients - OS::TripleO::Services::OVNDBs - OS::TripleO::Services::OVNController - OS::TripleO::Services::Pacemaker diff --git a/roles/ControllerNovaStandalone.yaml b/roles/ControllerNovaStandalone.yaml index 3431ea5c03..d094280316 100644 --- a/roles/ControllerNovaStandalone.yaml +++ b/roles/ControllerNovaStandalone.yaml @@ -123,6 +123,7 @@ - OS::TripleO::Services::OctaviaWorker - OS::TripleO::Services::OpenDaylightApi - OS::TripleO::Services::OpenDaylightOvs + - OS::TripleO::Services::OpenStackClients - OS::TripleO::Services::OVNDBs - OS::TripleO::Services::OVNController - OS::TripleO::Services::Pacemaker diff --git a/roles/ControllerOpenstack.yaml b/roles/ControllerOpenstack.yaml index fe61066ba1..697e341274 100644 --- a/roles/ControllerOpenstack.yaml +++ b/roles/ControllerOpenstack.yaml @@ -121,6 +121,7 @@ - OS::TripleO::Services::OctaviaWorker - OS::TripleO::Services::OpenDaylightApi - OS::TripleO::Services::OpenDaylightOvs + - OS::TripleO::Services::OpenStackClients - OS::TripleO::Services::OVNDBs - OS::TripleO::Services::OVNController - OS::TripleO::Services::Pacemaker diff --git a/roles/ControllerStorageNfs.yaml b/roles/ControllerStorageNfs.yaml index 7fbe877704..a7b8a94fe5 100644 --- a/roles/ControllerStorageNfs.yaml +++ b/roles/ControllerStorageNfs.yaml @@ -149,6 +149,8 @@ - OS::TripleO::Services::OVNController - OS::TripleO::Services::Pacemaker - OS::TripleO::Services::PankoApi + - OS::TripleO::Services::PlacementApi + - OS::TripleO::Services::OpenStackClients - OS::TripleO::Services::OsloMessagingRpc - OS::TripleO::Services::OsloMessagingNotify - OS::TripleO::Services::Podman diff --git a/roles_data.yaml b/roles_data.yaml index 49246c4628..961268af6e 100644 --- a/roles_data.yaml +++ b/roles_data.yaml @@ -158,6 +158,7 @@ - OS::TripleO::Services::OctaviaWorker - OS::TripleO::Services::OpenDaylightApi - OS::TripleO::Services::OpenDaylightOvs + - OS::TripleO::Services::OpenStackClients - OS::TripleO::Services::OVNDBs - OS::TripleO::Services::OVNController - OS::TripleO::Services::Pacemaker