Merge "Add DISTRIB_REVISION parameter to test-mk-cookiecutter-templates jobs"
diff --git a/keystone/client/service/aodh.yml b/keystone/client/service/aodh.yml
index c4d49b8..e7b0dbb 100644
--- a/keystone/client/service/aodh.yml
+++ b/keystone/client/service/aodh.yml
@@ -2,6 +2,7 @@
_param:
cluster_public_protocol: https
aodh_service_protocol: http
+ aodh_public_host: ${_param:cluster_public_host}
keystone:
client:
server:
@@ -19,7 +20,7 @@
description: OpenStack Alarming Service
endpoints:
- region: ${_param:openstack_region}
- public_address: ${_param:cluster_public_host}
+ public_address: ${_param:aodh_public_host}
public_protocol: ${_param:cluster_public_protocol}
public_port: 8042
public_path: '/'
diff --git a/keystone/client/service/ceilometer.yml b/keystone/client/service/ceilometer.yml
index 90e0d3e..40f4ebf 100644
--- a/keystone/client/service/ceilometer.yml
+++ b/keystone/client/service/ceilometer.yml
@@ -2,6 +2,7 @@
_param:
cluster_public_protocol: https
ceilometer_service_protocol: http
+ ceilometer_public_host: ${_param:cluster_public_host}
keystone:
client:
server:
@@ -19,7 +20,7 @@
description: OpenStack Telemetry Service
endpoints:
- region: ${_param:openstack_region}
- public_address: ${_param:cluster_public_host}
+ public_address: ${_param:ceilometer_public_host}
public_protocol: ${_param:cluster_public_protocol}
public_port: 8777
public_path: '/'
diff --git a/keystone/client/service/gnocchi.yml b/keystone/client/service/gnocchi.yml
index dec6b83..6707764 100644
--- a/keystone/client/service/gnocchi.yml
+++ b/keystone/client/service/gnocchi.yml
@@ -2,6 +2,7 @@
_param:
cluster_public_protocol: https
gnocchi_service_protocol: http
+ gnocchi_public_host: ${_param:cluster_public_host}
keystone:
client:
server:
@@ -19,7 +20,7 @@
description: OpenStack Metric Service
endpoints:
- region: ${_param:openstack_region}
- public_address: ${_param:cluster_public_host}
+ public_address: ${_param:gnocchi_public_host}
public_protocol: ${_param:cluster_public_protocol}
public_port: 8041
public_path: '/'
diff --git a/keystone/client/service/panko.yml b/keystone/client/service/panko.yml
index b7c9fc3..6f86b36 100644
--- a/keystone/client/service/panko.yml
+++ b/keystone/client/service/panko.yml
@@ -2,6 +2,7 @@
_param:
cluster_public_protocol: https
panko_service_protocol: http
+ panko_public_host: ${_param:cluster_public_host}
keystone:
client:
server:
@@ -19,7 +20,7 @@
description: OpenStack Event Service
endpoints:
- region: ${_param:openstack_region}
- public_address: ${_param:cluster_public_host}
+ public_address: ${_param:panko_public_host}
public_protocol: ${_param:cluster_public_protocol}
public_port: 8977
public_path: '/'
diff --git a/salt/control/sizes/ceph.yml b/salt/control/sizes/ceph.yml
index 7b46367..a4be9c9 100644
--- a/salt/control/sizes/ceph.yml
+++ b/salt/control/sizes/ceph.yml
@@ -3,11 +3,11 @@
salt_control_size_cpu_ceph_mon: 8
salt_control_size_ram_ceph_mon: 16384
salt_control_size_disk_profile_ceph_mon: large
- salt_control_size_net_profile_cpu_ceph_mon: default
+ salt_control_size_net_profile_ceph_mon: default
salt_control_size_cpu_ceph_rgw: 8
salt_control_size_ram_ceph_rgw: 16384
salt_control_size_disk_profile_ceph_rgw: small
- salt_control_size_net_profile_cpu_ceph_rgw: default
+ salt_control_size_net_profile_ceph_rgw: default
salt:
control:
size:
diff --git a/salt/control/sizes/cicd.yml b/salt/control/sizes/cicd.yml
index 1099649..a2ada77 100644
--- a/salt/control/sizes/cicd.yml
+++ b/salt/control/sizes/cicd.yml
@@ -3,7 +3,7 @@
salt_control_size_cpu_cicd_control: 8
salt_control_size_ram_cicd_control: 32768
salt_control_size_disk_profile_cicd_control: huge
- salt_control_size_net_profile_cpu_cicd_control: default
+ salt_control_size_net_profile_cicd_control: default
salt:
control:
size:
diff --git a/salt/control/sizes/opencontrail.yml b/salt/control/sizes/opencontrail.yml
index 85a348d..41b858d 100644
--- a/salt/control/sizes/opencontrail.yml
+++ b/salt/control/sizes/opencontrail.yml
@@ -3,11 +3,11 @@
salt_control_size_cpu_opencontrail_control: 8
salt_control_size_ram_opencontrail_control: 65536
salt_control_size_disk_profile_opencontrail_control: large
- salt_control_size_net_profile_cpu_opencontrail_control: default
+ salt_control_size_net_profile_opencontrail_control: default
salt_control_size_cpu_opencontrail_analytics: 16
salt_control_size_ram_opencontrail_analytics: 98304
salt_control_size_disk_profile_opencontrail_analytics: huge
- salt_control_size_net_profile_cpu_opencontrail_analytics: default
+ salt_control_size_net_profile_opencontrail_analytics: default
salt:
control:
size:
diff --git a/salt/control/sizes/openstack.yml b/salt/control/sizes/openstack.yml
index 4283c73..b75161b 100644
--- a/salt/control/sizes/openstack.yml
+++ b/salt/control/sizes/openstack.yml
@@ -3,23 +3,23 @@
salt_control_size_cpu_openstack_control: 8
salt_control_size_ram_openstack_control: 65536
salt_control_size_disk_profile_openstack_control: large
- salt_control_size_net_profile_cpu_openstack_control: default
+ salt_control_size_net_profile_openstack_control: default
salt_control_size_cpu_openstack_database: 8
salt_control_size_ram_openstack_database: 32768
salt_control_size_disk_profile_openstack_database: large
- salt_control_size_net_profile_cpu_openstack_database: default
+ salt_control_size_net_profile_openstack_database: default
salt_control_size_cpu_openstack_message_queue: 16
salt_control_size_ram_openstack_message_queue: 65536
salt_control_size_disk_profile_openstack_message_queue: xxlarge
- salt_control_size_net_profile_cpu_openstack_message_queue: default
+ salt_control_size_net_profile_openstack_message_queue: default
salt_control_size_cpu_openstack_proxy: 4
salt_control_size_ram_openstack_proxy: 16384
salt_control_size_disk_profile_openstack_proxy: large
- salt_control_size_net_profile_cpu_openstack_proxy: default
+ salt_control_size_net_profile_openstack_proxy: default
salt_control_size_cpu_openstack_upgrade: 8
salt_control_size_ram_openstack_upgrade: 16384
salt_control_size_disk_profile_openstack_upgrade: medium
- salt_control_size_net_profile_cpu_openstack_upgrade: default
+ salt_control_size_net_profile_openstack_upgrade: default
salt:
control:
size:
diff --git a/salt/control/sizes/stacklight.yml b/salt/control/sizes/stacklight.yml
index 50f2803..5b09c14 100644
--- a/salt/control/sizes/stacklight.yml
+++ b/salt/control/sizes/stacklight.yml
@@ -1,13 +1,17 @@
parameters:
_param:
- salt_control_size_cpu_stacklight_log: 8
- salt_control_size_ram_stacklight_log: 16384
- salt_control_size_disk_profile_stacklight_log: large
- salt_control_size_net_profile_cpu_stacklight_log: default
- salt_control_size_cpu_stacklight_server: 8
- salt_control_size_ram_stacklight_server: 16384
- salt_control_size_disk_profile_stacklight_server: large
- salt_control_size_net_profile_cpu_stacklight_server: default
+ salt_control_size_cpu_stacklight_log: 16
+ salt_control_size_ram_stacklight_log: 49152
+ salt_control_size_disk_profile_stacklight_log: xxhuge
+ salt_control_size_net_profile_stacklight_log: default
+ salt_control_size_cpu_stacklight_server: 12
+ salt_control_size_ram_stacklight_server: 65536
+ salt_control_size_disk_profile_stacklight_server: xxlarge
+ salt_control_size_net_profile_stacklight_server: default
+ salt_control_size_cpu_stacklight_telemetry: 12
+ salt_control_size_ram_stacklight_telemetry: 98304
+ salt_control_size_disk_profile_stacklight_telemetryr: huge
+ salt_control_size_net_profile_stacklight_telemetry: default
salt:
control:
size:
@@ -20,4 +24,9 @@
cpu: ${_param:salt_control_size_cpu_stacklight_server}
ram: ${_param:salt_control_size_ram_stacklight_server}
disk_profile: ${_param:salt_control_size_disk_profile_stacklight_server}
- net_profile: ${_param:salt_control_size_net_profile_stacklight_server}
\ No newline at end of file
+ net_profile: ${_param:salt_control_size_net_profile_stacklight_server}
+ stacklight.telemetry:
+ cpu: ${_param:salt_control_size_cpu_stacklight_telemetry}
+ ram: ${_param:salt_control_size_ram_stacklight_telemetry}
+ disk_profile: ${_param:salt_control_size_disk_profile_stacklight_telemetry}
+ net_profile: ${_param:salt_control_size_net_profile_stacklight_telemetry}
\ No newline at end of file