diff --git a/ansible/group_vars/all.yml b/ansible/group_vars/all.yml index 55aa9fd23f..036f588be6 100644 --- a/ansible/group_vars/all.yml +++ b/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 }}" diff --git a/ansible/roles/cinder/defaults/main.yml b/ansible/roles/cinder/defaults/main.yml index 950898bc94..031ba942da 100644 --- a/ansible/roles/cinder/defaults/main.yml +++ b/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 }}" diff --git a/ansible/roles/glance/defaults/main.yml b/ansible/roles/glance/defaults/main.yml index b5e0419470..c8035c61b0 100644 --- a/ansible/roles/glance/defaults/main.yml +++ b/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 }}" diff --git a/ansible/roles/heat/defaults/main.yml b/ansible/roles/heat/defaults/main.yml index d0d85e70f2..ae0d1729b5 100644 --- a/ansible/roles/heat/defaults/main.yml +++ b/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 }}" diff --git a/ansible/roles/ironic/defaults/main.yml b/ansible/roles/ironic/defaults/main.yml index a39102d4f0..a670905ac9 100644 --- a/ansible/roles/ironic/defaults/main.yml +++ b/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 }}" diff --git a/ansible/roles/keystone/defaults/main.yml b/ansible/roles/keystone/defaults/main.yml index b40add7c96..8c7a4a0ef4 100644 --- a/ansible/roles/keystone/defaults/main.yml +++ b/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 }}" diff --git a/ansible/roles/magnum/defaults/main.yml b/ansible/roles/magnum/defaults/main.yml index 61dfbbffdf..9faaf67e4b 100644 --- a/ansible/roles/magnum/defaults/main.yml +++ b/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 }}" diff --git a/ansible/roles/mistral/defaults/main.yml b/ansible/roles/mistral/defaults/main.yml index 2698339458..d72baa8a62 100644 --- a/ansible/roles/mistral/defaults/main.yml +++ b/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 }}" diff --git a/ansible/roles/murano/defaults/main.yml b/ansible/roles/murano/defaults/main.yml index d336e13084..2385db89ea 100644 --- a/ansible/roles/murano/defaults/main.yml +++ b/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 }}" diff --git a/ansible/roles/neutron/defaults/main.yml b/ansible/roles/neutron/defaults/main.yml index ee58eb09af..dcc157fd22 100644 --- a/ansible/roles/neutron/defaults/main.yml +++ b/ansible/roles/neutron/defaults/main.yml @@ -38,7 +38,7 @@ openvswitch_db_image_full: "{{ openvswitch_db_image }}:{{ openvswitch_db_tag }}" #################### -# Openstack +# OpenStack #################### neutron_public_address: "{{ kolla_external_address }}" neutron_admin_address: "{{ kolla_internal_address }}" diff --git a/ansible/roles/nova/defaults/main.yml b/ansible/roles/nova/defaults/main.yml index e98f061d54..707e4950f6 100644 --- a/ansible/roles/nova/defaults/main.yml +++ b/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 }}" diff --git a/ansible/roles/swift/defaults/main.yml b/ansible/roles/swift/defaults/main.yml index 27f7e05ce1..b4fcb34e79 100644 --- a/ansible/roles/swift/defaults/main.yml +++ b/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 }}" diff --git a/etc/kolla/globals.yml b/etc/kolla/globals.yml index 7caed3e8be..2965cde918 100644 --- a/etc/kolla/globals.yml +++ b/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. diff --git a/etc/kolla/passwords.yml b/etc/kolla/passwords.yml index 050ec20863..c92a3e58c0 100644 --- a/etc/kolla/passwords.yml +++ b/etc/kolla/passwords.yml @@ -23,7 +23,7 @@ docker_registry_password: #################### -# Openstack options +# OpenStack options #################### keystone_admin_token: "password" keystone_admin_password: "password" diff --git a/kolla/common/config.py b/kolla/common/config.py index 9a3da19c50..ec2f3514f3 100644 --- a/kolla/common/config.py +++ b/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, diff --git a/specs/ansible-multi.rst b/specs/ansible-multi.rst index 3fc2764f24..1aaf983d3c 100644 --- a/specs/ansible-multi.rst +++ b/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