commit f84b82b8baf5b27cd7179087b6f2e2fd2b1f21ac
author Jakub Pavlik <pavlk.jakub@gmail.com> Tue May 30 11:38:18 2017 +0000
committer Gerrit Code Review <gerrit2@32a4cf582fa9> Tue May 30 11:38:20 2017 +0000
tree e60270d2ecce71aa1241a605f012c43a55325237
parent 215318b20d2ee4131a60f8e2a38bec8b417be644
parent 2948635a71698f916d79f443dbc1ef5b7d225252

Merge "Add database configuration for designate"

aptly/server/docker.yml

diff --git a/aptly/server/docker.yml b/aptly/server/docker.yml
index ee8f4a2..3fa0a8e1 100644
--- a/aptly/server/docker.yml
+++ b/aptly/server/docker.yml
@@ -20,7 +20,6 @@
       root_dir: /srv/volumes/aptly
       no_config: true
       gpg:
-        keyring: .gnupg/trustdb.gpg
         keypair_id: ${_param:aptly_gpg_keypair_id}
         public_key: ${_param:aptly_gpg_public_key}
         private_key: ${_param:aptly_gpg_private_key}

jenkins/client/job/deploy/lab/mk/init.yml

diff --git a/jenkins/client/job/deploy/lab/mk/init.yml b/jenkins/client/job/deploy/lab/mk/init.yml
index 9e988ba..e67ca3f 100644
--- a/jenkins/client/job/deploy/lab/mk/init.yml
+++ b/jenkins/client/job/deploy/lab/mk/init.yml
@@ -94,7 +94,13 @@
               OPENSTACK_API_VERSION:
                 type: string
                 default: "2"
-              OPENSTACK_API_PROJECT_DOMAIN_ID:
+              OPENSTACK_API_PROJECT_DOMAIN:
+                type: string
+                default: "default"
+              OPENSTACK_API_PROJECT_ID:
+                type: string
+                default: ""
+              OPENSTACK_USER_DOMAIN:
                 type: string
                 default: "default"
               OPENSTACK_API_USER_DOMAIN_ID: