Merge "Implement X.509 auth for MySQL and Ironic"
diff --git a/jenkins/client/job/deploy/update/upgrade_ovs_gateway.yml b/jenkins/client/job/deploy/update/upgrade_ovs_gateway.yml
index 4753cea..76bf436 100644
--- a/jenkins/client/job/deploy/update/upgrade_ovs_gateway.yml
+++ b/jenkins/client/job/deploy/update/upgrade_ovs_gateway.yml
@@ -43,5 +43,5 @@
description: "Ask interactive questions during pipeline run (bool)"
TARGET_SERVERS:
type: string
- default: 'ctl*'
+ default: 'gtw*'
description: "Salt compound expression to get control servers to upgrade."
diff --git a/jenkins/client/job/oscore/test_upgrades.yml b/jenkins/client/job/oscore/test_upgrades.yml
index a3cf5ae..b97855a 100644
--- a/jenkins/client/job/oscore/test_upgrades.yml
+++ b/jenkins/client/job/oscore/test_upgrades.yml
@@ -19,6 +19,9 @@
credentials: "gerrit"
branch: 'master'
script: test-openstack-upgrade-pipeline.groovy
+ trigger:
+ timer:
+ spec: "H 22 * * *"
param:
CREDENTIALS_ID:
type: string
@@ -36,10 +39,10 @@
description: "Credentials to the OpenStack API"
OPENSTACK_API_PROJECT:
type: string
- default: "mcp-oscore"
+ default: "mcp-oscore-ci"
HEAT_STACK_ZONE:
type: string
- default: "mcp-oscore"
+ default: "mcp-oscore-ci"
FLAVOR_PREFIX:
type: string
default: 'dev'
@@ -50,7 +53,7 @@
TEST_SCHEME:
type: string
description: "Yaml based scheme to be applied in testing"
- default: '{"old": {"context_file_name": "openstack-ovs-core-{{openstack_version_old}}","extra_context": {"default_context": {"openstack_version": "{{openstack_version_old}}"}}}, "new": {"extra_context": {"default_context": {"openstack_version": "{{openstack_version_new}}"}}}}'
+ default: '{"old": {"run_smoke": True, "context_file_name": "openstack-ovs-core-{{openstack_version_old}}","extra_context": {"default_context": {"openstack_version": "{{openstack_version_old}}"}}}, "new": {"run_smoke": True, "extra_context": {"default_context": {"openstack_version": "{{openstack_version_new}}"}}}}'
job:
oscore-test-adjust-cluster-model:
display_name: oscore-test-adjust-cluster-model
diff --git a/keystone/client/service/gnocchi.yml b/keystone/client/service/gnocchi.yml
index 27d38b0..1d1b075 100644
--- a/keystone/client/service/gnocchi.yml
+++ b/keystone/client/service/gnocchi.yml
@@ -5,6 +5,8 @@
cluster_public_protocol: https
gnocchi_service_protocol: http
gnocchi_public_host: ${_param:cluster_public_host}
+ gnocchi_public_port: 8041
+ gnocchi_public_path: '/'
keystone:
client:
server:
@@ -24,8 +26,8 @@
- region: ${_param:openstack_region}
public_address: ${_param:gnocchi_public_host}
public_protocol: ${_param:cluster_public_protocol}
- public_port: 8041
- public_path: '/'
+ public_port: ${_param:gnocchi_public_port}
+ public_path: ${_param:gnocchi_public_path}
internal_address: ${_param:gnocchi_service_host}
internal_port: 8041
internal_path: '/'
diff --git a/keystone/client/service/keystone.yml b/keystone/client/service/keystone.yml
index 0cfa963..53e7cd1 100644
--- a/keystone/client/service/keystone.yml
+++ b/keystone/client/service/keystone.yml
@@ -7,6 +7,8 @@
keystone_public_path: "/v2.0"
keystone_internal_path: "/v2.0"
keystone_admin_path: "/v2.0"
+ keystone_public_address: ${_param:cluster_public_host}
+ keystone_public_port: 5000
keystone:
client:
server:
@@ -17,9 +19,9 @@
description: OpenStack Identity Service
endpoints:
- region: ${_param:openstack_region}
- public_address: ${_param:cluster_public_host}
+ public_address: ${_param:keystone_public_address}
public_protocol: ${_param:cluster_public_protocol}
- public_port: 5000
+ public_port: ${_param:keystone_public_port}
public_path: ${_param:keystone_public_path}
internal_address: ${_param:keystone_service_host}
internal_port: 5000