openstack
/
tripleo-puppet-elements
Code Issues Proposed changes

Merge "Remove zaqar"

changes/22/814022/1 15.1.0
Zuul 2021-09-29 15:02:14 +00:00 committed by Gerrit Code Review
parent 98e9e7a019 8fb012a96e
commit 9753de458a
4 changed files with 3 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
elements/overcloud-openstack-clients/install.d/package-installs-overcloud-openstack-clients
View File

@ -13,4 +13,3 @@ novaclient_package
octaviaclient_package
openstackclient_package
swiftclient_package
zaqarclient_package

9
elements/overcloud-openstack-clients/pkg-map
View File

@ -16,8 +16,7 @@
"novaclient_package": "python2-novaclient",
"octaviaclient_package": "python2-octaviaclient",
"openstackclient_package": "python2-openstackclient",
"swiftclient_package": "python2-swiftclient",
"zaqarclient_package": "python2-zaqarclient"
"swiftclient_package": "python2-swiftclient"
}
},
"rhel": {
@ -36,8 +35,7 @@
"novaclient_package": "python2-novaclient",
"octaviaclient_package": "python2-octaviaclient",
"openstackclient_package": "python2-openstackclient",
"swiftclient_package": "python2-swiftclient",
"zaqarclient_package": "python2-zaqarclient"
"swiftclient_package": "python2-swiftclient"
}
}
},
@ -56,7 +54,6 @@
"novaclient_package": "python3-novaclient",
"octaviaclient_package": "python3-octaviaclient",
"openstackclient_package": "python3-openstackclient",
"swiftclient_package": "python3-swiftclient",
"zaqarclient_package": "python3-zaqarclient"
"swiftclient_package": "python3-swiftclient"
}
}

1
elements/puppet-modules/environment.d/02-puppet-modules-install-types.sh
View File

@ -69,7 +69,6 @@ if [ "$DIB_INSTALLTYPE_puppet_modules" = "source" ]; then
puppet-manila \
puppet-kmod \
puppet-etcd \
puppet-zaqar \
puppet-ptp ; do
export DIB_INSTALLTYPE_${module_name//\-/_}='source'
done

1
elements/puppet-modules/source-repository-puppet-modules
View File

@ -60,7 +60,6 @@ puppet-kibana3 git /opt/stack/puppet-modules/kibana3 https://github.com/thejandr
puppetlabs-git git /opt/stack/puppet-modules/git https://github.com/puppetlabs/puppetlabs-git.git
puppet-datacat git /opt/stack/puppet-modules/datacat https://github.com/richardc/puppet-datacat.git
puppet-kmod git /opt/stack/puppet-modules/kmod https://github.com/camptocamp/puppet-kmod.git
puppet-zaqar git /opt/stack/puppet-modules/zaqar https://opendev.org/openstack/puppet-zaqar.git
puppet-qdr git /opt/stack/puppet-modules/qdr https://opendev.org/openstack/puppet-qdr.git
puppet-systemd git /opt/stack/puppet-modules/systemd https://github.com/camptocamp/puppet-systemd.git
puppet-etcd git /opt/stack/puppet-modules/etcd https://github.com/cristifalcas/puppet-etcd.git