Merge "Refactoring aodh apache site configuration"
diff --git a/apache/server/proxy/openstack/oadh.yml b/apache/server/proxy/openstack/aodh.yml
similarity index 100%
rename from apache/server/proxy/openstack/oadh.yml
rename to apache/server/proxy/openstack/aodh.yml
diff --git a/keystone/client/v3/service/ironic.yml b/keystone/client/v3/service/ironic.yml
index 09c6967..bd101e6 100644
--- a/keystone/client/v3/service/ironic.yml
+++ b/keystone/client/v3/service/ironic.yml
@@ -15,20 +15,20 @@
service_admin:
name: admin
project_id: service
- service:
+ services:
ironic:
type: baremetal
description: OpenStack Baremetal Service
endpoints:
ironic_public:
- internface: 'public'
+ interface: 'public'
url: ${_param:cluster_public_protocol}://${_param:cluster_public_host}:6385
region: ${_param:openstack_region}
ironic_internal:
- internface: 'internal'
+ interface: 'internal'
url: ${_param:ironic_service_protocol}://${_param:ironic_service_host}:6385
region: ${_param:openstack_region}
ironic_admin:
- internface: 'admin'
+ interface: 'admin'
url: ${_param:ironic_service_protocol}://${_param:ironic_service_host}:6385
region: ${_param:openstack_region}
diff --git a/keystone/client/v3/service/radosgw-s3.yml b/keystone/client/v3/service/radosgw-s3.yml
index 25614cb..d069d9e 100644
--- a/keystone/client/v3/service/radosgw-s3.yml
+++ b/keystone/client/v3/service/radosgw-s3.yml
@@ -15,7 +15,7 @@
service_admin:
name: admin
project_id: service
- service:
+ services:
radosgw-s3:
type: s3
description: S3 Service (radosgw)
diff --git a/keystone/client/v3/service/radosgw-swift.yml b/keystone/client/v3/service/radosgw-swift.yml
index 4fa6756..e3b8ac3 100644
--- a/keystone/client/v3/service/radosgw-swift.yml
+++ b/keystone/client/v3/service/radosgw-swift.yml
@@ -15,7 +15,7 @@
service_admin:
name: admin
project_id: service
- service:
+ services:
radosgw-swift:
type: object-store
description: Swift Service (radosgw)