vexxhost/openstack-operator
Code Issues Proposed changes

Disable auto endpoint creation

Browse Source 
Change-Id: Idde1d48af7fd9bfba78d07137d9c1f147f8b890d
This commit is contained in:
okozachenko 2020-08-14 08:42:18 +03:00
parent b95acd6a55
commit 4e3df13c29
3 changed files with 23 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
openstack_operator/glance.py
View File

@ -50,8 +50,11 @@ def create_or_resume(name, spec, **_):
name=name, spec=spec) name=name, spec=spec)
url = spec["ingress"]["host"] url = spec["ingress"]["host"]
identity.ensure_service(name="glance", service_type="image", if "endpoint" not in spec:
url=url, desc="Glance Image Service") spec["endpoint"] = True
if spec["endpoint"]:
identity.ensure_service(name="glance", service_type="image",
url=url, desc="Glance Image Service")
def update(name, spec, **_): def update(name, spec, **_):

17
openstack_operator/heat.py
View File

@ -74,12 +74,17 @@ def create_or_resume(name, spec, **_):
identity.ensure_application_credential(name="heat") identity.ensure_application_credential(name="heat")
# Create service and endpoints # Create service and endpoints
identity.ensure_service(name="heat-api", service_type="orchestration", if "endpoint" not in spec:
url=api_url, path="/v1/$(project_id)s", spec["endpoint"] = True
desc="Heat Orchestration Service") if spec["endpoint"]:
identity.ensure_service(name="heat-api-cfn", service_type="cloudformation", identity.ensure_service(name="heat-api",
url=cfn_url, path="/v1", service_type="orchestration",
desc="Heat CloudFormation Service") url=api_url, path="/v1/$(project_id)s",
desc="Heat Orchestration Service")
identity.ensure_service(name="heat-api-cfn",
service_type="cloudformation",
url=cfn_url, path="/v1",
desc="Heat CloudFormation Service")
def update(name, spec, **_): def update(name, spec, **_):

10
openstack_operator/magnum.py
View File

@ -61,9 +61,13 @@ def create_or_resume(name, spec, **_):
url = spec["ingress"]["host"] url = spec["ingress"]["host"]
# Create service and endpoints # Create service and endpoints
identity.ensure_service(name="magnum-api", path="/v1", if "endpoint" not in spec:
service_type="container-infra", url=url, spec["endpoint"] = True
desc="Container Infrastructure Management Service") if spec["endpoint"]:
identity.ensure_service(name="magnum-api", path="/v1",
service_type="container-infra", url=url,
desc="Container Infrastructure \
Management Service")
def update(name, spec, **_): def update(name, spec, **_):