diff options
| author | tzumainn <tzumainn@redhat.com> | 2017-10-13 05:21:26 -0400 |
|---|---|---|
| committer | Tomas Sedovic <tomas@sedovic.cz> | 2017-10-13 11:21:26 +0200 |
| commit | b450ff75888f7801094ca88957a237f33f5e85f1 (patch) | |
| tree | 744495b2d7d95dcb4b487c3bb5a9b8340eff0bbd /roles/openstack-stack/templates/heat_stack.yaml.j2 | |
| parent | 2bb21a8e26cce69b9da722463a6b78860902d3e5 (diff) | |
| download | openshift-b450ff75888f7801094ca88957a237f33f5e85f1.tar.gz openshift-b450ff75888f7801094ca88957a237f33f5e85f1.tar.bz2 openshift-b450ff75888f7801094ca88957a237f33f5e85f1.tar.xz openshift-b450ff75888f7801094ca88957a237f33f5e85f1.zip | |
Allow the specification of server group policies when provisioning openstack (#747)
* Allow for the specifying of server policies during OpenStack provisioning
* documentation for openstack server group policies
* add doc link detailing allowed policies
* changed default to anti-affinity
Diffstat (limited to 'roles/openstack-stack/templates/heat_stack.yaml.j2')
| -rw-r--r-- | roles/openstack-stack/templates/heat_stack.yaml.j2 | 22 |
1 files changed, 22 insertions, 0 deletions
diff --git a/roles/openstack-stack/templates/heat_stack.yaml.j2 b/roles/openstack-stack/templates/heat_stack.yaml.j2 index ef46211a4..a6b088efb 100644 --- a/roles/openstack-stack/templates/heat_stack.yaml.j2 +++ b/roles/openstack-stack/templates/heat_stack.yaml.j2 @@ -536,6 +536,20 @@ resources: - interface {% endif %} +{% if master_server_group_policies|length > 0 %} + master_server_group: + type: OS::Nova::ServerGroup + properties: + name: master_server_group + policies: {{ master_server_group_policies }} +{% endif %} +{% if infra_server_group_policies|length > 0 %} + infra_server_group: + type: OS::Nova::ServerGroup + properties: + name: infra_server_group + policies: {{ infra_server_group_policies }} +{% endif %} {% if num_masters|int > 1 %} loadbalancer: type: OS::Heat::ResourceGroup @@ -643,6 +657,10 @@ resources: floating_network: {{ external_network }} {% endif %} volume_size: {{ master_volume_size }} +{% if master_server_group_policies|length > 0 %} + scheduler_hints: + group: { get_resource: master_server_group } +{% endif %} {% if not provider_network %} depends_on: - interface @@ -766,6 +784,10 @@ resources: floating_network: {{ external_network }} {% endif %} volume_size: {{ infra_volume_size }} +{% if infra_server_group_policies|length > 0 %} + scheduler_hints: + group: { get_resource: infra_server_group } +{% endif %} {% if not provider_network %} depends_on: - interface |