From 0f2389fce2510b352fc2cb2061d14d11219f3904 Mon Sep 17 00:00:00 2001 From: yangsngshaoxue Date: Tue, 13 Sep 2022 15:05:05 +0800 Subject: [PATCH] docs: remove skyline settings file remove skyline settings file Change-Id: Ia9a1daf0e88f619802a41d82f27da05f26090a38 --- doc/source/admin/index.rst | 3 +- doc/source/configuration/index.rst | 4 +- doc/source/configuration/skyline-settings.rst | 93 ------------------- doc/source/install/docker-install-ubuntu.rst | 6 +- doc/source/install/source-install-ubuntu.rst | 3 +- 5 files changed, 10 insertions(+), 99 deletions(-) delete mode 100644 doc/source/configuration/skyline-settings.rst diff --git a/doc/source/admin/index.rst b/doc/source/admin/index.rst index 213ab09b..f6c57dcc 100644 --- a/doc/source/admin/index.rst +++ b/doc/source/admin/index.rst @@ -16,4 +16,5 @@ For more information about dashboard, see :ref:`skyline-dashboard`. To deploy skyline, see :ref:`skyline-installation-guide`. -To configure skyline, see :ref:`skyline-settings`. +To configure skyline, see +`OpenStack Skyline Settings `__. diff --git a/doc/source/configuration/index.rst b/doc/source/configuration/index.rst index 002033f6..c41b0c55 100644 --- a/doc/source/configuration/index.rst +++ b/doc/source/configuration/index.rst @@ -5,5 +5,7 @@ Configuration Guide .. toctree:: :maxdepth: 1 - skyline-settings skyline-console-settings + +For more information about skyline configuration settings, see +`OpenStack Skyline Settings `__. diff --git a/doc/source/configuration/skyline-settings.rst b/doc/source/configuration/skyline-settings.rst deleted file mode 100644 index 81262f9c..00000000 --- a/doc/source/configuration/skyline-settings.rst +++ /dev/null @@ -1,93 +0,0 @@ -.. _skyline-settings: - -========================== -Skyline Settings Reference -========================== - -skyline.yaml sample configuration file - -.. code-block:: yaml - - default: - access_token_expire: 3600 - access_token_renew: 1800 - cors_allow_origins: [] - database_url: sqlite:////tmp/skyline.db - debug: false - log_dir: ./log - prometheus_basic_auth_password: '' - prometheus_basic_auth_user: '' - prometheus_enable_basic_auth: false - prometheus_endpoint: http://localhost:9091 - secret_key: aCtmgbcUqYUy_HNVg5BDXCaeJgJQzHJXwqbXr0Nmb2o - session_name: session - ssl_enabled: true - openstack: - base_domains: - - heat_user_domain - default_region: RegionOne - extension_mapping: - floating-ip-port-forwarding: neutron_port_forwarding - fwaas_v2: neutron_firewall - qos: neutron_qos - vpnaas: neutron_vpn - interface_type: public - keystone_url: http://localhost:5000/v3/ - nginx_prefix: /api/openstack - reclaim_instance_interval: 604800 - service_mapping: - baremetal: ironic - compute: nova - container: zun - container-infra: magnum - database: trove - identity: keystone - image: glance - key-manager: barbican - load-balancer: octavia - network: neutron - object-store: swift - orchestration: heat - placement: placement - sharev2: manilav2 - volumev3: cinder - sso_enabled: false - sso_protocols: - - openid - sso_region: RegionOne - system_admin_roles: - - admin - - system_admin - system_project: service - system_project_domain: Default - system_reader_roles: - - system_reader - system_user_domain: Default - system_user_name: skyline - system_user_password: '' - setting: - base_settings: - - flavor_families - - gpu_models - - usb_models - flavor_families: - - architecture: x86_architecture - categories: - - name: general_purpose - properties: [] - - name: compute_optimized - properties: [] - - name: memory_optimized - properties: [] - - name: high_clock_speed - properties: [] - - architecture: heterogeneous_computing - categories: - - name: compute_optimized_type_with_gpu - properties: [] - - name: visualization_compute_optimized_type_with_gpu - properties: [] - gpu_models: - - nvidia_t4 - usb_models: - - usb_c diff --git a/doc/source/install/docker-install-ubuntu.rst b/doc/source/install/docker-install-ubuntu.rst index cf1bd19c..d7fdfc5d 100644 --- a/doc/source/install/docker-install-ubuntu.rst +++ b/doc/source/install/docker-install-ubuntu.rst @@ -101,13 +101,13 @@ We will install Skyline service from docker image. $ sudo mkdir -p /etc/skyline /var/log/skyline /var/lib/skyline /var/log/nginx -#. Set all value from :ref:`skyline-settings` into the configuration file - ``/etc/skyline/skyline.yaml`` +#. Configure ``/etc/skyline/skyline.yaml`` file .. note:: Change the related configuration in ``/etc/skyline/skyline.yaml``. Detailed introduction - of the configuration can be found in :ref:`skyline-settings`. + of the configuration can be found in + `OpenStack Skyline Settings `__. .. code-block:: yaml diff --git a/doc/source/install/source-install-ubuntu.rst b/doc/source/install/source-install-ubuntu.rst index 10644c87..e18fcf4b 100644 --- a/doc/source/install/source-install-ubuntu.rst +++ b/doc/source/install/source-install-ubuntu.rst @@ -79,7 +79,8 @@ We will install the Skyline Console service from source code. .. note:: Ensure that skyline.yaml file is available in /etc/skyline folder. - For more information about skyline.yml, see :ref:`skyline-settings`. + For more information about skyline.yml, see + `OpenStack Skyline Settings `__. #. Generate nginx configuration file