Skip to content
Merged
Changes from all commits
Commits
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
6 changes: 3 additions & 3 deletions extra/post-ceph-azn.py
Original file line number Diff line number Diff line change
Expand Up @@ -233,7 +233,7 @@ def add_cinder_az(cfg, az):
cinder_cp['DEFAULT'] = {}
# Relying on convention, confirm with:
# `oc describe glance glance | grep 'API Endpoint' -C 2`
glance_endpoint = "http://glance-" + az + "-internal.openstack.svc:9292"
glance_endpoint = "https://glance-" + az + "-internal.openstack.svc:9292"
cinder_cp['DEFAULT']['glance_api_servers'] = glance_endpoint

cinder_cp['ceph']['rbd_cluster_name'] = az
Expand Down Expand Up @@ -335,7 +335,7 @@ def add_nova_az(data, num):
nova_cp['glance'] = {}
# Relying on convention, confirm with:
# `oc describe glance glance | grep 'API Endpoint' -C 2`
glance_endpoint = "http://glance-az" + str(num) + "-internal.openstack.svc:9292"
glance_endpoint = "https://glance-az" + str(num) + "-internal.openstack.svc:9292"
nova_cp['glance']['endpoint_override'] = glance_endpoint
nova_cp['glance']['valid_interfaces'] = 'internal'

Expand Down Expand Up @@ -399,7 +399,7 @@ def add_nova_az(data, num):
if data['kind'] == 'OpenStackDataPlaneDeployment':
data['spec']['nodeSets'][0] += "-az" + str(args.num)
if data['kind'] == 'OpenStackDataPlaneService':
data['spec']['configMaps'][0] += "-az" + str(args.num)
data['spec']['dataSources'][0]['configMapRef']['name'] += "-az" + str(args.num)
Copy link
Copy Markdown
Owner

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yes, we need this so it works with openstack-k8s-operators/architecture#296

if data['kind'] == 'ConfigMap' and \
data['metadata']['name'] == "ceph-nova" + "-az" + str(args.num):
data = add_nova_az(data, args.num)
Expand Down