Fix pdns4 devstack plugin and drop lower-constraints
This change drops the lower-constraints test. (cherry picked from commitd08dd621c9
) And fixes the pdns4 devstack plugin. We no longer need to deal with xenial or older distro versions, so we can assume that we can always install pdns4 from the distro directly and don't need the distro version check any longer. Drop a config option that was removed in pdns 4.2.x. Use mysql credentials correctly. (cherry picked from commit6f17fe10bb
) Change-Id: I90af3a092296f943509833608f25522b6f8e9ab6 Depends-On: I36799ee9d4db20104377e2772c86229b8083448d Signed-off-by: Nicolas Bock <nicolas.bock@canonical.com>
This commit is contained in:
parent
28f74c81e7
commit
656a26c45c
|
@ -70,7 +70,8 @@
|
|||
- name: openstack/designate-tempest-plugin
|
||||
override-checkout: 0.7.0
|
||||
- openstack/python-designateclient
|
||||
- openstack/tempest
|
||||
- name: openstack/tempest
|
||||
override-checkout: stein-last
|
||||
run: playbooks/legacy/designate-devstack-base/run.yaml
|
||||
post-run: playbooks/legacy/designate-devstack-base/post.yaml
|
||||
timeout: 4200
|
||||
|
@ -180,7 +181,6 @@
|
|||
templates:
|
||||
- designate-devstack-jobs
|
||||
- openstack-cover-jobs
|
||||
- openstack-lower-constraints-jobs
|
||||
- openstack-python-jobs
|
||||
- openstack-python35-jobs
|
||||
- openstack-python36-jobs
|
||||
|
|
|
@ -32,25 +32,6 @@ fi
|
|||
# install_designate_backend - install any external requirements
|
||||
function install_designate_backend {
|
||||
if is_ubuntu; then
|
||||
GetOSVersion
|
||||
if [ "$os_CODENAME" = "trusty" ]; then
|
||||
sudo tee /etc/apt/sources.list.d/pdns.list > /dev/null <<EOF
|
||||
deb [arch=amd64] http://repo.powerdns.com/ubuntu trusty-auth-40 main
|
||||
EOF
|
||||
sudo tee /etc/apt/preferences.d/pdns > /dev/null <<EOF
|
||||
Package: pdns-*
|
||||
Pin: origin repo.powerdns.com
|
||||
Pin-Priority: 600
|
||||
EOF
|
||||
curl https://repo.powerdns.com/FD380FBB-pub.asc | sudo apt-key add - &&
|
||||
sudo apt-get update
|
||||
elif [ "$os_CODENAME" = "xenial" ]; then
|
||||
echo "Use PDNS4 from apt repo"
|
||||
elif [ "$os_CODENAME" = "bionic" ]; then
|
||||
echo "Use PDNS4 from apt repo"
|
||||
else
|
||||
die $LINENO "PDNS4 backend only supports bionic, trusty or xenial"
|
||||
fi
|
||||
PDNS=pdns-server
|
||||
else
|
||||
die $LINENO "PDNS4 Backend plugin backend only supports Ubuntu"
|
||||
|
@ -117,7 +98,6 @@ slave=yes
|
|||
cache-ttl=0
|
||||
query-cache-ttl=0
|
||||
negquery-cache-ttl=0
|
||||
out-of-zone-additional-processing=no
|
||||
webserver=yes
|
||||
webserver-address=$DESIGNATE_SERVICE_HOST
|
||||
webserver-allow-from=$DESIGNATE_SERVICE_HOST,127.0.0.1,::1
|
||||
|
@ -166,7 +146,7 @@ function init_designate_backend {
|
|||
# (Re)create designate_pdns database
|
||||
recreate_database designate_pdns utf8
|
||||
if is_service_enabled mysql; then
|
||||
sudo mysql -u root designate_pdns < $DESIGNATE_PLUGINS/backend-pdns4-mysql-db.sql
|
||||
sudo mysql -u$DATABASE_USER -p$DATABASE_PASSWORD -h$MYSQL_HOST designate_pdns < $DESIGNATE_PLUGINS/backend-pdns4-mysql-db.sql
|
||||
elif is_service_enabled postgresql; then
|
||||
sudo psql -U root -d designate_pdns -f $DESIGNATE_PLUGINS/backend-pdns4-pgsql-db.sql
|
||||
else
|
||||
|
|
|
@ -1,168 +0,0 @@
|
|||
alabaster==0.7.10
|
||||
alembic==0.9.8
|
||||
amqp==2.2.2
|
||||
appdirs==1.4.3
|
||||
asn1crypto==0.24.0
|
||||
Babel==2.3.4
|
||||
bandit==1.1.0
|
||||
bcrypt==3.1.4
|
||||
beautifulsoup4==4.6.0
|
||||
blockdiag==1.5.3
|
||||
cachetools==2.0.1
|
||||
certifi==2018.1.18
|
||||
cffi==1.11.5
|
||||
chardet==3.0.4
|
||||
click==6.7
|
||||
cliff==2.11.0
|
||||
cmd2==0.8.1
|
||||
contextlib2==0.5.5
|
||||
coverage==4.0
|
||||
cryptography==2.1.4
|
||||
debtcollector==1.2.0
|
||||
decorator==4.2.1
|
||||
deprecation==2.0
|
||||
dnspython3==1.12.0
|
||||
dnspython==1.14.0
|
||||
doc8==0.6.0
|
||||
docutils==0.14
|
||||
dogpile.cache==0.6.5
|
||||
dulwich==0.19.0
|
||||
enum-compat==0.0.2
|
||||
eventlet==0.18.2
|
||||
extras==1.0.0
|
||||
fasteners==0.14.1
|
||||
fixtures==3.0.0
|
||||
flake8==2.5.5
|
||||
Flask==0.10
|
||||
funcparserlib==0.3.6
|
||||
future==0.16.0
|
||||
futurist==1.2.0
|
||||
gitdb2==2.0.3
|
||||
GitPython==2.1.8
|
||||
greenlet==0.4.10
|
||||
hacking==0.12.0
|
||||
idna==2.6
|
||||
imagesize==1.0.0
|
||||
iso8601==0.1.12
|
||||
itsdangerous==0.24
|
||||
Jinja2==2.10
|
||||
jmespath==0.9.3
|
||||
jsonpatch==1.21
|
||||
jsonpointer==2.0
|
||||
jsonschema==2.6.0
|
||||
kazoo==2.4.0
|
||||
keystoneauth1==3.4.0
|
||||
keystonemiddleware==4.17.0
|
||||
kombu==4.1.0
|
||||
linecache2==1.0.0
|
||||
logutils==0.3.5
|
||||
Mako==1.0.7
|
||||
MarkupSafe==1.0
|
||||
mccabe==0.2.1
|
||||
mock==2.0.0
|
||||
monasca-statsd==1.1.0
|
||||
monotonic==1.4
|
||||
mox3==0.25.0
|
||||
msgpack==0.5.6
|
||||
munch==2.2.0
|
||||
netaddr==0.7.18
|
||||
netifaces==0.10.6
|
||||
openstackdocstheme==1.20.0
|
||||
openstacksdk==0.12.0
|
||||
os-api-ref==1.5.0
|
||||
os-client-config==1.29.0
|
||||
os-service-types==1.2.0
|
||||
os-testr==1.0.0
|
||||
os-win==3.0.0
|
||||
osc-lib==1.10.0
|
||||
oslo.cache==1.29.0
|
||||
oslo.concurrency==3.26.0
|
||||
oslo.config==5.2.0
|
||||
oslo.context==2.19.2
|
||||
oslo.db==4.27.0
|
||||
oslo.i18n==3.15.3
|
||||
oslo.log==3.36.0
|
||||
oslo.messaging==5.29.0
|
||||
oslo.middleware==3.31.0
|
||||
oslo.policy==1.30.0
|
||||
oslo.reports==1.18.0
|
||||
oslo.rootwrap==5.8.0
|
||||
oslo.serialization==2.18.0
|
||||
oslo.service==1.24.0
|
||||
oslo.upgradecheck==0.1.0
|
||||
oslo.utils==3.33.0
|
||||
oslo.versionedobjects==1.31.2
|
||||
oslotest==3.2.0
|
||||
packaging==17.1
|
||||
paramiko==2.4.1
|
||||
Paste==2.0.2
|
||||
PasteDeploy==1.5.0
|
||||
pbr==2.0.0
|
||||
pecan==1.0.0
|
||||
pep8==1.5.7
|
||||
pika-pool==0.1.3
|
||||
pika==0.10.0
|
||||
Pillow==5.0.0
|
||||
prettytable==0.7.2
|
||||
psutil==5.4.3
|
||||
pyasn1==0.4.2
|
||||
pycadf==2.7.0
|
||||
pycparser==2.18
|
||||
pyflakes==0.8.1
|
||||
Pygments==2.2.0
|
||||
pyinotify==0.9.6
|
||||
PyNaCl==1.2.1
|
||||
pyparsing==2.2.0
|
||||
pyperclip==1.6.0
|
||||
python-dateutil==2.7.0
|
||||
python-designateclient==2.7.0
|
||||
python-editor==1.0.3
|
||||
python-keystoneclient==3.15.0
|
||||
python-memcached==1.56
|
||||
python-mimeparse==1.6.0
|
||||
python-neutronclient==6.7.0
|
||||
python-subunit==1.2.0
|
||||
pytz==2018.3
|
||||
PyYAML==3.12
|
||||
reno==2.7.0
|
||||
repoze.lru==0.7
|
||||
requests-mock==1.2.0
|
||||
requests==2.14.2
|
||||
requestsexceptions==1.4.0
|
||||
restructuredtext-lint==1.1.3
|
||||
rfc3986==1.1.0
|
||||
Routes==2.4.1
|
||||
simplejson==3.13.2
|
||||
six==1.10.0
|
||||
smmap2==2.0.3
|
||||
snowballstemmer==1.2.1
|
||||
Sphinx==1.6.5
|
||||
sphinxcontrib-blockdiag==1.5.5
|
||||
sphinxcontrib-httpdomain==1.6.1
|
||||
sphinxcontrib-websupport==1.0.1
|
||||
sqlalchemy-migrate==0.11.0
|
||||
SQLAlchemy==1.0.10
|
||||
sqlparse==0.2.4
|
||||
statsd==3.2.2
|
||||
stestr==2.0.0
|
||||
stevedore==1.20.0
|
||||
suds-jurko==0.6
|
||||
tempest==17.1.0
|
||||
Tempita==0.5.2
|
||||
tenacity==4.4.0
|
||||
testresources==2.0.1
|
||||
testscenarios==0.4
|
||||
testtools==2.2.0
|
||||
tooz==1.58.0
|
||||
traceback2==1.4.0
|
||||
unittest2==1.1.0
|
||||
urllib3==1.22
|
||||
vine==1.1.4
|
||||
voluptuous==0.11.1
|
||||
waitress==1.1.0
|
||||
webcolors==1.8.1
|
||||
WebOb==1.7.1
|
||||
WebTest==2.0.27
|
||||
Werkzeug==0.9
|
||||
wrapt==1.10.11
|
||||
zake==0.1.6
|
8
tox.ini
8
tox.ini
|
@ -187,11 +187,3 @@ exclude = .venv,.git,.tox,dist,doc,*lib/python*,*egg,build,tools,.ropeproject
|
|||
[hacking]
|
||||
local-check-factory = designate.hacking.checks.factory
|
||||
import_exceptions = designate.i18n
|
||||
|
||||
[testenv:lower-constraints]
|
||||
basepython = python3
|
||||
install_command = pip install {opts} {packages}
|
||||
deps =
|
||||
-c{toxinidir}/lower-constraints.txt
|
||||
-r{toxinidir}/test-requirements.txt
|
||||
-r{toxinidir}/requirements.txt
|
||||
|
|
Loading…
Reference in New Issue