opendev
/
system-config
Code Issues Proposed changes

Merge "Clean up OpenEdge configuration"

This commit is contained in:
Zuul 2021-04-01 18:43:31 +00:00 committed by Gerrit Code Review
parent 542c898021 fd98a1750d
commit 0d5a00d739
11 changed files with 0 additions and 91 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
hiera/common.yaml
View File

@ -288,7 +288,6 @@ cacti_hosts:
- mirror.mtl01.inap.opendev.org
- mirror02.us-west-1.packethost.openstack.org
- mirror02.regionone.linaro-us.opendev.org
- mirror.us-east.openedge.opendev.org
- mirror-update.opendev.org
- mirror-update.openstack.org
- refstack01.openstack.org

7
inventory/base/hosts.yaml
View File

@ -529,13 +529,6 @@ all:
region_name: kna1
public_v4: 188.212.109.26
public_v6: ''
mirror01.us-east.openedge.opendev.org:
ansible_host: 108.44.198.36
location:
cloud: openstackci-openedge
region_name: us-east
public_v4: 108.44.198.36
public_v6: 2001:470:e126:0:f816:3eff:fecd:ebe6
nb01.opendev.org:
ansible_host: 104.239.240.55
location:

14
inventory/service/host_vars/bridge.openstack.org.yaml
View File

@ -284,20 +284,6 @@ cloud_launcher_clouds:
- openstackci-keypairs
- openstackci-security
# Open Edge
- name: openstackci-openedge
oscc_cloud: openstackci-openedge
region_name: us-east
profiles:
- openstackci-keypairs
- openstackci-security
- name: openstackzuul-openedge
oscc_cloud: openstackzuul-openedge
region_name: us-east
profiles:
- openstackci-keypairs
- openstackci-security
- name: opendevci-airship-kna1
oscc_cloud: opendevci-airship
region_name: Kna1

4
inventory/service/host_vars/mirror01.us-east.openedge.opendev.org.yaml
View File

@ -1,4 +0,0 @@
letsencrypt_certs:
mirror01-us-east-openedge-main:
- mirror01.us-east.openedge.opendev.org
- mirror.us-east.openedge.opendev.org

1
modules/openstack_project/files/ssl_cert_check/ssldomains
View File

@ -35,7 +35,6 @@ mirror.gra1.ovh.opendev.org 443
mirror.mtl01.inap.opendev.org 443
mirror.ord.rax.opendev.org 443
mirror.regionone.linaro-us.opendev.org 443
mirror.us-east.openedge.opendev.org 443
mirror.sjc1.vexxhost.opendev.org 443
mirror.ca-ymq-1.vexxhost.opendev.org 443
mirror.regionone.limestone.opendev.org 443

3
playbooks/roles/letsencrypt-create-certs/handlers/main.yaml
View File

@ -178,9 +178,6 @@
- name: letsencrypt updated mirror01-kna1-airship-citycloud-main
include_tasks: roles/letsencrypt-create-certs/handlers/restart_apache.yaml
- name: letsencrypt updated mirror01-us-east-openedge-main
include_tasks: roles/letsencrypt-create-certs/handlers/restart_apache.yaml
- name: letsencrypt updated mirror01-sjc1-vexxhost-main
include_tasks: roles/letsencrypt-create-certs/handlers/restart_apache.yam

26
playbooks/templates/clouds/bridge_all_clouds.yaml.j2
View File

@ -222,32 +222,6 @@ clouds:
user_domain_name: default
project_domain_name: default
identity_api_version: '3'
openstackci-openedge:
regions:
- us-east
api_timeout: 60
auth:
auth_url: https://api.us-east.open-edge.io:5000/v3
username: '{{ clouds.openstackci_openedge_username }}'
password: '{{ clouds.openstackci_openedge_password }}'
project_name: '{{ clouds.openstackci_openedge_project_name }}'
project_domain_name: Default
user_domain_name: Default
identity_api_version: 3
image_format: 'qcow2'
openstackzuul-openedge:
regions:
- us-east
api_timeout: 60
auth:
auth_url: https://api.us-east.open-edge.io:5000/v3
username: '{{ clouds.openstackzuul_openedge_username }}'
password: '{{ clouds.openstackzuul_openedge_password }}'
project_name: '{{ clouds.openstackzuul_openedge_project_name }}'
project_domain_name: Default
user_domain_name: Default
identity_api_version: 3
image_format: 'qcow2'
opendevci-airship:
regions:
- Kna1

20
playbooks/templates/clouds/nodepool_clouds.yaml.j2
View File

@ -132,26 +132,6 @@ clouds:
project_domain_name: default
identity_api_version: '3'
image_format: 'raw'
openedge:
regions:
- name: us-east
values:
networks:
- name: openstackzuul
routes_externally: false
routes_ipv6_externally: true
nat_destination: true
api_timeout: 60
auth:
auth_url: https://api.us-east.open-edge.io:5000/v3
username: '{{ nodepool_openedge_username }}'
password: '{{ nodepool_openedge_password }}'
project_name: '{{ nodepool_openedge_project }}'
project_domain_name: Default
user_domain_name: Default
identity_api_version: 3
floating_ip_source: None
image_format: 'qcow2'
airship-citycloud:
regions:
- Kna1

6
playbooks/zuul/templates/group_vars/control-plane-clouds.yaml.j2
View File

@ -48,12 +48,6 @@ clouds:
openstackzuul_packethost_username: user
openstackzuul_packethost_password: password
openstackzuul_packethost_project_name: project
openstackci_openedge_username: user
openstackci_openedge_password: password
openstackci_openedge_project_name: project
openstackzuul_openedge_username: user
openstackzuul_openedge_password: password
openstackzuul_openedge_project_name: project
opendevci_airship_username: user
opendevci_airship_password: password
opendevzuul_airship_username: user

3
playbooks/zuul/templates/group_vars/nodepool.yaml.j2
View File

@ -56,8 +56,5 @@ nodepool_limestone_project: project
nodepool_packethost_username: user
nodepool_packethost_password: password
nodepool_packethost_project: project
nodepool_openedge_username: user
nodepool_openedge_password: password
nodepool_openedge_project: project
nodepool_airship_username: user
nodepool_airship_password: password

6
playbooks/zuul/templates/host_vars/bridge.openstack.org.yaml.j2
View File

@ -52,12 +52,6 @@ clouds:
openstackzuul_packethost_username: user
openstackzuul_packethost_password: password
openstackzuul_packethost_project_name: project
openstackci_openedge_username: user
openstackci_openedge_password: password
openstackci_openedge_project_name: project
openstackzuul_openedge_username: user
openstackzuul_openedge_password: password
openstackzuul_openedge_project_name: project
opendevci_airship_username: user
opendevci_airship_password: password
opendevzuul_airship_username: user