Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

docs: MAAS is written in all-caps #126

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

docs: MAAS is written in all-caps #126

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 5 additions & 5 deletions cloudbaseinit/conf/maas.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,23 +27,23 @@ def __init__(self, config):
super(MAASOptions, self).__init__(config, group="maas")
self._options = [
cfg.StrOpt("metadata_base_url", default=None,
help="The base URL for MaaS metadata",
help="The base URL for MAAS metadata",
deprecated_name="maas_metadata_url",
deprecated_group="DEFAULT"),
cfg.StrOpt("oauth_consumer_key", default="",
help="The MaaS OAuth consumer key",
help="The MAAS OAuth consumer key",
deprecated_name="maas_oauth_consumer_key",
deprecated_group="DEFAULT"),
cfg.StrOpt("oauth_consumer_secret", default="",
help="The MaaS OAuth consumer secret",
help="The MAAS OAuth consumer secret",
deprecated_name="maas_oauth_consumer_secret",
deprecated_group="DEFAULT"),
cfg.StrOpt("oauth_token_key", default="",
help="The MaaS OAuth token key",
help="The MAAS OAuth token key",
deprecated_name="maas_oauth_token_key",
deprecated_group="DEFAULT"),
cfg.StrOpt("oauth_token_secret", default="",
help="The MaaS OAuth token secret",
help="The MAAS OAuth token secret",
deprecated_name="maas_oauth_token_secret",
deprecated_group="DEFAULT"),
cfg.BoolOpt(
Expand Down
2 changes: 1 addition & 1 deletion cloudbaseinit/metadata/services/maasservice.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -74,7 +74,7 @@ def load(self):
super(MaaSHttpService, self).load()

if not CONF.maas.metadata_base_url:
LOG.debug('MaaS metadata url not set')
LOG.debug('MAAS metadata url not set')
else:
try:
self._get_cache_data('%s/meta-data/' % self._metadata_version)
Expand Down
2 changes: 1 addition & 1 deletion doc/source/intro.rst
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ It was designed to initialize and configure guest operating systems under
`OpenStack <https://www.openstack.org/>`_,
`OpenNebula <http://opennebula.org/>`_,
`CloudStack <https://cloudstack.apache.org/>`_,
`MaaS <https://maas.ubuntu.com/>`_ and many others.
`MAAS <https://maas.io/>`_ and many others.
Under `Cloudbase <http://www.cloudbase.it/cloud-init-windows/>`_ page,
stable and beta installers can be found and the service itself is very easy to
configure through configuration files. It can also customize instances based
Expand Down
2 changes: 1 addition & 1 deletion doc/source/services.rst
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -326,7 +326,7 @@ Config options for `default` section:
* retry_count_interval (integer: 4)


Ubuntu MaaS
Canonical MAAS
-----------

.. class:: cloudbaseinit.metadata.services.maasservice.MaaSHttpService
Expand Down