diff options
Diffstat (limited to 'environments')
-rw-r--r-- | environments/composable-roles/standalone.yaml | 12 | ||||
-rw-r--r-- | environments/network-isolation-v6.j2.yaml | 2 | ||||
-rw-r--r-- | environments/storage/enable-ceph.yaml | 2 | ||||
-rw-r--r-- | environments/storage/external-ceph.yaml | 2 | ||||
-rw-r--r-- | environments/storage/glance-nfs.yaml | 2 |
5 files changed, 11 insertions, 9 deletions
diff --git a/environments/composable-roles/standalone.yaml b/environments/composable-roles/standalone.yaml index 3305c9ed..c12d72de 100644 --- a/environments/composable-roles/standalone.yaml +++ b/environments/composable-roles/standalone.yaml @@ -30,13 +30,13 @@ parameter_defaults: # Type: string ComputeHostnameFormat: '%stackname%-novacompute-%index%' - # Number of Controller nodes to deploy + # Number of ControllerOpenstack nodes # Type: number - ControllerCount: 3 + ControllerOpenstackCount: 3 - # Format for Controller node hostnames Note %index% is translated into the index of the node, e.g 0/1/2 etc and %stackname% is replaced with the stack name e.g overcloud + # Format for ControllerOpenstack node hostnames Note %index% is translated into the index of the node, e.g 0/1/2 etc and %stackname% is replaced with the stack name e.g overcloud # Type: string - ControllerHostnameFormat: '%stackname%-controller-%index%' + ControllerOpenstackHostnameFormat: '%stackname%-controller-%index%' # Number of Database nodes # Type: number @@ -66,9 +66,9 @@ parameter_defaults: # Type: string OvercloudComputeFlavor: compute - # Name of the flavor for Controller nodes + # Name of the flavor for ControllerOpenstack nodes # Type: string - OvercloudControllerFlavor: control + OvercloudControllerOpenstackFlavor: control # Name of the flavor for Database nodes # Type: string diff --git a/environments/network-isolation-v6.j2.yaml b/environments/network-isolation-v6.j2.yaml index 617dfa61..fefa20ce 100644 --- a/environments/network-isolation-v6.j2.yaml +++ b/environments/network-isolation-v6.j2.yaml @@ -55,3 +55,5 @@ parameter_defaults: RabbitIPv6: True # Enable IPv6 environment for Memcached. MemcachedIPv6: True + # Enable IPv6 environment for MySQL. + MysqlIPv6: True diff --git a/environments/storage/enable-ceph.yaml b/environments/storage/enable-ceph.yaml index 596ec16e..c43f2fa1 100644 --- a/environments/storage/enable-ceph.yaml +++ b/environments/storage/enable-ceph.yaml @@ -21,7 +21,7 @@ parameter_defaults: # Type: boolean CinderEnableRbdBackend: True - # The short name of the Glance backend to use. Should be one of swift, rbd, or file + # The short name of the Glance backend to use. Should be one of swift, rbd, cinder, or file # Type: string GlanceBackend: rbd diff --git a/environments/storage/external-ceph.yaml b/environments/storage/external-ceph.yaml index 0f2d0396..dde2c907 100644 --- a/environments/storage/external-ceph.yaml +++ b/environments/storage/external-ceph.yaml @@ -43,7 +43,7 @@ parameter_defaults: # Type: string CinderRbdPoolName: volumes - # The short name of the Glance backend to use. Should be one of swift, rbd, or file + # The short name of the Glance backend to use. Should be one of swift, rbd, cinder, or file # Type: string GlanceBackend: rbd diff --git a/environments/storage/glance-nfs.yaml b/environments/storage/glance-nfs.yaml index 3c139306..359401d5 100644 --- a/environments/storage/glance-nfs.yaml +++ b/environments/storage/glance-nfs.yaml @@ -21,7 +21,7 @@ parameter_defaults: # Static parameters - these are values that must be # included in the environment but should not be changed. # ****************************************************** - # The short name of the Glance backend to use. Should be one of swift, rbd, or file + # The short name of the Glance backend to use. Should be one of swift, rbd, cinder, or file # Type: string GlanceBackend: file |