Merge "Use uppercase 'S' in word "OpenStack""

ansible/group_vars/all.yml

@@ -129,7 +129,7 @@ kibana_port: "5601"
 elasticsearch_port: "9200"
 
 ####################
-# Openstack options
+# OpenStack options
 ####################
 openstack_release: "2.0.0"
 openstack_logging_debug: "False"
@@ -142,7 +142,7 @@ set_sysctl: "yes"
 # Valid options are [ novnc, spice ]
 nova_console: "novnc"
 
-# Openstack authentication string. You should only need to override these if you
+# OpenStack authentication string. You should only need to override these if you
 # are changing the admin tenant/project or user.
 openstack_auth:
     auth_url: "http://{{ kolla_internal_address }}:{{ keystone_admin_port }}"

ansible/roles/cinder/defaults/main.yml

@@ -48,7 +48,7 @@ cinder_api_image_full: "{{ cinder_api_image }}:{{ cinder_api_tag }}"
 
 
 ####################
-# Openstack
+# OpenStack
 ####################
 cinder_public_address: "{{ kolla_external_address }}"
 cinder_admin_address: "{{ kolla_internal_address }}"

ansible/roles/glance/defaults/main.yml

@@ -35,7 +35,7 @@ glance_api_image_full: "{{ glance_api_image }}:{{ glance_api_tag }}"
 
 
 ####################
-# Openstack
+# OpenStack
 ####################
 glance_public_address: "{{ kolla_external_address }}"
 glance_admin_address: "{{ kolla_internal_address }}"

ansible/roles/heat/defaults/main.yml

@@ -25,7 +25,7 @@ heat_engine_tag: "{{ openstack_release }}"
 heat_engine_image_full: "{{ heat_engine_image }}:{{ heat_engine_tag }}"
 
 ####################
-# Openstack
+# OpenStack
 ####################
 heat_public_address: "{{ kolla_external_address }}"
 heat_admin_address: "{{ kolla_internal_address }}"

ansible/roles/ironic/defaults/main.yml

@@ -30,7 +30,7 @@ ironic_pxe_image_full: "{{ ironic_pxe_image }}:{{ ironic_pxe_tag }}"
 
 
 ####################
-# Openstack
+# OpenStack
 ####################
 ironic_public_address: "{{ kolla_external_address }}"
 ironic_admin_address: "{{ kolla_internal_address }}"

ansible/roles/keystone/defaults/main.yml

@@ -18,7 +18,7 @@ keystone_image_full: "{{ keystone_image }}:{{ keystone_tag }}"
 
 
 ####################
-# Openstack
+# OpenStack
 ####################
 keystone_public_address: "{{ kolla_external_address }}"
 keystone_admin_address: "{{ kolla_internal_address }}"

ansible/roles/magnum/defaults/main.yml

@@ -21,7 +21,7 @@ magnum_conductor_image_full: "{{ magnum_conductor_image }}:{{ magnum_conductor_t
 
 
 ####################
-# Openstack
+# OpenStack
 ####################
 magnum_public_address: "{{ kolla_external_address }}"
 magnum_admin_address: "{{ kolla_internal_address }}"

ansible/roles/mistral/defaults/main.yml

@@ -26,7 +26,7 @@ mistral_api_image_full: "{{ mistral_api_image }}:{{ mistral_api_tag }}"
 
 
 ####################
-# Openstack
+# OpenStack
 ####################
 mistral_public_address: "{{ kolla_external_address }}"
 mistral_admin_address: "{{ kolla_internal_address }}"

ansible/roles/murano/defaults/main.yml

@@ -22,7 +22,7 @@ murano_api_image_full: "{{ murano_api_image }}:{{ murano_api_tag }}"
 
 
 ####################
-# Openstack
+# OpenStack
 ####################
 murano_public_address: "{{ kolla_external_address }}"
 murano_admin_address: "{{ kolla_internal_address }}"

ansible/roles/neutron/defaults/main.yml

@@ -46,7 +46,7 @@ openvswitch_vswitchd_image_full: "{{ openvswitch_vswitchd_image }}:{{ openvswitc
 
 
 ####################
-# Openstack
+# OpenStack
 ####################
 neutron_public_address: "{{ kolla_external_address }}"
 neutron_admin_address: "{{ kolla_internal_address }}"

ansible/roles/nova/defaults/main.yml

@@ -65,7 +65,7 @@ nova_compute_ironic_tag: "{{ openstack_release }}"
 nova_compute_ironic_image_full: "{{ nova_compute_ironic_image }}:{{ nova_compute_ironic_tag }}"
 
 ####################
-# Openstack
+# OpenStack
 ####################
 nova_public_address: "{{ kolla_external_address }}"
 nova_admin_address: "{{ kolla_internal_address }}"

ansible/roles/swift/defaults/main.yml

@@ -25,7 +25,7 @@ swift_rsyncd_tag: "{{ openstack_release }}"
 swift_rsyncd_image_full: "{{ swift_rsyncd_image }}:{{ swift_rsyncd_tag }}"
 
 ####################
-# Openstack
+# OpenStack
 ####################
 swift_public_address: "{{ kolla_external_address }}"
 swift_admin_address: "{{ kolla_internal_address }}"

etc/kolla/globals.yml

@@ -20,7 +20,7 @@
 # 'network_interface' as set in the Networking section below.
 kolla_internal_address: "10.10.10.254"
 
-# The Public address used to communicate with Openstack as set in the public_url
+# The Public address used to communicate with OpenStack as set in the public_url
 # for the endpoints that will be created. It defaults to kolla_internal_address
 # but can be overridden in your globals.yml to a public address. It is up to the
 # deployer to ensure that that public address maps to the environment correctly.

etc/kolla/passwords.yml

@@ -23,7 +23,7 @@ docker_registry_password:
 
 
 ####################
-# Openstack options
+# OpenStack options
 ####################
 keystone_admin_token: "password"
 keystone_admin_password: "password"

kolla/common/config.py

@@ -118,7 +118,7 @@ _CLI_OPTS = [
     cfg.StrOpt('type', short='t', default='binary',
                choices=INSTALL_TYPE_CHOICES,
                dest='install_type', deprecated_group='kolla-build',
-               help=('The method of the Openstack install. The valid'
+               help=('The method of the OpenStack install. The valid'
                      ' types are: {}'.format(
                          ', '.join(INSTALL_TYPE_CHOICES)))),
     cfg.IntOpt('threads', short='T', default=8, min=1,

specs/ansible-multi.rst

@@ -228,7 +228,7 @@ Further the [ipman] section will be added to the file placed by Ansible in
 the target host's configuration directory.
 
 The end result of the merge will be a single file on the host that is in the
-appropriate format for the Openstack service to consume containing the content
+appropriate format for the OpenStack service to consume containing the content
 of both the Ansible default file and the augmentation file.
 
 The final implication of these Ansible best practices is that an Operator can