From 6a3c2b3e61923c82a3b95b6a1ec65f154021e42a Mon Sep 17 00:00:00 2001 From: Alex Schultz Date: Mon, 20 May 2019 09:43:12 -0600 Subject: [PATCH] Add element to install all openstack clients Let's add an element to ensure all the python openstack clients are properly installed on the controllers. These were previously being pulled in because we installed the actual services. Since we moved to containers, these clients are no longer installed by default. Closes-Bug: #1829769 Change-Id: I551d6ac2d064bff05862b3ffa025240657fafd36 --- elements/overcloud-controller/element-deps | 1 + .../package-installs-overcloud-controller | 1 - elements/overcloud-controller/pkg-map | 1 - .../overcloud-openstack-clients/README.md | 1 + .../overcloud-openstack-clients/element-deps | 3 + ...ckage-installs-overcloud-openstack-clients | 18 +++++ elements/overcloud-openstack-clients/pkg-map | 68 +++++++++++++++++++ 7 files changed, 91 insertions(+), 2 deletions(-) create mode 100644 elements/overcloud-openstack-clients/README.md create mode 100644 elements/overcloud-openstack-clients/element-deps create mode 100644 elements/overcloud-openstack-clients/install.d/package-installs-overcloud-openstack-clients create mode 100644 elements/overcloud-openstack-clients/pkg-map diff --git a/elements/overcloud-controller/element-deps b/elements/overcloud-controller/element-deps index b1b1e475..e81b5594 100644 --- a/elements/overcloud-controller/element-deps +++ b/elements/overcloud-controller/element-deps @@ -2,3 +2,4 @@ package-installs pkg-map overcloud-opstools overcloud-base +overcloud-openstack-clients diff --git a/elements/overcloud-controller/install.d/package-installs-overcloud-controller b/elements/overcloud-controller/install.d/package-installs-overcloud-controller index a7688905..123614ad 100644 --- a/elements/overcloud-controller/install.d/package-installs-overcloud-controller +++ b/elements/overcloud-controller/install.d/package-installs-overcloud-controller @@ -8,4 +8,3 @@ nfs_package chrony_package pacemaker_package pcs_package -python_openstackclient_package diff --git a/elements/overcloud-controller/pkg-map b/elements/overcloud-controller/pkg-map index 52a7dc17..7304f264 100644 --- a/elements/overcloud-controller/pkg-map +++ b/elements/overcloud-controller/pkg-map @@ -8,7 +8,6 @@ "ipxe_bootimgs_package": "ipxe-bootimgs", "nfs_package": "nfs-utils", "chrony_package": "chrony", - "python_openstackclient_package": "python-openstackclient", "pacemaker_package": "pacemaker", "pcs_package": "pcs" } diff --git a/elements/overcloud-openstack-clients/README.md b/elements/overcloud-openstack-clients/README.md new file mode 100644 index 00000000..4350e2a2 --- /dev/null +++ b/elements/overcloud-openstack-clients/README.md @@ -0,0 +1 @@ +Install all openstack clients diff --git a/elements/overcloud-openstack-clients/element-deps b/elements/overcloud-openstack-clients/element-deps new file mode 100644 index 00000000..cf3a5cda --- /dev/null +++ b/elements/overcloud-openstack-clients/element-deps @@ -0,0 +1,3 @@ +package-installs +pkg-map +overcloud-base diff --git a/elements/overcloud-openstack-clients/install.d/package-installs-overcloud-openstack-clients b/elements/overcloud-openstack-clients/install.d/package-installs-overcloud-openstack-clients new file mode 100644 index 00000000..5a9fcab9 --- /dev/null +++ b/elements/overcloud-openstack-clients/install.d/package-installs-overcloud-openstack-clients @@ -0,0 +1,18 @@ +aodhclient_package +barbicanclient_package +cinderclient_package +designateclient_package +glanceclient_package +gnocchiclient_package +heatclient_package +ironicclient_package +keystoneclient_package +manilaclient_package +mistralclient_package +neutronclient_package +novaclient_package +openstackclient_package +pankoclient_package +saharaclient_package +swiftclient_package +zaqarclient_package diff --git a/elements/overcloud-openstack-clients/pkg-map b/elements/overcloud-openstack-clients/pkg-map new file mode 100644 index 00000000..3b7a96bf --- /dev/null +++ b/elements/overcloud-openstack-clients/pkg-map @@ -0,0 +1,68 @@ +{ + "release": { + "centos": { + "7": { + "aodhclient_package": "python2-aodhclient", + "barbicanclient_package": "python2-barbicanclient", + "cinderclient_package": "python2-cinderclient", + "designateclient_package": "python2-designateclient", + "glanceclient_package": "python2-glanceclient", + "gnocchiclient_package": "python2-gnocchiclient", + "heatclient_package": "python2-heatclient", + "ironicclient_package": "python2-ironicclient", + "keystoneclient_package": "python2-keystoneclient", + "manilaclient_package": "python2-manilaclient", + "mistralclient_package": "python2-mistralclient", + "neutronclient_package": "python2-neutronclient", + "novaclient_package": "python2-novaclient", + "openstackclient_package": "python2-openstackclient", + "pankoclient_package": "python2-pankiclient", + "saharaclient_package": "python2-saharaclient", + "swiftclient_package": "python2-swiftclient", + "zaqarclient_package": "python2-zaqarclient" + } + }, + "rhel": { + "7": { + "aodhclient_package": "python2-aodhclient", + "barbicanclient_package": "python2-barbicanclient", + "cinderclient_package": "python2-cinderclient", + "designateclient_package": "python2-designateclient", + "glanceclient_package": "python2-glanceclient", + "gnocchiclient_package": "python2-gnocchiclient", + "heatclient_package": "python2-heatclient", + "ironicclient_package": "python2-ironicclient", + "keystoneclient_package": "python2-keystoneclient", + "manilaclient_package": "python2-manilaclient", + "mistralclient_package": "python2-mistralclient", + "neutronclient_package": "python2-neutronclient", + "novaclient_package": "python2-novaclient", + "openstackclient_package": "python2-openstackclient", + "pankoclient_package": "python2-pankiclient", + "saharaclient_package": "python2-saharaclient", + "swiftclient_package": "python2-swiftclient", + "zaqarclient_package": "python2-zaqarclient" + } + } + }, + "default": { + "aodhclient_package": "python3-aodhclient", + "barbicanclient_package": "python3-barbicanclient", + "cinderclient_package": "python3-cinderclient", + "designateclient_package": "python3-designateclient", + "glanceclient_package": "python3-glanceclient", + "gnocchiclient_package": "python3-gnocchiclient", + "heatclient_package": "python3-heatclient", + "ironicclient_package": "python3-ironicclient", + "keystoneclient_package": "python3-keystoneclient", + "manilaclient_package": "python3-manilaclient", + "mistralclient_package": "python3-mistralclient", + "neutronclient_package": "python3-neutronclient", + "novaclient_package": "python3-novaclient", + "openstackclient_package": "python3-openstackclient", + "pankoclient_package": "python3-pankiclient", + "saharaclient_package": "python3-saharaclient", + "swiftclient_package": "python3-swiftclient", + "zaqarclient_package": "python3-zaqarclient" + } +}