From a9afe7ce7a56e9a4de4dda6870010f2765a282de Mon Sep 17 00:00:00 2001 From: Bryan Strassner Date: Mon, 15 Oct 2018 14:15:38 -0500 Subject: [PATCH] Remove duplicates and align pegleg/* schemas Removes the schemas/aic/* in favor of schemas/pegleg/* Change-Id: I1a01df1c737a1afaa285a96419a3db1c2ac53033 --- .../schemas/aic/AccountCatalogue/v1.yaml | 259 ------ .../schemas/aic/CommonAddresses/v1.yaml | 107 --- .../schemas/aic/EndpointCatalogue/v1.yaml | 84 -- .../schemas/aic/SoftwareVersions/v1.yaml | 747 ------------------ .../schemas/aic/AccountCatalogue/v1.yaml | 259 ------ .../schemas/aic/EndpointCatalogue/v1.yaml | 84 -- .../schemas/pegleg/AccountCatalogue/v1.yaml | 645 +++++++++++++++ .../schemas/pegleg/AppArmorProfile/v1.yaml | 17 + .../{aic => pegleg}/CommonAddresses/v1.yaml | 19 +- .../pegleg/CommonSoftwareConfig/v1.yaml | 15 + .../schemas/pegleg/EndpointCatalogue/v1.yaml | 143 ++++ .../{aic => pegleg}/SoftwareVersions/v1.yaml | 351 +++++++- 12 files changed, 1169 insertions(+), 1561 deletions(-) delete mode 100644 deployment_files/global/v1.0demo/schemas/aic/AccountCatalogue/v1.yaml delete mode 100644 deployment_files/global/v1.0demo/schemas/aic/CommonAddresses/v1.yaml delete mode 100644 deployment_files/global/v1.0demo/schemas/aic/EndpointCatalogue/v1.yaml delete mode 100644 deployment_files/global/v1.0demo/schemas/aic/SoftwareVersions/v1.yaml delete mode 100644 deployment_files/global/v1.0dev/schemas/aic/AccountCatalogue/v1.yaml delete mode 100644 deployment_files/global/v1.0dev/schemas/aic/EndpointCatalogue/v1.yaml create mode 100644 deployment_files/global/v1.0dev/schemas/pegleg/AccountCatalogue/v1.yaml create mode 100644 deployment_files/global/v1.0dev/schemas/pegleg/AppArmorProfile/v1.yaml rename deployment_files/global/v1.0dev/schemas/{aic => pegleg}/CommonAddresses/v1.yaml (91%) create mode 100644 deployment_files/global/v1.0dev/schemas/pegleg/CommonSoftwareConfig/v1.yaml create mode 100644 deployment_files/global/v1.0dev/schemas/pegleg/EndpointCatalogue/v1.yaml rename deployment_files/global/v1.0dev/schemas/{aic => pegleg}/SoftwareVersions/v1.yaml (69%) diff --git a/deployment_files/global/v1.0demo/schemas/aic/AccountCatalogue/v1.yaml b/deployment_files/global/v1.0demo/schemas/aic/AccountCatalogue/v1.yaml deleted file mode 100644 index a8433050..00000000 --- a/deployment_files/global/v1.0demo/schemas/aic/AccountCatalogue/v1.yaml +++ /dev/null @@ -1,259 +0,0 @@ ---- -schema: 'deckhand/DataSchema/v1' -metadata: - schema: metadata/Control/v1 - name: pegleg/AccountCatalogue/v1 -data: - $schema: 'http://json-schema.org/schema#' - type: object - properties: - ucp: - type: object - properties: - postgres: - type: object - properties: - admin: - type: object - properties: - username: - type: string - oslo_db: - type: object - properties: - admin: - type: object - properties: - username: - type: string - oslo_messaging: - type: object - properties: - admin: - type: object - properties: - username: - type: string - keystone: - type: object - properties: - admin: - type: object - properties: - region_name: - type: string - username: - type: string - project_name: - type: string - user_domain_name: - type: string - project_domain_name: - type: string - oslo_messaging: - type: object - properties: - username: - type: string - oslo_db: - type: object - properties: - username: - type: string - database: - type: string - promenade: - type: object - properties: - keystone: - type: object - properties: - region_name: - type: string - role: - type: string - project_name: - type: string - project_domain_name: - type: string - user_domain_name: - type: string - username: - type: string - drydock: - type: object - properties: - keystone: - type: object - properties: - region_name: - type: string - role: - type: string - project_name: - type: string - project_domain_name: - type: string - user_domain_name: - type: string - username: - type: string - postgres: - type: object - properties: - username: - type: string - database: - type: string - shipyard: - type: object - properties: - keystone: - type: object - properties: - region_name: - type: string - role: - type: string - project_name: - type: string - project_domain_name: - type: string - user_domain_name: - type: string - username: - type: string - postgres: - type: object - properties: - username: - type: string - database: - type: string - airflow: - type: object - properties: - postgres: - type: object - properties: - username: - type: string - database: - type: string - oslo_messaging: - type: object - properties: - username: - type: string - maas: - type: object - properties: - admin: - type: object - properties: - username: - type: string - email: - type: string - postgres: - type: object - properties: - username: - type: string - database: - type: string - barbican: - type: object - properties: - keystone: - type: object - properties: - region_name: - type: string - role: - type: string - project_name: - type: string - project_domain_name: - type: string - user_domain_name: - type: string - username: - type: string - oslo_db: - type: object - properties: - username: - type: string - database: - type: string - oslo_messaging: - type: object - properties: - username: - type: string - armada: - type: object - properties: - keystone: - type: object - properties: - project_domain_name: - type: string - project_name: - type: string - region_name: - type: string - role: - type: string - user_domain_name: - type: string - username: - type: string - deckhand: - type: object - properties: - keystone: - type: object - properties: - region_name: - type: string - role: - type: string - project_name: - type: string - project_domain_name: - type: string - user_domain_name: - type: string - username: - type: string - postgres: - type: object - properties: - username: - type: string - database: - type: string - ceph: - type: object - properties: - swift: - type: object - properties: - keystone: - type: object - properties: - role: - type: string - region_name: - type: string - username: - type: string - project_name: - type: string - user_domain_name: - type: string - project_domain_name: - type: string -... diff --git a/deployment_files/global/v1.0demo/schemas/aic/CommonAddresses/v1.yaml b/deployment_files/global/v1.0demo/schemas/aic/CommonAddresses/v1.yaml deleted file mode 100644 index 277425aa..00000000 --- a/deployment_files/global/v1.0demo/schemas/aic/CommonAddresses/v1.yaml +++ /dev/null @@ -1,107 +0,0 @@ ---- -schema: 'deckhand/DataSchema/v1' -metadata: - schema: metadata/Control/v1 - name: pegleg/CommonAddresses/v1 -data: - $schema: 'http://json-schema.org/schema#' - type: object - properties: - calico: - type: object - properties: - ip_autodetection_method: - type: string - etcd: - type: object - properties: - service_ip: - type: string - dns: - type: object - properties: - cluster_domain: - type: string - service_ip: - type: string - upstream_servers: - type: array - items: - type: string - upstream_servers_joined: - type: string - genesis: - type: object - properties: - hostname: - type: string - ip: - type: string - bootstrap: - type: object - properties: - ip: - type: string - kubernetes: - type: object - properties: - api_service_ip: - type: string - etcd_service_ip: - type: string - pod_cidr: - type: string - service_cidr: - type: string - apiserver_port: - type: number - haproxy_port: - type: number - etcd: - type: object - properties: - container_port: - type: number - haproxy_port: - type: number - masters: - type: array - items: - type: object - properties: - hostname: - type: string - node_ports: - type: object - properties: - drydock_api: - type: number - maas_api: - type: number - maas_proxy: - type: number - shipyard_api: - type: number - airflow_web: - type: number - ntp: - type: object - properties: - servers_joined: - type: string - openvswitch: - type: object - properties: - external_iface: - type: string - storage: - type: object - properties: - ceph: - type: object - properties: - public_cidr: - type: string - cluster_cidr: - type: string -... diff --git a/deployment_files/global/v1.0demo/schemas/aic/EndpointCatalogue/v1.yaml b/deployment_files/global/v1.0demo/schemas/aic/EndpointCatalogue/v1.yaml deleted file mode 100644 index a61db819..00000000 --- a/deployment_files/global/v1.0demo/schemas/aic/EndpointCatalogue/v1.yaml +++ /dev/null @@ -1,84 +0,0 @@ ---- -schema: 'deckhand/DataSchema/v1' -metadata: - schema: metadata/Control/v1 - name: pegleg/EndpointCatalogue/v1 -data: - $schema: 'http://json-schema.org/schema#' - type: 'object' - # Namespace the list of endpoints - additionalProperties: - type: 'object' - additionalProperties: - type: 'object' - properties: - name: - type: string - auth: - type: object - hosts: - type: object - properties: - default: - type: string - public: - type: string - internal: - type: string - additionalProperties: - type: string - host_fqdn_override: - oneOf: - - type: object - properties: - default: - oneOf: - - type: string - - type: "null" - public: - type: string - internal: - type: string - additionalProperties: - type: string - - type: "null" - path: - oneOf: - - type: object - properties: - default: - type: string - public: - type: string - internal: - type: string - additionalProperties: - type: string - - type: string - scheme: - oneOf: - - type: object - properties: - default: - type: string - public: - type: string - internal: - type: string - additionalProperties: - type: string - - type: string - port: - type: object - additionalProperties: - type: object - properties: - default: - type: number - public: - type: number - internal: - type: number - additionalProperties: - type: number -... diff --git a/deployment_files/global/v1.0demo/schemas/aic/SoftwareVersions/v1.yaml b/deployment_files/global/v1.0demo/schemas/aic/SoftwareVersions/v1.yaml deleted file mode 100644 index 00ec56f8..00000000 --- a/deployment_files/global/v1.0demo/schemas/aic/SoftwareVersions/v1.yaml +++ /dev/null @@ -1,747 +0,0 @@ ---- -schema: 'deckhand/DataSchema/v1' -metadata: - schema: metadata/Control/v1 - name: pegleg/SoftwareVersions/v1 -data: - $schema: 'http://json-schema.org/schema#' - type: object - properties: - charts: - type: object - properties: - kubernetes: - type: object - properties: - calico: - type: object - properties: - etcd: - type: object - properties: - type: - type: string - location: - type: string - subpath: - type: string - reference: - type: string - etcd-htk: - type: object - properties: - type: - type: string - location: - type: string - subpath: - type: string - reference: - type: string - calico: - type: object - properties: - type: - type: string - location: - type: string - subpath: - type: string - reference: - type: string - apiserver: - type: object - properties: - type: - type: string - location: - type: string - subpath: - type: string - reference: - type: string - apiserver-htk: - type: object - properties: - type: - type: string - location: - type: string - subpath: - type: string - reference: - type: string - ucp-helm-toolkit: - type: object - properties: - type: - type: string - location: - type: string - subpath: - type: string - reference: - type: string - controller-manager: - type: object - properties: - type: - type: string - location: - type: string - subpath: - type: string - reference: - type: string - controller-manager-htk: - type: object - properties: - type: - type: string - location: - type: string - subpath: - type: string - reference: - type: string - coredns: - type: object - properties: - type: - type: string - location: - type: string - subpath: - type: string - reference: - type: string - coredns-htk: - type: object - properties: - type: - type: string - location: - type: string - subpath: - type: string - reference: - type: string - haroxy: - type: object - properties: - type: - type: string - location: - type: string - subpath: - type: string - haroxy-htk: - type: object - properties: - type: - type: string - location: - type: string - subpath: - type: string - etcd: - type: object - properties: - type: - type: string - location: - type: string - subpath: - type: string - reference: - type: string - etcd-htk: - type: object - properties: - type: - type: string - location: - type: string - subpath: - type: string - reference: - type: string - ingress: - type: object - properties: - type: - type: string - location: - type: string - subpath: - type: string - reference: - type: string - ingress-htk: - type: object - properties: - type: - type: string - location: - type: string - subpath: - type: string - reference: - type: string - proxy: - type: object - properties: - type: - type: string - location: - type: string - subpath: - type: string - reference: - type: string - proxy-htk: - type: object - properties: - type: - type: string - location: - type: string - subpath: - type: string - reference: - type: string - scheduler: - type: object - properties: - type: - type: string - location: - type: string - subpath: - type: string - reference: - type: string - scheduler-htk: - type: object - properties: - type: - type: string - location: - type: string - subpath: - type: string - reference: - type: string - ucp: - type: object - properties: - armada: - type: object - properties: - type: - type: string - location: - type: string - subpath: - type: string - reference: - type: string - barbican: - type: object - properties: - type: - type: string - location: - type: string - subpath: - type: string - reference: - type: string - ceph: - type: object - properties: - type: - type: string - location: - type: string - subpath: - type: string - reference: - type: string - deckhand: - type: object - properties: - type: - type: string - location: - type: string - subpath: - type: string - reference: - type: string - drydock: - type: object - properties: - type: - type: string - location: - type: string - subpath: - type: string - reference: - type: string - ingress: - type: object - properties: - type: - type: string - location: - type: string - subpath: - type: string - reference: - type: string - postgresql: - type: object - - properties: - type: - type: string - location: - type: string - subpath: - type: string - reference: - type: string - promenade: - type: object - properties: - type: - type: string - location: - type: string - subpath: - type: string - reference: - type: string - keystone: - type: object - properties: - type: - type: string - location: - type: string - subpath: - type: string - reference: - type: string - maas: - type: object - properties: - type: - type: string - location: - type: string - subpath: - type: string - reference: - type: string - mariadb: - type: object - properties: - type: - type: string - location: - type: string - subpath: - type: string - reference: - type: string - memcached: - type: object - properties: - type: - type: string - location: - type: string - subpath: - type: string - reference: - type: string - rabbitmq: - type: object - properties: - type: - type: string - location: - type: string - subpath: - type: string - reference: - type: string - rabbitmq-etcd: - type: object - properties: - type: - type: string - location: - type: string - subpath: - type: string - reference: - type: string - shipyard: - type: object - properties: - type: - type: string - location: - type: string - subpath: - type: string - reference: - type: string - tiller: - type: object - properties: - type: - type: string - location: - type: string - subpath: - type: string - reference: - type: string - files: - type: object - properties: - kubelet: - type: string - images: - type: object - properties: - ucp: - type: object - properties: - armada: - type: object - properties: - api: - type: string - dep_check: - type: string - ks_endpoints: - type: string - ks_service: - type: string - ks_user: - type: string - helm: - type: string - tiller: - type: string - promenade: - type: object - properties: - dep_check: - type: string - promenade: - type: string - ks_user: - type: string - ks_service: - type: string - ks_endpoints: - type: string - deckhand: - type: object - properties: - deckhand: - type: string - dep_check: - type: string - db_init: - type: string - db_sync: - type: string - ks_endpoints: - type: string - ks_service: - type: string - ks_user: - type: string - barbican: - type: object - properties: - bootstrap: - type: string - dep_check: - type: string - scripted_test: - type: string - db_init: - type: string - barbican_db_sync: - type: string - db_drop: - type: string - ks_endpoints: - type: string - ks_service: - type: string - ks_user: - type: string - barbican_api: - type: string - drydock: - type: object - properties: - drydock: - type: string - dep_check: - type: string - ks_endpoints: - type: string - ks_service: - type: string - ks_user: - type: string - drydock_db_init: - type: string - drydock_db_sync: - type: string - shipyard: - type: object - properties: - airflow: - type: string - shipyard: - type: string - dep_check: - type: string - shipyard_db_init: - type: string - shipyard_db_sync: - type: string - airflow_db_init: - type: string - airflow_db_sync: - type: string - ks_user: - type: string - ks_service: - type: string - ks_endpoints: - type: string - maas: - type: object - properties: - db_init: - type: string - db_sync: - type: string - maas_rack: - type: string - maas_region: - type: string - bootstrap: - type: string - export_api_key: - type: string - maas_cache: - type: string - dep_check: - type: string - keystone: - type: object - properties: - keystone_bootstrap: - type: string - test: - type: string - db_init: - type: string - keystone_db_sync: - type: string - db_drop: - type: string - keystone_fernet_setup: - type: string - keystone_fernet_rotate: - type: string - keystone_credential_setup: - type: string - keystone_credential_rotate: - type: string - keystone_api: - type: string - dep_check: - type: string - tiller: - type: object - properties: - tiller: - type: string - mariadb: - type: object - properties: - mariadb: - type: string - dep_check: - type: string - postgresql: - type: object - properties: - postgresql: - type: string - dep_check: - type: string - memcached: - type: object - properties: - memcached: - type: string - dep_check: - type: string - rabbitmq: - type: object - properties: - rabbitmq: - type: string - dep_check: - type: string - ceph: - type: object - properties: - ceph: - type: object - properties: - ks_endpoints: - type: string - ks_service: - type: string - ks_user: - type: string - ceph_bootstrap: - type: string - dep_check: - type: string - ceph_daemon: - type: string - ceph_config_helper: - type: string - ceph_rbd_provisioner: - type: string - ceph_cephfs_provisioner: - type: string - kubernetes: - type: object - properties: - apiserver: - type: object - properties: - anchor: - type: string - apiserver: - type: string - dep_check: - type: string - controller-manager: - type: object - properties: - anchor: - type: string - controller_manager: - type: string - dep_check: - type: string - coredns: - type: object - properties: - coredns: - type: string - haproxy: - type: object - properties: - haproxy: - type: string - anchor: - type: string - etcd: - type: object - properties: - etcd: - type: string - etcdctl: - type: string - kubectl: - type: string - pause: - type: string - scheduler: - type: object - properties: - anchor: - type: string - scheduler: - type: string - proxy: - type: object - properties: - proxy: - type: string - calico: - type: object - properties: - etcd: - type: object - properties: - etcd: - type: string - etcdctl: - type: string - calico: - type: object - properties: - cni: - type: string - ctl: - type: string - node: - type: string - policy_controller: - type: string - packages: - type: object - properties: - repositories: - type: array - items: - type: object - properties: - name: - type: string - url: - type: string - distributions: - type: array - items: - type: string - components: - type: array - items: - type: string - gpgkey: - type: string - named: - type: object - properties: - docker: - type: string - socat: - type: string - unnamed: - type: array - items: - type: string -... diff --git a/deployment_files/global/v1.0dev/schemas/aic/AccountCatalogue/v1.yaml b/deployment_files/global/v1.0dev/schemas/aic/AccountCatalogue/v1.yaml deleted file mode 100644 index a8433050..00000000 --- a/deployment_files/global/v1.0dev/schemas/aic/AccountCatalogue/v1.yaml +++ /dev/null @@ -1,259 +0,0 @@ ---- -schema: 'deckhand/DataSchema/v1' -metadata: - schema: metadata/Control/v1 - name: pegleg/AccountCatalogue/v1 -data: - $schema: 'http://json-schema.org/schema#' - type: object - properties: - ucp: - type: object - properties: - postgres: - type: object - properties: - admin: - type: object - properties: - username: - type: string - oslo_db: - type: object - properties: - admin: - type: object - properties: - username: - type: string - oslo_messaging: - type: object - properties: - admin: - type: object - properties: - username: - type: string - keystone: - type: object - properties: - admin: - type: object - properties: - region_name: - type: string - username: - type: string - project_name: - type: string - user_domain_name: - type: string - project_domain_name: - type: string - oslo_messaging: - type: object - properties: - username: - type: string - oslo_db: - type: object - properties: - username: - type: string - database: - type: string - promenade: - type: object - properties: - keystone: - type: object - properties: - region_name: - type: string - role: - type: string - project_name: - type: string - project_domain_name: - type: string - user_domain_name: - type: string - username: - type: string - drydock: - type: object - properties: - keystone: - type: object - properties: - region_name: - type: string - role: - type: string - project_name: - type: string - project_domain_name: - type: string - user_domain_name: - type: string - username: - type: string - postgres: - type: object - properties: - username: - type: string - database: - type: string - shipyard: - type: object - properties: - keystone: - type: object - properties: - region_name: - type: string - role: - type: string - project_name: - type: string - project_domain_name: - type: string - user_domain_name: - type: string - username: - type: string - postgres: - type: object - properties: - username: - type: string - database: - type: string - airflow: - type: object - properties: - postgres: - type: object - properties: - username: - type: string - database: - type: string - oslo_messaging: - type: object - properties: - username: - type: string - maas: - type: object - properties: - admin: - type: object - properties: - username: - type: string - email: - type: string - postgres: - type: object - properties: - username: - type: string - database: - type: string - barbican: - type: object - properties: - keystone: - type: object - properties: - region_name: - type: string - role: - type: string - project_name: - type: string - project_domain_name: - type: string - user_domain_name: - type: string - username: - type: string - oslo_db: - type: object - properties: - username: - type: string - database: - type: string - oslo_messaging: - type: object - properties: - username: - type: string - armada: - type: object - properties: - keystone: - type: object - properties: - project_domain_name: - type: string - project_name: - type: string - region_name: - type: string - role: - type: string - user_domain_name: - type: string - username: - type: string - deckhand: - type: object - properties: - keystone: - type: object - properties: - region_name: - type: string - role: - type: string - project_name: - type: string - project_domain_name: - type: string - user_domain_name: - type: string - username: - type: string - postgres: - type: object - properties: - username: - type: string - database: - type: string - ceph: - type: object - properties: - swift: - type: object - properties: - keystone: - type: object - properties: - role: - type: string - region_name: - type: string - username: - type: string - project_name: - type: string - user_domain_name: - type: string - project_domain_name: - type: string -... diff --git a/deployment_files/global/v1.0dev/schemas/aic/EndpointCatalogue/v1.yaml b/deployment_files/global/v1.0dev/schemas/aic/EndpointCatalogue/v1.yaml deleted file mode 100644 index a61db819..00000000 --- a/deployment_files/global/v1.0dev/schemas/aic/EndpointCatalogue/v1.yaml +++ /dev/null @@ -1,84 +0,0 @@ ---- -schema: 'deckhand/DataSchema/v1' -metadata: - schema: metadata/Control/v1 - name: pegleg/EndpointCatalogue/v1 -data: - $schema: 'http://json-schema.org/schema#' - type: 'object' - # Namespace the list of endpoints - additionalProperties: - type: 'object' - additionalProperties: - type: 'object' - properties: - name: - type: string - auth: - type: object - hosts: - type: object - properties: - default: - type: string - public: - type: string - internal: - type: string - additionalProperties: - type: string - host_fqdn_override: - oneOf: - - type: object - properties: - default: - oneOf: - - type: string - - type: "null" - public: - type: string - internal: - type: string - additionalProperties: - type: string - - type: "null" - path: - oneOf: - - type: object - properties: - default: - type: string - public: - type: string - internal: - type: string - additionalProperties: - type: string - - type: string - scheme: - oneOf: - - type: object - properties: - default: - type: string - public: - type: string - internal: - type: string - additionalProperties: - type: string - - type: string - port: - type: object - additionalProperties: - type: object - properties: - default: - type: number - public: - type: number - internal: - type: number - additionalProperties: - type: number -... diff --git a/deployment_files/global/v1.0dev/schemas/pegleg/AccountCatalogue/v1.yaml b/deployment_files/global/v1.0dev/schemas/pegleg/AccountCatalogue/v1.yaml new file mode 100644 index 00000000..c9505999 --- /dev/null +++ b/deployment_files/global/v1.0dev/schemas/pegleg/AccountCatalogue/v1.yaml @@ -0,0 +1,645 @@ +--- +schema: 'deckhand/DataSchema/v1' +metadata: + schema: metadata/Control/v1 + name: pegleg/AccountCatalogue/v1 +data: + $schema: 'http://json-schema.org/schema#' + type: object + properties: + ucp: + type: object + properties: + postgres: + type: object + properties: + admin: + type: object + properties: + username: + type: string + oslo_db: + type: object + properties: + admin: + type: object + properties: + username: + type: string + oslo_messaging: + type: object + properties: + admin: + type: object + properties: + username: + type: string + keystone: + type: object + properties: + admin: + type: object + properties: + region_name: + type: string + username: + type: string + project_name: + type: string + user_domain_name: + type: string + project_domain_name: + type: string + oslo_messaging: + type: object + properties: + username: + type: string + oslo_db: + type: object + properties: + username: + type: string + database: + type: string + promenade: + type: object + properties: + keystone: + type: object + properties: + region_name: + type: string + role: + type: string + project_name: + type: string + project_domain_name: + type: string + user_domain_name: + type: string + username: + type: string + drydock: + type: object + properties: + keystone: + type: object + properties: + region_name: + type: string + role: + type: string + project_name: + type: string + project_domain_name: + type: string + user_domain_name: + type: string + username: + type: string + postgres: + type: object + properties: + username: + type: string + database: + type: string + shipyard: + type: object + properties: + keystone: + type: object + properties: + region_name: + type: string + role: + type: string + project_name: + type: string + project_domain_name: + type: string + user_domain_name: + type: string + username: + type: string + postgres: + type: object + properties: + username: + type: string + database: + type: string + airflow: + type: object + properties: + postgres: + type: object + properties: + username: + type: string + database: + type: string + oslo_messaging: + type: object + properties: + username: + type: string + maas: + type: object + properties: + admin: + type: object + properties: + username: + type: string + email: + type: string + postgres: + type: object + properties: + username: + type: string + database: + type: string + barbican: + type: object + properties: + keystone: + type: object + properties: + region_name: + type: string + role: + type: string + project_name: + type: string + project_domain_name: + type: string + user_domain_name: + type: string + username: + type: string + oslo_db: + type: object + properties: + username: + type: string + database: + type: string + oslo_messaging: + type: object + properties: + username: + type: string + armada: + type: object + properties: + keystone: + type: object + properties: + project_domain_name: + type: string + project_name: + type: string + region_name: + type: string + role: + type: string + user_domain_name: + type: string + username: + type: string + deckhand: + type: object + properties: + keystone: + type: object + properties: + region_name: + type: string + role: + type: string + project_name: + type: string + project_domain_name: + type: string + user_domain_name: + type: string + username: + type: string + postgres: + type: object + properties: + username: + type: string + database: + type: string + ceph: + type: object + properties: + swift: + type: object + properties: + keystone: + type: object + properties: + role: + type: string + region_name: + type: string + username: + type: string + project_name: + type: string + user_domain_name: + type: string + project_domain_name: + type: string + osh: + type: object + properties: + keystone: + type: object + properties: + admin: + type: object + properties: + region_name: + type: string + username: + type: string + project_name: + type: string + user_domain_name: + type: string + project_domain_name: + type: string + oslo_messaging: + type: object + properties: + admin: + type: object + properties: + username: + type: string + keystone: + type: object + properties: + username: + type: string + oslo_db: + type: object + properties: + username: + type: string + database: + type: string + cinder: + type: object + properties: + cinder: + type: object + properties: + role: + type: string + region_name: + type: string + username: + type: string + project_name: + type: string + user_domain_name: + type: string + project_domain_name: + type: string + oslo_messaging: + type: object + properties: + admin: + type: object + properties: + username: + type: string + cinder: + type: object + properties: + username: + type: string + oslo_db: + type: object + properties: + username: + type: string + database: + type: string + glance: + type: object + properties: + glance: + type: object + properties: + role: + type: string + region_name: + type: string + username: + type: string + project_name: + type: string + user_domain_name: + type: string + project_domain_name: + type: string + oslo_messaging: + type: object + properties: + admin: + type: object + properties: + username: + type: string + glance: + type: object + properties: + username: + type: string + oslo_db: + type: object + properties: + username: + type: string + database: + type: string + ceph_object_store: + type: object + properties: + username: + type: string + heat: + type: object + properties: + heat: + type: object + properties: + role: + type: string + region_name: + type: string + username: + type: string + project_name: + type: string + user_domain_name: + type: string + project_domain_name: + type: string + heat_trustee: + type: object + properties: + role: + type: string + region_name: + type: string + username: + type: string + project_name: + type: string + user_domain_name: + type: string + project_domain_name: + type: string + heat_stack_user: + type: object + properties: + role: + type: string + region_name: + type: string + username: + type: string + project_name: + type: string + user_domain_name: + type: string + project_domain_name: + type: string + oslo_db: + type: object + properties: + username: + type: string + database: + type: string + oslo_messaging: + type: object + properties: + admin: + type: object + properties: + username: + type: string + heat: + type: object + properties: + username: + type: string + swift: + type: object + properties: + swift: + type: object + properties: + role: + type: string + region_name: + type: string + username: + type: string + project_name: + type: string + user_domain_name: + type: string + project_domain_name: + type: string + oslo_db: + type: object + properties: + admin: + type: object + properties: + username: + type: string + neutron: + type: object + properties: + neutron: + type: object + properties: + role: + type: string + region_name: + type: string + username: + type: string + project_name: + type: string + user_domain_name: + type: string + project_domain_name: + type: string + oslo_messaging: + type: object + properties: + admin: + type: object + properties: + username: + type: string + neutron: + type: object + properties: + username: + type: string + oslo_db: + type: object + properties: + username: + type: string + database: + type: string + nova: + type: object + properties: + nova: + type: object + properties: + role: + type: string + region_name: + type: string + username: + type: string + project_name: + type: string + user_domain_name: + type: string + project_domain_name: + type: string + placement: + type: object + properties: + role: + type: string + region_name: + type: string + username: + type: string + project_name: + type: string + user_domain_name: + type: string + project_domain_name: + type: string + oslo_messaging: + type: object + properties: + admin: + type: object + properties: + username: + type: string + nova: + type: object + properties: + username: + type: string + oslo_db: + type: object + properties: + username: + type: string + database: + type: string + oslo_db_api: + type: object + properties: + username: + type: string + database: + type: string + oslo_db_cell0: + type: object + properties: + username: + type: string + database: + type: string + horizon: + type: object + properties: + oslo_db: + type: object + properties: + username: + type: string + database: + type: string + osh_infra: + type: object + properties: + grafana: + type: object + properties: + admin: + type: object + properties: + username: + type: string + oslo_db: + type: object + properties: + username: + type: string + database: + type: string + oslo_db_session: + type: object + properties: + username: + type: string + database: + type: string + elasticsearch: + type: object + properties: + admin: + type: object + properties: + username: + type: string + oslo_db: + type: object + properties: + admin: + type: object + properties: + username: + type: string + prometheus_openstack_exporter: + type: object + properties: + user: + type: object + properties: + username: + type: string + nagios: + type: object + properties: + admin: + type: object + properties: + username: + type: string +... diff --git a/deployment_files/global/v1.0dev/schemas/pegleg/AppArmorProfile/v1.yaml b/deployment_files/global/v1.0dev/schemas/pegleg/AppArmorProfile/v1.yaml new file mode 100644 index 00000000..29fa070c --- /dev/null +++ b/deployment_files/global/v1.0dev/schemas/pegleg/AppArmorProfile/v1.yaml @@ -0,0 +1,17 @@ +--- +schema: 'deckhand/DataSchema/v1' +metadata: + schema: metadata/Control/v1 + name: pegleg/AppArmorProfile/v1 + labels: + application: pegleg +data: + $schema: 'http://json-schema.org/schema#' + type: 'object' + additionalProperties: false + properties: + savePath: + type: 'string' + content: + type: 'string' + required: ['savePath', 'content'] diff --git a/deployment_files/global/v1.0dev/schemas/aic/CommonAddresses/v1.yaml b/deployment_files/global/v1.0dev/schemas/pegleg/CommonAddresses/v1.yaml similarity index 91% rename from deployment_files/global/v1.0dev/schemas/aic/CommonAddresses/v1.yaml rename to deployment_files/global/v1.0dev/schemas/pegleg/CommonAddresses/v1.yaml index 277425aa..33981373 100644 --- a/deployment_files/global/v1.0dev/schemas/aic/CommonAddresses/v1.yaml +++ b/deployment_files/global/v1.0dev/schemas/pegleg/CommonAddresses/v1.yaml @@ -57,6 +57,8 @@ data: type: number haproxy_port: type: number + service_node_port_range: + type: string etcd: type: object properties: @@ -89,11 +91,6 @@ data: properties: servers_joined: type: string - openvswitch: - type: object - properties: - external_iface: - type: string storage: type: object properties: @@ -104,4 +101,16 @@ data: type: string cluster_cidr: type: string + openvswitch: + type: object + properties: + external_iface: + type: string + neutron: + type: object + properties: + tunnel_device: + type: string + external_iface: + type: string ... diff --git a/deployment_files/global/v1.0dev/schemas/pegleg/CommonSoftwareConfig/v1.yaml b/deployment_files/global/v1.0dev/schemas/pegleg/CommonSoftwareConfig/v1.yaml new file mode 100644 index 00000000..c02965cf --- /dev/null +++ b/deployment_files/global/v1.0dev/schemas/pegleg/CommonSoftwareConfig/v1.yaml @@ -0,0 +1,15 @@ +--- +schema: 'deckhand/DataSchema/v1' +metadata: + schema: metadata/Control/v1 + name: pegleg/CommonSoftwareConfig/v1 +data: + $schema: 'http://json-schema.org/schema#' + type: object + properties: + osh: + type: object + properties: + region_name: + type: string +... diff --git a/deployment_files/global/v1.0dev/schemas/pegleg/EndpointCatalogue/v1.yaml b/deployment_files/global/v1.0dev/schemas/pegleg/EndpointCatalogue/v1.yaml new file mode 100644 index 00000000..776e4270 --- /dev/null +++ b/deployment_files/global/v1.0dev/schemas/pegleg/EndpointCatalogue/v1.yaml @@ -0,0 +1,143 @@ +--- +schema: 'deckhand/DataSchema/v1' +metadata: + schema: metadata/Control/v1 + name: pegleg/EndpointCatalogue/v1 +data: + $schema: 'http://json-schema.org/schema#' + type: 'object' + # Namespace the list of endpoints + additionalProperties: + type: 'object' + additionalProperties: + type: 'object' + properties: + namespace: + oneOf: + - type: string + - type: "null" + name: + type: string + auth: + type: object + hosts: + type: object + properties: + data: + type: string + default: + type: string + discovery: + type: string + public: + type: string + internal: + type: string + additionalProperties: + type: string + host_fqdn_override: + oneOf: + - type: object + properties: + default: + oneOf: + - type: string + - type: "null" + - type: object + properties: + host: + type: string + tls: + type: object + properties: + crt: + type: string + ca: + type: string + key: + type: string + additionalProperties: + type: string + public: + oneOf: + - type: string + - type: "null" + - type: object + properties: + host: + type: string + tls: + type: object + properties: + crt: + type: string + ca: + type: string + key: + type: string + additionalProperties: + type: string + internal: + oneOf: + - type: string + - type: "null" + - type: object + properties: + host: + type: string + tls: + type: object + properties: + crt: + type: string + ca: + type: string + key: + type: string + additionalProperties: + type: string + additionalProperties: + type: string + - type: "null" + path: + oneOf: + - type: object + properties: + default: + oneOf: + - type: string + - type: "null" + public: + type: string + internal: + type: string + additionalProperties: + type: string + - type: string + scheme: + oneOf: + - type: object + properties: + default: + type: string + public: + type: string + internal: + type: string + additionalProperties: + type: string + - type: string + port: + type: object + additionalProperties: + type: object + properties: + default: + type: number + public: + type: number + internal: + type: number + additionalProperties: + type: number +... diff --git a/deployment_files/global/v1.0dev/schemas/aic/SoftwareVersions/v1.yaml b/deployment_files/global/v1.0dev/schemas/pegleg/SoftwareVersions/v1.yaml similarity index 69% rename from deployment_files/global/v1.0dev/schemas/aic/SoftwareVersions/v1.yaml rename to deployment_files/global/v1.0dev/schemas/pegleg/SoftwareVersions/v1.yaml index 00ec56f8..f0930530 100644 --- a/deployment_files/global/v1.0dev/schemas/aic/SoftwareVersions/v1.yaml +++ b/deployment_files/global/v1.0dev/schemas/pegleg/SoftwareVersions/v1.yaml @@ -71,17 +71,6 @@ data: type: string reference: type: string - ucp-helm-toolkit: - type: object - properties: - type: - type: string - location: - type: string - subpath: - type: string - reference: - type: string controller-manager: type: object properties: @@ -232,6 +221,276 @@ data: type: string reference: type: string + osh_infra: + type: object + properties: + elasticsearch: + type: object + properties: + type: + type: string + location: + type: string + subpath: + type: string + reference: + type: string + fluent_logging: + type: object + properties: + type: + type: string + location: + type: string + subpath: + type: string + reference: + type: string + kibana: + type: object + properties: + type: + type: string + location: + type: string + subpath: + type: string + reference: + type: string + prometheus: + type: object + properties: + type: + type: string + location: + type: string + subpath: + type: string + reference: + type: string + prometheus_node_exporter: + type: object + properties: + type: + type: string + location: + type: string + subpath: + type: string + reference: + type: string + prometheus_kube_state_metrics: + type: object + properties: + type: + type: string + location: + type: string + subpath: + type: string + reference: + type: string + prometheus_alertmanager: + type: object + properties: + type: + type: string + location: + type: string + subpath: + type: string + reference: + type: string + grafana: + type: object + properties: + type: + type: string + location: + type: string + subpath: + type: string + reference: + type: string + prometheus_openstack_exporter: + type: object + properties: + type: + type: string + location: + type: string + subpath: + type: string + reference: + type: string + nagios: + type: object + properties: + type: + type: string + location: + type: string + subpath: + type: string + reference: + type: string + osh: + type: object + properties: + barbican: + type: object + properties: + type: + type: string + location: + type: string + subpath: + type: string + reference: + type: string + cinder: + type: object + properties: + type: + type: string + location: + type: string + subpath: + type: string + reference: + type: string + glance: + type: object + properties: + type: + type: string + location: + type: string + subpath: + type: string + reference: + type: string + heat: + type: object + properties: + type: + type: string + location: + type: string + subpath: + type: string + reference: + type: string + horizon: + type: object + properties: + type: + type: string + location: + type: string + subpath: + type: string + reference: + type: string + ingress: + type: object + properties: + type: + type: string + location: + type: string + subpath: + type: string + reference: + type: string + keystone: + type: object + properties: + type: + type: string + location: + type: string + subpath: + type: string + reference: + type: string + libvirt: + type: object + properties: + type: + type: string + location: + type: string + subpath: + type: string + reference: + type: string + mariadb: + type: object + properties: + type: + type: string + location: + type: string + subpath: + type: string + reference: + type: string + memcached: + type: object + properties: + type: + type: string + location: + type: string + subpath: + type: string + reference: + type: string + neutron: + type: object + properties: + type: + type: string + location: + type: string + subpath: + type: string + reference: + type: string + nova: + type: object + properties: + type: + type: string + location: + type: string + subpath: + type: string + reference: + type: string + openvswitch: + type: object + properties: + type: + type: string + location: + type: string + subpath: + type: string + reference: + type: string + rabbitmq: + type: object + properties: + type: + type: string + location: + type: string + subpath: + type: string + reference: + type: string ucp: type: object properties: @@ -257,7 +516,29 @@ data: type: string reference: type: string - ceph: + ceph-mon: + type: object + properties: + type: + type: string + location: + type: string + subpath: + type: string + reference: + type: string + ceph-osd: + type: object + properties: + type: + type: string + location: + type: string + subpath: + type: string + reference: + type: string + ceph-client: type: object properties: type: @@ -613,7 +894,37 @@ data: ceph: type: object properties: - ceph: + ceph-mon: + type: object + properties: + fluentbit: + type: string + ceph_bootstrap: + type: string + dep_check: + type: string + ceph_mon: + type: string + ceph_config_helper: + type: string + ceph_mon_check: + type: string + image_repo_sync: + type: string + ceph-osd: + type: object + properties: + fluentbit: + type: string + ceph_bootstrap: + type: string + dep_check: + type: string + ceph_osd: + type: string + image_repo_sync: + type: string + ceph-client: type: object properties: ks_endpoints: @@ -626,14 +937,22 @@ data: type: string dep_check: type: string - ceph_daemon: + ceph_mds: + type: string + ceph_mgr: + type: string + ceph_rgw: type: string ceph_config_helper: type: string + ceph_rbd_pool: + type: string ceph_rbd_provisioner: type: string ceph_cephfs_provisioner: type: string + image_repo_sync: + type: string kubernetes: type: object properties: @@ -715,8 +1034,8 @@ data: type: object properties: repositories: - type: array - items: + type: object + additionalProperties: type: object properties: name: