From 12c0618314d35f6eee48d74f5072d6f65f4bbba3 Mon Sep 17 00:00:00 2001 From: "zhu.boxiang" Date: Fri, 24 Sep 2021 11:21:42 +0800 Subject: [PATCH] feat: Add ironic and octavia into service_mapping 1. add ironic into service_mapping 2. add octavia into service_mapping 3. change interface_type as public Change-Id: I9ffa419ffac3b7f20784cf7ae4e12a26e3e6bb4d --- etc/skyline.yaml.sample | 6 ++++-- .../skyline-apiserver/skyline_apiserver/config/openstack.py | 4 +++- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/etc/skyline.yaml.sample b/etc/skyline.yaml.sample index 6064477..346bb1f 100644 --- a/etc/skyline.yaml.sample +++ b/etc/skyline.yaml.sample @@ -2,9 +2,9 @@ default: access_token_expire: 3600 access_token_renew: 1800 cors_allow_origins: [] - database_url: sqlite:////tmp/skyline.db + database_url: mysql://root:root@localhost:3306/skyline debug: false - log_dir: /tmp + log_dir: ./log secret_key: aCtmgbcUqYUy_HNVg5BDXCaeJgJQzHJXwqbXr0Nmb2o session_name: session developer: @@ -66,9 +66,11 @@ openstack: nginx_prefix: /api/openstack reclaim_instance_interval: 604800 service_mapping: + baremetal: ironic compute: nova identity: keystone image: glance + load-balancer: octavia network: neutron orchestration: heat placement: placement diff --git a/libs/skyline-apiserver/skyline_apiserver/config/openstack.py b/libs/skyline-apiserver/skyline_apiserver/config/openstack.py index 5cc896a..f916b59 100644 --- a/libs/skyline-apiserver/skyline_apiserver/config/openstack.py +++ b/libs/skyline-apiserver/skyline_apiserver/config/openstack.py @@ -74,7 +74,7 @@ interface_type = Opt( name="interface_type", description="OpenStack endpoint interface type", schema=InterfaceType, - default="internal", + default="public", ) nginx_prefix = Opt( @@ -173,6 +173,8 @@ service_mapping = Opt( "network": "neutron", "compute": "nova", "placement": "placement", + "baremetal": "ironic", + "load-balancer": "octavia", }, )