diff --git a/global/v4.0/software/charts/osh-infra/dependencies.yaml b/global/v4.0/software/charts/osh-infra/dependencies.yaml index d45bc5dbb..cd730ba47 100644 --- a/global/v4.0/software/charts/osh-infra/dependencies.yaml +++ b/global/v4.0/software/charts/osh-infra/dependencies.yaml @@ -21,7 +21,7 @@ data: wait: timeout: 600 labels: - release_group: osh-infra-helm-toolkit + release_group: airship-osh-infra-helm-toolkit upgrade: no_hooks: true values: {} diff --git a/global/v4.0/software/charts/osh-infra/osh-infra-ceph-config/ceph-config.yaml b/global/v4.0/software/charts/osh-infra/osh-infra-ceph-config/ceph-config.yaml index d615db060..eb5eb1122 100644 --- a/global/v4.0/software/charts/osh-infra/osh-infra-ceph-config/ceph-config.yaml +++ b/global/v4.0/software/charts/osh-infra/osh-infra-ceph-config/ceph-config.yaml @@ -99,7 +99,7 @@ data: wait: timeout: 900 labels: - release_group: osh-infra-ceph-config + release_group: airship-osh-infra-ceph-config install: no_hooks: false upgrade: @@ -108,7 +108,7 @@ data: delete: - type: job labels: - release_group: osh-infra-ceph-config + release_group: airship-osh-infra-ceph-config values: labels: job: diff --git a/global/v4.0/software/charts/osh-infra/osh-infra-dashboards/grafana.yaml b/global/v4.0/software/charts/osh-infra/osh-infra-dashboards/grafana.yaml index 51eec5fa5..48e36e23a 100644 --- a/global/v4.0/software/charts/osh-infra/osh-infra-dashboards/grafana.yaml +++ b/global/v4.0/software/charts/osh-infra/osh-infra-dashboards/grafana.yaml @@ -190,7 +190,7 @@ data: wait: timeout: 900 labels: - release_group: grafana + release_group: airship-grafana install: no_hooks: false upgrade: @@ -199,7 +199,7 @@ data: delete: - type: job labels: - release_group: grafana + release_group: airship-grafana post: create: [] values: diff --git a/global/v4.0/software/charts/osh-infra/osh-infra-dashboards/kibana.yaml b/global/v4.0/software/charts/osh-infra/osh-infra-dashboards/kibana.yaml index ccaf235c2..4685f72aa 100644 --- a/global/v4.0/software/charts/osh-infra/osh-infra-dashboards/kibana.yaml +++ b/global/v4.0/software/charts/osh-infra/osh-infra-dashboards/kibana.yaml @@ -79,7 +79,7 @@ data: wait: timeout: 900 labels: - release_group: kibana + release_group: airship-kibana install: no_hooks: false upgrade: @@ -88,7 +88,7 @@ data: delete: - type: job labels: - release_group: kibana + release_group: airship-kibana create: [] post: create: [] diff --git a/global/v4.0/software/charts/osh-infra/osh-infra-ingress-controller/ingress.yaml b/global/v4.0/software/charts/osh-infra/osh-infra-ingress-controller/ingress.yaml index 03b2c638c..38ed35712 100644 --- a/global/v4.0/software/charts/osh-infra/osh-infra-ingress-controller/ingress.yaml +++ b/global/v4.0/software/charts/osh-infra/osh-infra-ingress-controller/ingress.yaml @@ -29,7 +29,7 @@ data: wait: timeout: 900 labels: - release_group: osh-infra-ingress-controller + release_group: airship-osh-infra-ingress-controller install: no_hooks: false upgrade: @@ -38,7 +38,7 @@ data: delete: - type: job labels: - release_group: osh-infra-ingress-controller + release_group: airship-osh-infra-ingress-controller values: labels: server: diff --git a/global/v4.0/software/charts/osh-infra/osh-infra-logging/elasticsearch.yaml b/global/v4.0/software/charts/osh-infra/osh-infra-logging/elasticsearch.yaml index cd9f1b50a..2e7a6b640 100644 --- a/global/v4.0/software/charts/osh-infra/osh-infra-logging/elasticsearch.yaml +++ b/global/v4.0/software/charts/osh-infra/osh-infra-logging/elasticsearch.yaml @@ -83,7 +83,7 @@ data: wait: timeout: 900 labels: - release_group: elasticsearch + release_group: airship-elasticsearch install: no_hooks: false upgrade: @@ -92,7 +92,7 @@ data: delete: - type: job labels: - release_group: elasticsearch + release_group: airship-elasticsearch create: [] post: create: [] diff --git a/global/v4.0/software/charts/osh-infra/osh-infra-logging/fluent-logging.yaml b/global/v4.0/software/charts/osh-infra/osh-infra-logging/fluent-logging.yaml index 199926738..28f9dd633 100644 --- a/global/v4.0/software/charts/osh-infra/osh-infra-logging/fluent-logging.yaml +++ b/global/v4.0/software/charts/osh-infra/osh-infra-logging/fluent-logging.yaml @@ -68,7 +68,7 @@ data: wait: timeout: 900 labels: - release_group: fluent-logging + release_group: airship-fluent-logging install: no_hooks: false upgrade: @@ -77,7 +77,7 @@ data: delete: - type: job labels: - release_group: fluent-logging + release_group: airship-fluent-logging create: [] post: create: [] diff --git a/global/v4.0/software/charts/osh-infra/osh-infra-mariadb/mariadb.yaml b/global/v4.0/software/charts/osh-infra/osh-infra-mariadb/mariadb.yaml index e7722878d..310cfec33 100644 --- a/global/v4.0/software/charts/osh-infra/osh-infra-mariadb/mariadb.yaml +++ b/global/v4.0/software/charts/osh-infra/osh-infra-mariadb/mariadb.yaml @@ -54,7 +54,7 @@ data: wait: timeout: 900 labels: - release_group: osh-infra-mariadb + release_group: airship-osh-infra-mariadb install: no_hooks: false upgrade: @@ -63,7 +63,7 @@ data: delete: - type: job labels: - release_group: osh-infra-mariadb + release_group: airship-osh-infra-mariadb values: labels: server: diff --git a/global/v4.0/software/charts/osh-infra/osh-infra-monitoring/nagios.yaml b/global/v4.0/software/charts/osh-infra/osh-infra-monitoring/nagios.yaml index 3ae3eeddd..35ff41b3e 100644 --- a/global/v4.0/software/charts/osh-infra/osh-infra-monitoring/nagios.yaml +++ b/global/v4.0/software/charts/osh-infra/osh-infra-monitoring/nagios.yaml @@ -81,7 +81,7 @@ data: wait: timeout: 900 labels: - release_group: nagios + release_group: airship-nagios install: no_hooks: false upgrade: @@ -90,7 +90,7 @@ data: delete: - type: job labels: - release_group: nagios + release_group: airship-nagios create: [] post: create: [] diff --git a/global/v4.0/software/charts/osh-infra/osh-infra-monitoring/prometheus-alertmanager.yaml b/global/v4.0/software/charts/osh-infra/osh-infra-monitoring/prometheus-alertmanager.yaml index af3bea330..f69411258 100644 --- a/global/v4.0/software/charts/osh-infra/osh-infra-monitoring/prometheus-alertmanager.yaml +++ b/global/v4.0/software/charts/osh-infra/osh-infra-monitoring/prometheus-alertmanager.yaml @@ -39,7 +39,7 @@ data: wait: timeout: 900 labels: - release_group: prometheus-alertmanager + release_group: airship-prometheus-alertmanager install: no_hooks: false upgrade: @@ -48,7 +48,7 @@ data: delete: - type: job labels: - release_group: prometheus-alertmanager + release_group: airship-prometheus-alertmanager create: [] post: create: [] diff --git a/global/v4.0/software/charts/osh-infra/osh-infra-monitoring/prometheus-kube-state-metrics.yaml b/global/v4.0/software/charts/osh-infra/osh-infra-monitoring/prometheus-kube-state-metrics.yaml index 35348a4fe..4fe639a40 100644 --- a/global/v4.0/software/charts/osh-infra/osh-infra-monitoring/prometheus-kube-state-metrics.yaml +++ b/global/v4.0/software/charts/osh-infra/osh-infra-monitoring/prometheus-kube-state-metrics.yaml @@ -51,7 +51,7 @@ data: wait: timeout: 900 labels: - release_group: prometheus-kube-state-metrics + release_group: airship-prometheus-kube-state-metrics install: no_hooks: false upgrade: @@ -60,7 +60,7 @@ data: delete: - type: job labels: - release_group: prometheus-kube-state-metrics + release_group: airship-prometheus-kube-state-metrics create: [] post: create: [] diff --git a/global/v4.0/software/charts/osh-infra/osh-infra-monitoring/prometheus-node-exporter.yaml b/global/v4.0/software/charts/osh-infra/osh-infra-monitoring/prometheus-node-exporter.yaml index efa79ae5f..73d21b464 100644 --- a/global/v4.0/software/charts/osh-infra/osh-infra-monitoring/prometheus-node-exporter.yaml +++ b/global/v4.0/software/charts/osh-infra/osh-infra-monitoring/prometheus-node-exporter.yaml @@ -39,7 +39,7 @@ data: wait: timeout: 900 labels: - release_group: prometheus-node-exporter + release_group: airship-prometheus-node-exporter install: no_hooks: false upgrade: @@ -48,7 +48,7 @@ data: delete: - type: job labels: - release_group: prometheus-node-exporter + release_group: airship-prometheus-node-exporter create: [] post: create: [] diff --git a/global/v4.0/software/charts/osh-infra/osh-infra-monitoring/prometheus.yaml b/global/v4.0/software/charts/osh-infra/osh-infra-monitoring/prometheus.yaml index 584813fa8..9674e8897 100644 --- a/global/v4.0/software/charts/osh-infra/osh-infra-monitoring/prometheus.yaml +++ b/global/v4.0/software/charts/osh-infra/osh-infra-monitoring/prometheus.yaml @@ -45,7 +45,7 @@ data: wait: timeout: 900 labels: - release_group: prometheus + release_group: airship-prometheus install: no_hooks: false upgrade: @@ -54,7 +54,7 @@ data: delete: - type: job labels: - release_group: prometheus + release_group: airship-prometheus create: [] post: create: [] diff --git a/global/v4.0/software/charts/osh-infra/osh-infra-openstack-exporter/prometheus-openstack-exporter.yaml b/global/v4.0/software/charts/osh-infra/osh-infra-openstack-exporter/prometheus-openstack-exporter.yaml index 0fddbd005..40781c684 100644 --- a/global/v4.0/software/charts/osh-infra/osh-infra-openstack-exporter/prometheus-openstack-exporter.yaml +++ b/global/v4.0/software/charts/osh-infra/osh-infra-openstack-exporter/prometheus-openstack-exporter.yaml @@ -72,7 +72,7 @@ data: wait: timeout: 900 labels: - release_group: prometheus-openstack-exporter + release_group: airship-prometheus-openstack-exporter install: no_hooks: false upgrade: @@ -81,7 +81,7 @@ data: delete: - type: job labels: - release_group: prometheus-openstack-exporter + release_group: airship-prometheus-openstack-exporter values: labels: openstack_exporter: diff --git a/global/v4.0/software/charts/osh/dependencies.yaml b/global/v4.0/software/charts/osh/dependencies.yaml index 64523093f..cf07b707b 100644 --- a/global/v4.0/software/charts/osh/dependencies.yaml +++ b/global/v4.0/software/charts/osh/dependencies.yaml @@ -21,7 +21,7 @@ data: wait: timeout: 600 labels: - release_group: osh-helm-toolkit + release_group: airship-osh-helm-toolkit upgrade: no_hooks: true values: {} diff --git a/global/v4.0/software/charts/osh/openstack-ceph-config/ceph-config.yaml b/global/v4.0/software/charts/osh/openstack-ceph-config/ceph-config.yaml index 4ea28193c..532054dcc 100644 --- a/global/v4.0/software/charts/osh/openstack-ceph-config/ceph-config.yaml +++ b/global/v4.0/software/charts/osh/openstack-ceph-config/ceph-config.yaml @@ -99,7 +99,7 @@ data: wait: timeout: 900 labels: - release_group: openstack-ceph-config + release_group: airship-openstack-ceph-config install: no_hooks: false upgrade: @@ -108,7 +108,7 @@ data: delete: - type: job labels: - release_group: openstack-ceph-config + release_group: airship-openstack-ceph-config values: labels: job: diff --git a/global/v4.0/software/charts/osh/openstack-cinder/cinder.yaml b/global/v4.0/software/charts/osh/openstack-cinder/cinder.yaml index adb04c444..22968c28b 100644 --- a/global/v4.0/software/charts/osh/openstack-cinder/cinder.yaml +++ b/global/v4.0/software/charts/osh/openstack-cinder/cinder.yaml @@ -175,7 +175,7 @@ data: wait: timeout: 900 labels: - release_group: cinder + release_group: airship-cinder install: no_hooks: false upgrade: @@ -184,7 +184,7 @@ data: delete: - type: job labels: - release_group: cinder + release_group: airship-cinder post: create: [] values: diff --git a/global/v4.0/software/charts/osh/openstack-cinder/rabbitmq.yaml b/global/v4.0/software/charts/osh/openstack-cinder/rabbitmq.yaml index 395ab17b2..7475d62ef 100644 --- a/global/v4.0/software/charts/osh/openstack-cinder/rabbitmq.yaml +++ b/global/v4.0/software/charts/osh/openstack-cinder/rabbitmq.yaml @@ -66,7 +66,7 @@ data: wait: timeout: 900 labels: - release_group: cinder-rabbitmq + release_group: airship-cinder-rabbitmq install: no_hooks: false upgrade: @@ -75,18 +75,18 @@ data: delete: - type: job labels: - release_group: cinder-rabbitmq + release_group: airship-cinder-rabbitmq values: pod: replicas: - server: 1 + server: 1 labels: server: node_selector_key: openstack-control-plane node_selector_value: enabled prometheus_rabbitmq_exporter: node_selector_key: openstack-control-plane - node_selector_value: enabled + node_selector_value: enabled monitoring: prometheus: enabled: true diff --git a/global/v4.0/software/charts/osh/openstack-compute-kit/libvirt.yaml b/global/v4.0/software/charts/osh/openstack-compute-kit/libvirt.yaml index 90693500b..6cdfabe7f 100644 --- a/global/v4.0/software/charts/osh/openstack-compute-kit/libvirt.yaml +++ b/global/v4.0/software/charts/osh/openstack-compute-kit/libvirt.yaml @@ -37,7 +37,7 @@ data: delete: - type: job labels: - release_group: libvirt + release_group: airship-libvirt values: labels: agent: diff --git a/global/v4.0/software/charts/osh/openstack-compute-kit/neutron-rabbitmq.yaml b/global/v4.0/software/charts/osh/openstack-compute-kit/neutron-rabbitmq.yaml index 5f0d61f39..195fa601f 100644 --- a/global/v4.0/software/charts/osh/openstack-compute-kit/neutron-rabbitmq.yaml +++ b/global/v4.0/software/charts/osh/openstack-compute-kit/neutron-rabbitmq.yaml @@ -66,7 +66,7 @@ data: wait: timeout: 900 labels: - release_group: neutron-rabbitmq + release_group: airship-neutron-rabbitmq install: no_hooks: false upgrade: @@ -75,11 +75,11 @@ data: delete: - type: job labels: - release_group: neutron-rabbitmq + release_group: airship-neutron-rabbitmq values: pod: replicas: - server: 1 + server: 1 labels: server: node_selector_key: openstack-control-plane diff --git a/global/v4.0/software/charts/osh/openstack-compute-kit/neutron.yaml b/global/v4.0/software/charts/osh/openstack-compute-kit/neutron.yaml index f7c4b108e..e3401f409 100644 --- a/global/v4.0/software/charts/osh/openstack-compute-kit/neutron.yaml +++ b/global/v4.0/software/charts/osh/openstack-compute-kit/neutron.yaml @@ -198,7 +198,7 @@ data: delete: - type: job labels: - release_group: neutron + release_group: airship-neutron post: create: [] values: @@ -323,12 +323,12 @@ data: type_drivers: vlan,flat,vxlan tenant_network_types: vxlan ml2_type_vlan: - network_vlan_ranges: bond1 + network_vlan_ranges: bond0 openvswitch_agent: agent: tunnel_types: vxlan ovs: - bridge_mappings: bond1:br-bond1 + bridge_mappings: bond0:br-bond0 dependencies: - osh-helm-toolkit ... diff --git a/global/v4.0/software/charts/osh/openstack-compute-kit/nova-rabbitmq.yaml b/global/v4.0/software/charts/osh/openstack-compute-kit/nova-rabbitmq.yaml index 0fdaa42a2..e40de63ac 100644 --- a/global/v4.0/software/charts/osh/openstack-compute-kit/nova-rabbitmq.yaml +++ b/global/v4.0/software/charts/osh/openstack-compute-kit/nova-rabbitmq.yaml @@ -66,7 +66,7 @@ data: wait: timeout: 900 labels: - release_group: nova-rabbitmq + release_group: airship-nova-rabbitmq install: no_hooks: false upgrade: @@ -75,11 +75,11 @@ data: delete: - type: job labels: - release_group: nova-rabbitmq + release_group: airship-nova-rabbitmq values: pod: replicas: - server: 1 + server: 1 labels: server: node_selector_key: openstack-control-plane diff --git a/global/v4.0/software/charts/osh/openstack-compute-kit/nova.yaml b/global/v4.0/software/charts/osh/openstack-compute-kit/nova.yaml index a52876b28..78398feb3 100644 --- a/global/v4.0/software/charts/osh/openstack-compute-kit/nova.yaml +++ b/global/v4.0/software/charts/osh/openstack-compute-kit/nova.yaml @@ -281,7 +281,7 @@ data: delete: - type: job labels: - release_group: nova + release_group: airship-nova post: create: [] values: diff --git a/global/v4.0/software/charts/osh/openstack-compute-kit/openvswitch.yaml b/global/v4.0/software/charts/osh/openstack-compute-kit/openvswitch.yaml index 15931c6c6..b0a4f7da2 100644 --- a/global/v4.0/software/charts/osh/openstack-compute-kit/openvswitch.yaml +++ b/global/v4.0/software/charts/osh/openstack-compute-kit/openvswitch.yaml @@ -39,7 +39,7 @@ data: wait: timeout: 900 labels: - release_group: openvswitch + release_group: airship-openvswitch install: no_hooks: false upgrade: @@ -48,14 +48,14 @@ data: delete: - type: job labels: - release_group: openvswitch + release_group: airship-openvswitch values: labels: ovs: node_selector_key: openvswitch node_selector_value: enabled network: - external_bridge: br-bond1 + external_bridge: br-bond0 interface: external: 'EXTERNAL_INTERFACE' dependencies: diff --git a/global/v4.0/software/charts/osh/openstack-glance/glance.yaml b/global/v4.0/software/charts/osh/openstack-glance/glance.yaml index b3283dd82..cf555d45c 100644 --- a/global/v4.0/software/charts/osh/openstack-glance/glance.yaml +++ b/global/v4.0/software/charts/osh/openstack-glance/glance.yaml @@ -193,7 +193,7 @@ data: wait: timeout: 900 labels: - release_group: glance + release_group: airship-glance install: no_hooks: false upgrade: @@ -202,7 +202,7 @@ data: delete: - type: job labels: - release_group: glance + release_group: airship-glance post: create: [] values: diff --git a/global/v4.0/software/charts/osh/openstack-glance/rabbitmq.yaml b/global/v4.0/software/charts/osh/openstack-glance/rabbitmq.yaml index 667c59174..6d46e8169 100644 --- a/global/v4.0/software/charts/osh/openstack-glance/rabbitmq.yaml +++ b/global/v4.0/software/charts/osh/openstack-glance/rabbitmq.yaml @@ -66,7 +66,7 @@ data: wait: timeout: 900 labels: - release_group: glance-rabbitmq + release_group: airship-glance-rabbitmq install: no_hooks: false upgrade: @@ -75,11 +75,11 @@ data: delete: - type: job labels: - release_group: glance-rabbitmq + release_group: airship-glance-rabbitmq values: pod: replicas: - server: 1 + server: 1 labels: server: node_selector_key: openstack-control-plane diff --git a/global/v4.0/software/charts/osh/openstack-heat/heat.yaml b/global/v4.0/software/charts/osh/openstack-heat/heat.yaml index 81f9bd4cc..0f4f285d7 100644 --- a/global/v4.0/software/charts/osh/openstack-heat/heat.yaml +++ b/global/v4.0/software/charts/osh/openstack-heat/heat.yaml @@ -188,7 +188,7 @@ data: wait: timeout: 900 labels: - release_group: heat + release_group: airship-heat install: no_hooks: false upgrade: @@ -197,7 +197,7 @@ data: delete: - type: job labels: - release_group: heat + release_group: airship-heat post: create: [] values: diff --git a/global/v4.0/software/charts/osh/openstack-heat/rabbitmq.yaml b/global/v4.0/software/charts/osh/openstack-heat/rabbitmq.yaml index 6e01d9190..fe59eeb68 100644 --- a/global/v4.0/software/charts/osh/openstack-heat/rabbitmq.yaml +++ b/global/v4.0/software/charts/osh/openstack-heat/rabbitmq.yaml @@ -66,7 +66,7 @@ data: wait: timeout: 900 labels: - release_group: heat-rabbitmq + release_group: airship-heat-rabbitmq install: no_hooks: false upgrade: @@ -75,11 +75,11 @@ data: delete: - type: job labels: - release_group: heat-rabbitmq + release_group: airship-heat-rabbitmq values: pod: replicas: - server: 1 + server: 1 labels: server: node_selector_key: openstack-control-plane diff --git a/global/v4.0/software/charts/osh/openstack-horizon/horizon.yaml b/global/v4.0/software/charts/osh/openstack-horizon/horizon.yaml index de5f82759..3e4fcb28f 100644 --- a/global/v4.0/software/charts/osh/openstack-horizon/horizon.yaml +++ b/global/v4.0/software/charts/osh/openstack-horizon/horizon.yaml @@ -95,14 +95,14 @@ data: wait: timeout: 900 labels: - release_group: horizon + release_group: airship-horizon upgrade: no_hooks: false pre: delete: - type: job labels: - release_group: horizon + release_group: airship-horizon post: create: [] values: diff --git a/global/v4.0/software/charts/osh/openstack-ingress-controller/ingress.yaml b/global/v4.0/software/charts/osh/openstack-ingress-controller/ingress.yaml index f3710668e..f8fe4b1aa 100644 --- a/global/v4.0/software/charts/osh/openstack-ingress-controller/ingress.yaml +++ b/global/v4.0/software/charts/osh/openstack-ingress-controller/ingress.yaml @@ -29,7 +29,7 @@ data: wait: timeout: 900 labels: - release_group: openstack-ingress-controller + release_group: airship-openstack-ingress-controller install: no_hooks: false upgrade: @@ -38,7 +38,7 @@ data: delete: - type: job labels: - release_group: openstack-ingress-controller + release_group: airship-openstack-ingress-controller values: labels: server: diff --git a/global/v4.0/software/charts/osh/openstack-keystone/keystone.yaml b/global/v4.0/software/charts/osh/openstack-keystone/keystone.yaml index 4f0aeb39d..368da513b 100644 --- a/global/v4.0/software/charts/osh/openstack-keystone/keystone.yaml +++ b/global/v4.0/software/charts/osh/openstack-keystone/keystone.yaml @@ -137,7 +137,7 @@ data: wait: timeout: 900 labels: - release_group: keystone + release_group: airship-keystone install: no_hooks: false upgrade: @@ -146,7 +146,7 @@ data: delete: - type: job labels: - release_group: keystone + release_group: airship-keystone post: create: [] values: diff --git a/global/v4.0/software/charts/osh/openstack-keystone/rabbitmq.yaml b/global/v4.0/software/charts/osh/openstack-keystone/rabbitmq.yaml index ce0aa2361..54c4d9b88 100644 --- a/global/v4.0/software/charts/osh/openstack-keystone/rabbitmq.yaml +++ b/global/v4.0/software/charts/osh/openstack-keystone/rabbitmq.yaml @@ -66,7 +66,7 @@ data: wait: timeout: 900 labels: - release_group: keystone-rabbitmq + release_group: airship-keystone-rabbitmq install: no_hooks: false upgrade: @@ -75,11 +75,11 @@ data: delete: - type: job labels: - release_group: keystone-rabbitmq + release_group: airship-keystone-rabbitmq values: pod: replicas: - server: 1 + server: 1 labels: server: node_selector_key: openstack-control-plane diff --git a/global/v4.0/software/charts/osh/openstack-mariadb/mariadb.yaml b/global/v4.0/software/charts/osh/openstack-mariadb/mariadb.yaml index 1cffdd461..cae3239a4 100644 --- a/global/v4.0/software/charts/osh/openstack-mariadb/mariadb.yaml +++ b/global/v4.0/software/charts/osh/openstack-mariadb/mariadb.yaml @@ -54,7 +54,7 @@ data: wait: timeout: 900 labels: - release_group: openstack-mariadb + release_group: airship-openstack-mariadb install: no_hooks: false upgrade: @@ -63,7 +63,7 @@ data: delete: - type: job labels: - release_group: openstack-mariadb + release_group: airship-openstack-mariadb values: labels: server: diff --git a/global/v4.0/software/charts/osh/openstack-memcached/memcached.yaml b/global/v4.0/software/charts/osh/openstack-memcached/memcached.yaml index 9325c4eb2..5ce47ff04 100644 --- a/global/v4.0/software/charts/osh/openstack-memcached/memcached.yaml +++ b/global/v4.0/software/charts/osh/openstack-memcached/memcached.yaml @@ -37,7 +37,7 @@ data: wait: timeout: 900 labels: - release_group: openstack-memcached + release_group: airship-openstack-memcached install: no_hooks: false upgrade: @@ -46,7 +46,7 @@ data: delete: - type: job labels: - release_group: openstack-memcached + release_group: airship-openstack-memcached values: labels: server: diff --git a/global/v4.0/software/charts/osh/openstack-radosgw/radosgw.yaml b/global/v4.0/software/charts/osh/openstack-radosgw/radosgw.yaml index fdeb38ec6..0d031255d 100644 --- a/global/v4.0/software/charts/osh/openstack-radosgw/radosgw.yaml +++ b/global/v4.0/software/charts/osh/openstack-radosgw/radosgw.yaml @@ -99,7 +99,7 @@ data: wait: timeout: 900 labels: - release_group: radosgw + release_group: airship-radosgw install: no_hooks: false upgrade: @@ -108,7 +108,7 @@ data: delete: - type: job labels: - release_group: radosgw + release_group: airship-radosgw values: labels: job: diff --git a/global/v4.0/software/config/versions.yaml b/global/v4.0/software/config/versions.yaml index 98f487b12..03583eefe 100644 --- a/global/v4.0/software/config/versions.yaml +++ b/global/v4.0/software/config/versions.yaml @@ -163,7 +163,7 @@ data: type: git location: https://git.openstack.org/openstack/openstack-helm-infra subpath: prometheus-openstack-exporter - reference: c0c5199fb20335b3e8839163129372059a876ce8 + reference: 59d74756ef2fdd0279f59f199879cc985cfef47d nagios: type: git location: https://git.openstack.org/openstack/openstack-helm-infra @@ -174,77 +174,77 @@ data: type: git location: https://git.openstack.org/openstack/openstack-helm-infra subpath: helm-toolkit - reference: c0c5199fb20335b3e8839163129372059a876ce8 + reference: 5ae782ff52a2604fb1f392d77a018896f29dae49 barbican: type: git location: https://git.openstack.org/openstack/openstack-helm subpath: barbican - reference: fbfcb51c31e21331ceb20b6108b739c5e2ad48f5 + reference: 332a3da0054e154c003256107a0907774531df79 cinder: type: git location: https://git.openstack.org/openstack/openstack-helm subpath: cinder - reference: fbfcb51c31e21331ceb20b6108b739c5e2ad48f5 + reference: 332a3da0054e154c003256107a0907774531df79 glance: type: git location: https://git.openstack.org/openstack/openstack-helm subpath: glance - reference: fbfcb51c31e21331ceb20b6108b739c5e2ad48f5 + reference: 332a3da0054e154c003256107a0907774531df79 heat: type: git location: https://git.openstack.org/openstack/openstack-helm subpath: heat - reference: fbfcb51c31e21331ceb20b6108b739c5e2ad48f5 + reference: 332a3da0054e154c003256107a0907774531df79 horizon: type: git location: https://git.openstack.org/openstack/openstack-helm subpath: horizon - reference: fbfcb51c31e21331ceb20b6108b739c5e2ad48f5 + reference: 332a3da0054e154c003256107a0907774531df79 ingress: type: git - location: https://git.openstack.org/openstack/openstack-helm-infra + location: https://git.openstack.org/openstack/openstack-helm subpath: ingress - reference: c0c5199fb20335b3e8839163129372059a876ce8 + reference: 332a3da0054e154c003256107a0907774531df79 keystone: type: git location: https://git.openstack.org/openstack/openstack-helm subpath: keystone - reference: fbfcb51c31e21331ceb20b6108b739c5e2ad48f5 + reference: 332a3da0054e154c003256107a0907774531df79 libvirt: type: git location: https://git.openstack.org/openstack/openstack-helm subpath: libvirt - reference: fbfcb51c31e21331ceb20b6108b739c5e2ad48f5 + reference: 82d99e8f7a7c892555d97adc08b01b8e8cc1ff81 mariadb: type: git location: https://git.openstack.org/openstack/openstack-helm subpath: mariadb - reference: fbfcb51c31e21331ceb20b6108b739c5e2ad48f5 + reference: 332a3da0054e154c003256107a0907774531df79 memcached: type: git location: https://git.openstack.org/openstack/openstack-helm subpath: memcached - reference: fbfcb51c31e21331ceb20b6108b739c5e2ad48f5 + reference: 332a3da0054e154c003256107a0907774531df79 neutron: type: git location: https://git.openstack.org/openstack/openstack-helm subpath: neutron - reference: fbfcb51c31e21331ceb20b6108b739c5e2ad48f5 + reference: 332a3da0054e154c003256107a0907774531df79 nova: type: git location: https://git.openstack.org/openstack/openstack-helm subpath: nova - reference: fbfcb51c31e21331ceb20b6108b739c5e2ad48f5 + reference: 332a3da0054e154c003256107a0907774531df79 openvswitch: type: git location: https://git.openstack.org/openstack/openstack-helm subpath: openvswitch - reference: fbfcb51c31e21331ceb20b6108b739c5e2ad48f5 + reference: 20d863ce9d18203f2c6a1d679d0cec2bd4fa550d rabbitmq: type: git location: https://git.openstack.org/openstack/openstack-helm subpath: rabbitmq - reference: fbfcb51c31e21331ceb20b6108b739c5e2ad48f5 + reference: 332a3da0054e154c003256107a0907774531df79 ucp: armada: type: git diff --git a/site/airship-seaworthy/software/config/endpoints.yaml b/site/airship-seaworthy/software/config/endpoints.yaml index 09b678d2b..5f58d0609 100644 --- a/site/airship-seaworthy/software/config/endpoints.yaml +++ b/site/airship-seaworthy/software/config/endpoints.yaml @@ -333,7 +333,7 @@ data: default: /swift/v1 scheme: default: http - public: "https" + # public: "https" port: api: default: 8088 @@ -352,7 +352,7 @@ data: default: /auth/v1.0 scheme: default: "http" - public: "https" + # public: "https" port: api: default: 8088 @@ -388,357 +388,357 @@ metadata: abstract: false layer: site storagePolicy: cleartext - substitutions: - - src: - schema: pegleg/CommonAddresses/v1 - name: common-addresses - path: .dns.ingress_domain - dest: - path: .osh.object_store.host_fqdn_override.public.host - pattern: DOMAIN - - src: - schema: pegleg/CommonAddresses/v1 - name: common-addresses - path: .dns.ingress_domain - dest: - path: .osh.ceph_object_store.host_fqdn_override.public.host - pattern: DOMAIN - - src: - schema: deckhand/Certificate/v1 - name: ingress-crt - path: . - dest: - path: .osh.object_store.host_fqdn_override.public.tls.crt - - src: - schema: deckhand/CertificateAuthority/v1 - name: ingress-ca - path: . - dest: - path: .osh.object_store.host_fqdn_override.public.tls.ca - - src: - schema: deckhand/CertificateKey/v1 - name: ingress-key - path: . - dest: - path: .osh.object_store.host_fqdn_override.public.tls.key - - src: - schema: deckhand/Certificate/v1 - name: ingress-crt - path: . - dest: - path: .osh.ceph_object_store.host_fqdn_override.public.tls.crt - - src: - schema: deckhand/CertificateAuthority/v1 - name: ingress-ca - path: . - dest: - path: .osh.ceph_object_store.host_fqdn_override.public.tls.ca - - src: - schema: deckhand/CertificateKey/v1 - name: ingress-key - path: . - dest: - path: .osh.ceph_object_store.host_fqdn_override.public.tls.key - - src: - schema: pegleg/CommonAddresses/v1 - name: common-addresses - path: .dns.ingress_domain - dest: - path: .osh.image.host_fqdn_override.public.host - pattern: DOMAIN - - src: - schema: pegleg/CommonAddresses/v1 - name: common-addresses - path: .dns.ingress_domain - dest: - path: .osh.cloudformation.host_fqdn_override.public.host - pattern: DOMAIN - - src: - schema: pegleg/CommonAddresses/v1 - name: common-addresses - path: .dns.ingress_domain - dest: - path: .osh.orchestration.host_fqdn_override.public.host - pattern: DOMAIN - - src: - schema: pegleg/CommonAddresses/v1 - name: common-addresses - path: .dns.ingress_domain - dest: - path: .osh.compute.host_fqdn_override.public.host - pattern: DOMAIN - - src: - schema: pegleg/CommonAddresses/v1 - name: common-addresses - path: .dns.ingress_domain - dest: - path: .osh.compute_novnc_proxy.host_fqdn_override.public.host - pattern: DOMAIN - - src: - schema: pegleg/CommonAddresses/v1 - name: common-addresses - path: .dns.ingress_domain - dest: - path: .osh.placement.host_fqdn_override.public.host - pattern: DOMAIN - - src: - schema: pegleg/CommonAddresses/v1 - name: common-addresses - path: .dns.ingress_domain - dest: - path: .osh.network.host_fqdn_override.public.host - pattern: DOMAIN - - src: - schema: pegleg/CommonAddresses/v1 - name: common-addresses - path: .dns.ingress_domain - dest: - path: .osh.identity.host_fqdn_override.public.host - pattern: DOMAIN - - src: - schema: pegleg/CommonAddresses/v1 - name: common-addresses - path: .dns.ingress_domain - dest: - path: .osh.dashboard.host_fqdn_override.public.host - pattern: DOMAIN - - src: - schema: pegleg/CommonAddresses/v1 - name: common-addresses - path: .dns.ingress_domain - dest: - path: .osh.volume.host_fqdn_override.public.host - pattern: DOMAIN - - src: - schema: pegleg/CommonAddresses/v1 - name: common-addresses - path: .dns.ingress_domain - dest: - path: .osh.volumev2.host_fqdn_override.public.host - pattern: DOMAIN - - src: - schema: pegleg/CommonAddresses/v1 - name: common-addresses - path: .dns.ingress_domain - dest: - path: .osh.volumev3.host_fqdn_override.public.host - pattern: DOMAIN - - src: - schema: deckhand/Certificate/v1 - name: ingress-crt - path: . - dest: - path: .osh.identity.host_fqdn_override.public.tls.crt - - src: - schema: deckhand/CertificateAuthority/v1 - name: ingress-ca - path: . - dest: - path: .osh.identity.host_fqdn_override.public.tls.ca - - src: - schema: deckhand/CertificateKey/v1 - name: ingress-key - path: . - dest: - path: .osh.identity.host_fqdn_override.public.tls.key - - src: - schema: deckhand/Certificate/v1 - name: ingress-crt - path: . - dest: - path: .osh.orchestration.host_fqdn_override.public.tls.crt - - src: - schema: deckhand/CertificateAuthority/v1 - name: ingress-ca - path: . - dest: - path: .osh.orchestration.host_fqdn_override.public.tls.ca - - src: - schema: deckhand/CertificateKey/v1 - name: ingress-key - path: . - dest: - path: .osh.orchestration.host_fqdn_override.public.tls.key - - src: - schema: deckhand/Certificate/v1 - name: ingress-crt - path: . - dest: - path: .osh.cloudformation.host_fqdn_override.public.tls.crt - - src: - schema: deckhand/CertificateAuthority/v1 - name: ingress-ca - path: . - dest: - path: .osh.cloudformation.host_fqdn_override.public.tls.ca - - src: - schema: deckhand/CertificateKey/v1 - name: ingress-key - path: . - dest: - path: .osh.cloudformation.host_fqdn_override.public.tls.key - - src: - schema: deckhand/Certificate/v1 - name: ingress-crt - path: . - dest: - path: .osh.dashboard.host_fqdn_override.public.tls.crt - - src: - schema: deckhand/CertificateAuthority/v1 - name: ingress-ca - path: . - dest: - path: .osh.dashboard.host_fqdn_override.public.tls.ca - - src: - schema: deckhand/CertificateKey/v1 - name: ingress-key - path: . - dest: - path: .osh.dashboard.host_fqdn_override.public.tls.key - - src: - schema: deckhand/Certificate/v1 - name: ingress-crt - path: . - dest: - path: .osh.image.host_fqdn_override.public.tls.crt - - src: - schema: deckhand/CertificateAuthority/v1 - name: ingress-ca - path: . - dest: - path: .osh.image.host_fqdn_override.public.tls.ca - - src: - schema: deckhand/CertificateKey/v1 - name: ingress-key - path: . - dest: - path: .osh.image.host_fqdn_override.public.tls.key - - src: - schema: deckhand/Certificate/v1 - name: ingress-crt - path: . - dest: - path: .osh.volume.host_fqdn_override.public.tls.crt - - src: - schema: deckhand/CertificateAuthority/v1 - name: ingress-ca - path: . - dest: - path: .osh.volume.host_fqdn_override.public.tls.ca - - src: - schema: deckhand/CertificateKey/v1 - name: ingress-key - path: . - dest: - path: .osh.volume.host_fqdn_override.public.tls.key - - src: - schema: deckhand/Certificate/v1 - name: ingress-crt - path: . - dest: - path: .osh.volumev2.host_fqdn_override.public.tls.crt - - src: - schema: deckhand/CertificateAuthority/v1 - name: ingress-ca - path: . - dest: - path: .osh.volumev2.host_fqdn_override.public.tls.ca - - src: - schema: deckhand/CertificateKey/v1 - name: ingress-key - path: . - dest: - path: .osh.volumev2.host_fqdn_override.public.tls.key - - src: - schema: deckhand/Certificate/v1 - name: ingress-crt - path: . - dest: - path: .osh.volumev3.host_fqdn_override.public.tls.crt - - src: - schema: deckhand/CertificateAuthority/v1 - name: ingress-ca - path: . - dest: - path: .osh.volumev3.host_fqdn_override.public.tls.ca - - src: - schema: deckhand/CertificateKey/v1 - name: ingress-key - path: . - dest: - path: .osh.volumev3.host_fqdn_override.public.tls.key - - src: - schema: deckhand/Certificate/v1 - name: ingress-crt - path: . - dest: - path: .osh.compute.host_fqdn_override.public.tls.crt - - src: - schema: deckhand/CertificateAuthority/v1 - name: ingress-ca - path: . - dest: - path: .osh.compute.host_fqdn_override.public.tls.ca - - src: - schema: deckhand/CertificateKey/v1 - name: ingress-key - path: . - dest: - path: .osh.compute.host_fqdn_override.public.tls.key - - src: - schema: deckhand/Certificate/v1 - name: ingress-crt - path: . - dest: - path: .osh.compute_novnc_proxy.host_fqdn_override.public.tls.crt - - src: - schema: deckhand/CertificateAuthority/v1 - name: ingress-ca - path: . - dest: - path: .osh.compute_novnc_proxy.host_fqdn_override.public.tls.ca - - src: - schema: deckhand/CertificateKey/v1 - name: ingress-key - path: . - dest: - path: .osh.compute_novnc_proxy.host_fqdn_override.public.tls.key - - src: - schema: deckhand/Certificate/v1 - name: ingress-crt - path: . - dest: - path: .osh.placement.host_fqdn_override.public.tls.crt - - src: - schema: deckhand/CertificateAuthority/v1 - name: ingress-ca - path: . - dest: - path: .osh.placement.host_fqdn_override.public.tls.ca - - src: - schema: deckhand/CertificateKey/v1 - name: ingress-key - path: . - dest: - path: .osh.placement.host_fqdn_override.public.tls.key - - src: - schema: deckhand/Certificate/v1 - name: ingress-crt - path: . - dest: - path: .osh.network.host_fqdn_override.public.tls.crt - - src: - schema: deckhand/CertificateAuthority/v1 - name: ingress-ca - path: . - dest: - path: .osh.network.host_fqdn_override.public.tls.ca - - src: - schema: deckhand/CertificateKey/v1 - name: ingress-key - path: . - dest: - path: .osh.network.host_fqdn_override.public.tls.key + # substitutions: + # - src: + # schema: pegleg/CommonAddresses/v1 + # name: common-addresses + # path: .dns.ingress_domain + # dest: + # path: .osh.object_store.host_fqdn_override.public.host + # pattern: DOMAIN + # - src: + # schema: pegleg/CommonAddresses/v1 + # name: common-addresses + # path: .dns.ingress_domain + # dest: + # path: .osh.ceph_object_store.host_fqdn_override.public.host + # pattern: DOMAIN + # - src: + # schema: deckhand/Certificate/v1 + # name: ingress-crt + # path: . + # dest: + # path: .osh.object_store.host_fqdn_override.public.tls.crt + # - src: + # schema: deckhand/CertificateAuthority/v1 + # name: ingress-ca + # path: . + # dest: + # path: .osh.object_store.host_fqdn_override.public.tls.ca + # - src: + # schema: deckhand/CertificateKey/v1 + # name: ingress-key + # path: . + # dest: + # path: .osh.object_store.host_fqdn_override.public.tls.key + # - src: + # schema: deckhand/Certificate/v1 + # name: ingress-crt + # path: . + # dest: + # path: .osh.ceph_object_store.host_fqdn_override.public.tls.crt + # - src: + # schema: deckhand/CertificateAuthority/v1 + # name: ingress-ca + # path: . + # dest: + # path: .osh.ceph_object_store.host_fqdn_override.public.tls.ca + # - src: + # schema: deckhand/CertificateKey/v1 + # name: ingress-key + # path: . + # dest: + # path: .osh.ceph_object_store.host_fqdn_override.public.tls.key + # - src: + # schema: pegleg/CommonAddresses/v1 + # name: common-addresses + # path: .dns.ingress_domain + # dest: + # path: .osh.image.host_fqdn_override.public.host + # pattern: DOMAIN + # - src: + # schema: pegleg/CommonAddresses/v1 + # name: common-addresses + # path: .dns.ingress_domain + # dest: + # path: .osh.cloudformation.host_fqdn_override.public.host + # pattern: DOMAIN + # - src: + # schema: pegleg/CommonAddresses/v1 + # name: common-addresses + # path: .dns.ingress_domain + # dest: + # path: .osh.orchestration.host_fqdn_override.public.host + # pattern: DOMAIN + # - src: + # schema: pegleg/CommonAddresses/v1 + # name: common-addresses + # path: .dns.ingress_domain + # dest: + # path: .osh.compute.host_fqdn_override.public.host + # pattern: DOMAIN + # - src: + # schema: pegleg/CommonAddresses/v1 + # name: common-addresses + # path: .dns.ingress_domain + # dest: + # path: .osh.compute_novnc_proxy.host_fqdn_override.public.host + # pattern: DOMAIN + # - src: + # schema: pegleg/CommonAddresses/v1 + # name: common-addresses + # path: .dns.ingress_domain + # dest: + # path: .osh.placement.host_fqdn_override.public.host + # pattern: DOMAIN + # - src: + # schema: pegleg/CommonAddresses/v1 + # name: common-addresses + # path: .dns.ingress_domain + # dest: + # path: .osh.network.host_fqdn_override.public.host + # pattern: DOMAIN + # - src: + # schema: pegleg/CommonAddresses/v1 + # name: common-addresses + # path: .dns.ingress_domain + # dest: + # path: .osh.identity.host_fqdn_override.public.host + # pattern: DOMAIN + # - src: + # schema: pegleg/CommonAddresses/v1 + # name: common-addresses + # path: .dns.ingress_domain + # dest: + # path: .osh.dashboard.host_fqdn_override.public.host + # pattern: DOMAIN + # - src: + # schema: pegleg/CommonAddresses/v1 + # name: common-addresses + # path: .dns.ingress_domain + # dest: + # path: .osh.volume.host_fqdn_override.public.host + # pattern: DOMAIN + # - src: + # schema: pegleg/CommonAddresses/v1 + # name: common-addresses + # path: .dns.ingress_domain + # dest: + # path: .osh.volumev2.host_fqdn_override.public.host + # pattern: DOMAIN + # - src: + # schema: pegleg/CommonAddresses/v1 + # name: common-addresses + # path: .dns.ingress_domain + # dest: + # path: .osh.volumev3.host_fqdn_override.public.host + # pattern: DOMAIN + # - src: + # schema: deckhand/Certificate/v1 + # name: ingress-crt + # path: . + # dest: + # path: .osh.identity.host_fqdn_override.public.tls.crt + # - src: + # schema: deckhand/CertificateAuthority/v1 + # name: ingress-ca + # path: . + # dest: + # path: .osh.identity.host_fqdn_override.public.tls.ca + # - src: + # schema: deckhand/CertificateKey/v1 + # name: ingress-key + # path: . + # dest: + # path: .osh.identity.host_fqdn_override.public.tls.key + # - src: + # schema: deckhand/Certificate/v1 + # name: ingress-crt + # path: . + # dest: + # path: .osh.orchestration.host_fqdn_override.public.tls.crt + # - src: + # schema: deckhand/CertificateAuthority/v1 + # name: ingress-ca + # path: . + # dest: + # path: .osh.orchestration.host_fqdn_override.public.tls.ca + # - src: + # schema: deckhand/CertificateKey/v1 + # name: ingress-key + # path: . + # dest: + # path: .osh.orchestration.host_fqdn_override.public.tls.key + # - src: + # schema: deckhand/Certificate/v1 + # name: ingress-crt + # path: . + # dest: + # path: .osh.cloudformation.host_fqdn_override.public.tls.crt + # - src: + # schema: deckhand/CertificateAuthority/v1 + # name: ingress-ca + # path: . + # dest: + # path: .osh.cloudformation.host_fqdn_override.public.tls.ca + # - src: + # schema: deckhand/CertificateKey/v1 + # name: ingress-key + # path: . + # dest: + # path: .osh.cloudformation.host_fqdn_override.public.tls.key + # - src: + # schema: deckhand/Certificate/v1 + # name: ingress-crt + # path: . + # dest: + # path: .osh.dashboard.host_fqdn_override.public.tls.crt + # - src: + # schema: deckhand/CertificateAuthority/v1 + # name: ingress-ca + # path: . + # dest: + # path: .osh.dashboard.host_fqdn_override.public.tls.ca + # - src: + # schema: deckhand/CertificateKey/v1 + # name: ingress-key + # path: . + # dest: + # path: .osh.dashboard.host_fqdn_override.public.tls.key + # - src: + # schema: deckhand/Certificate/v1 + # name: ingress-crt + # path: . + # dest: + # path: .osh.image.host_fqdn_override.public.tls.crt + # - src: + # schema: deckhand/CertificateAuthority/v1 + # name: ingress-ca + # path: . + # dest: + # path: .osh.image.host_fqdn_override.public.tls.ca + # - src: + # schema: deckhand/CertificateKey/v1 + # name: ingress-key + # path: . + # dest: + # path: .osh.image.host_fqdn_override.public.tls.key + # - src: + # schema: deckhand/Certificate/v1 + # name: ingress-crt + # path: . + # dest: + # path: .osh.volume.host_fqdn_override.public.tls.crt + # - src: + # schema: deckhand/CertificateAuthority/v1 + # name: ingress-ca + # path: . + # dest: + # path: .osh.volume.host_fqdn_override.public.tls.ca + # - src: + # schema: deckhand/CertificateKey/v1 + # name: ingress-key + # path: . + # dest: + # path: .osh.volume.host_fqdn_override.public.tls.key + # - src: + # schema: deckhand/Certificate/v1 + # name: ingress-crt + # path: . + # dest: + # path: .osh.volumev2.host_fqdn_override.public.tls.crt + # - src: + # schema: deckhand/CertificateAuthority/v1 + # name: ingress-ca + # path: . + # dest: + # path: .osh.volumev2.host_fqdn_override.public.tls.ca + # - src: + # schema: deckhand/CertificateKey/v1 + # name: ingress-key + # path: . + # dest: + # path: .osh.volumev2.host_fqdn_override.public.tls.key + # - src: + # schema: deckhand/Certificate/v1 + # name: ingress-crt + # path: . + # dest: + # path: .osh.volumev3.host_fqdn_override.public.tls.crt + # - src: + # schema: deckhand/CertificateAuthority/v1 + # name: ingress-ca + # path: . + # dest: + # path: .osh.volumev3.host_fqdn_override.public.tls.ca + # - src: + # schema: deckhand/CertificateKey/v1 + # name: ingress-key + # path: . + # dest: + # path: .osh.volumev3.host_fqdn_override.public.tls.key + # - src: + # schema: deckhand/Certificate/v1 + # name: ingress-crt + # path: . + # dest: + # path: .osh.compute.host_fqdn_override.public.tls.crt + # - src: + # schema: deckhand/CertificateAuthority/v1 + # name: ingress-ca + # path: . + # dest: + # path: .osh.compute.host_fqdn_override.public.tls.ca + # - src: + # schema: deckhand/CertificateKey/v1 + # name: ingress-key + # path: . + # dest: + # path: .osh.compute.host_fqdn_override.public.tls.key + # - src: + # schema: deckhand/Certificate/v1 + # name: ingress-crt + # path: . + # dest: + # path: .osh.compute_novnc_proxy.host_fqdn_override.public.tls.crt + # - src: + # schema: deckhand/CertificateAuthority/v1 + # name: ingress-ca + # path: . + # dest: + # path: .osh.compute_novnc_proxy.host_fqdn_override.public.tls.ca + # - src: + # schema: deckhand/CertificateKey/v1 + # name: ingress-key + # path: . + # dest: + # path: .osh.compute_novnc_proxy.host_fqdn_override.public.tls.key + # - src: + # schema: deckhand/Certificate/v1 + # name: ingress-crt + # path: . + # dest: + # path: .osh.placement.host_fqdn_override.public.tls.crt + # - src: + # schema: deckhand/CertificateAuthority/v1 + # name: ingress-ca + # path: . + # dest: + # path: .osh.placement.host_fqdn_override.public.tls.ca + # - src: + # schema: deckhand/CertificateKey/v1 + # name: ingress-key + # path: . + # dest: + # path: .osh.placement.host_fqdn_override.public.tls.key + # - src: + # schema: deckhand/Certificate/v1 + # name: ingress-crt + # path: . + # dest: + # path: .osh.network.host_fqdn_override.public.tls.crt + # - src: + # schema: deckhand/CertificateAuthority/v1 + # name: ingress-ca + # path: . + # dest: + # path: .osh.network.host_fqdn_override.public.tls.ca + # - src: + # schema: deckhand/CertificateKey/v1 + # name: ingress-key + # path: . + # dest: + # path: .osh.network.host_fqdn_override.public.tls.key data: osh: object_store: @@ -749,17 +749,17 @@ data: public: radosgw host_fqdn_override: default: null - public: - host: object-store.DOMAIN + # public: + # host: object-store.DOMAIN path: default: /swift/v1/KEY_$(tenant_id)s scheme: default: http - public: "https" + # public: "https" port: api: default: 8088 - public: 443 + # public: 443 ceph_object_store: name: radosgw namespace: ceph @@ -768,17 +768,17 @@ data: public: radosgw host_fqdn_override: default: null - public: - host: object-store.DOMAIN + # public: + # host: object-store.DOMAIN path: default: /auth/v1.0 scheme: default: "http" - public: "https" + # public: "https" port: api: default: 8088 - public: 443 + # public: 443 oslo_db: hosts: default: mariadb @@ -835,19 +835,19 @@ data: public: keystone host_fqdn_override: default: null - public: - host: identity.DOMAIN + # public: + # host: identity.DOMAIN path: default: /v3 scheme: default: "http" - public: "https" + # public: "https" port: admin: default: 35357 api: default: 80 - public: 443 + # public: 443 glance_oslo_messaging: namespace: openstack hosts: @@ -881,17 +881,17 @@ data: public: glance host_fqdn_override: default: null - public: - host: image.DOMAIN + # public: + # host: image.DOMAIN path: default: null scheme: default: "http" - public: "https" + # public: "https" port: api: default: 9292 - public: 443 + # public: 443 image_registry: name: glance-registry hosts: @@ -940,17 +940,17 @@ data: public: cinder host_fqdn_override: default: null - public: - host: volume.DOMAIN + # public: + # host: volume.DOMAIN path: default: "/v1/%(tenant_id)s" scheme: default: "http" - public: "https" + # public: "https" port: api: default: 8776 - public: 443 + # public: 443 volumev2: name: cinderv2 hosts: @@ -958,17 +958,17 @@ data: public: cinder host_fqdn_override: default: null - public: - host: volume.DOMAIN + # public: + # host: volume.DOMAIN path: default: "/v2/%(tenant_id)s" scheme: default: "http" - public: "https" + # public: "https" port: api: default: 8776 - public: 443 + # public: 443 volumev3: name: cinderv3 hosts: @@ -976,17 +976,17 @@ data: public: cinder host_fqdn_override: default: null - public: - host: volume.DOMAIN + # public: + # host: volume.DOMAIN path: default: "/v3/%(tenant_id)s" scheme: default: "http" - public: "https" + # public: "https" port: api: default: 8776 - public: 443 + # public: 443 heat_oslo_messaging: namespace: openstack hosts: @@ -1020,17 +1020,17 @@ data: public: heat host_fqdn_override: default: null - public: - host: orchestration.DOMAIN + # public: + # host: orchestration.DOMAIN path: default: "/v1/%(project_id)s" scheme: default: "http" - public: "https" + # public: "https" port: api: default: 8004 - public: 443 + # public: 443 cloudformation: name: heat-cfn hosts: @@ -1038,17 +1038,17 @@ data: public: cloudformation host_fqdn_override: default: null - public: - host: cloudformation.DOMAIN + # public: + # host: cloudformation.DOMAIN path: default: /v1 scheme: default: "http" - public: "https" + # public: "https" port: api: default: 8000 - public: 443 + # public: 443 cloudwatch: name: heat-cloudwatch hosts: @@ -1098,17 +1098,17 @@ data: public: neutron host_fqdn_override: default: null - public: - host: network.DOMAIN + # public: + # host: network.DOMAIN path: default: null scheme: default: "http" - public: "https" + # public: "https" port: api: default: 9696 - public: 443 + # public: 443 nova_oslo_messaging: namespace: openstack hosts: @@ -1142,17 +1142,17 @@ data: public: nova host_fqdn_override: default: null - public: - host: compute.DOMAIN + # public: + # host: compute.DOMAIN path: default: "/v2/%(tenant_id)s" scheme: default: "http" - public: "https" + # public: "https" port: api: default: 8774 - public: 443 + # public: 443 novncproxy: default: 443 compute_metadata: @@ -1177,17 +1177,17 @@ data: public: novncproxy host_fqdn_override: default: null - public: - host: nova-novncproxy.DOMAIN + # public: + # host: nova-novncproxy.DOMAIN path: default: /vnc_auto.html scheme: default: "http" - public: "https" + # public: "https" port: novnc_proxy: default: 6080 - public: 443 + # public: 443 compute_spice_proxy: name: nova hosts: @@ -1208,17 +1208,17 @@ data: public: placement host_fqdn_override: default: null - public: - host: placement.DOMAIN + # public: + # host: placement.DOMAIN path: default: / scheme: default: "http" - public: "https" + # public: "https" port: api: default: 8778 - public: 443 + # public: 443 dashboard: name: horizon hosts: @@ -1226,17 +1226,17 @@ data: public: horizon host_fqdn_override: default: null - public: - host: dashboard.DOMAIN + # public: + # host: dashboard.DOMAIN path: default: null scheme: default: "http" - public: "https" + # public: "https" port: web: default: 80 - public: 443 + # public: 443 ... --- schema: pegleg/EndpointCatalogue/v1 @@ -1247,97 +1247,97 @@ metadata: abstract: false layer: site storagePolicy: cleartext - substitutions: - - src: - schema: pegleg/CommonAddresses/v1 - name: common-addresses - path: .dns.ingress_domain - dest: - path: .osh_infra.kibana.host_fqdn_override.public.host - pattern: DOMAIN - - src: - schema: pegleg/CommonAddresses/v1 - name: common-addresses - path: .dns.ingress_domain - dest: - path: .osh_infra.grafana.host_fqdn_override.public.host - pattern: DOMAIN - - src: - schema: pegleg/CommonAddresses/v1 - name: common-addresses - path: .dns.ingress_domain - dest: - path: .osh_infra.nagios.host_fqdn_override.public.host - pattern: DOMAIN - - src: - schema: deckhand/Certificate/v1 - name: ingress-crt - path: . - dest: - path: .osh_infra.kibana.host_fqdn_override.public.tls.crt - - src: - schema: deckhand/CertificateAuthority/v1 - name: ingress-ca - path: . - dest: - path: .osh_infra.kibana.host_fqdn_override.public.tls.ca - - src: - schema: deckhand/CertificateKey/v1 - name: ingress-key - path: . - dest: - path: .osh_infra.kibana.host_fqdn_override.public.tls.key - - src: - schema: deckhand/Certificate/v1 - name: ingress-crt - path: . - dest: - path: .osh_infra.grafana.host_fqdn_override.public.tls.crt - - src: - schema: deckhand/CertificateAuthority/v1 - name: ingress-ca - path: . - dest: - path: .osh_infra.grafana.host_fqdn_override.public.tls.ca - - src: - schema: deckhand/CertificateKey/v1 - name: ingress-key - path: . - dest: - path: .osh_infra.grafana.host_fqdn_override.public.tls.key - - src: - schema: deckhand/Certificate/v1 - name: ingress-crt - path: . - dest: - path: .osh_infra.nagios.host_fqdn_override.public.tls.crt - - src: - schema: deckhand/CertificateAuthority/v1 - name: ingress-ca - path: . - dest: - path: .osh_infra.nagios.host_fqdn_override.public.tls.ca - - src: - schema: deckhand/CertificateKey/v1 - name: ingress-key - path: . - dest: - path: .osh_infra.nagios.host_fqdn_override.public.tls.key - path: .osh_infra.nagios.host_fqdn_override.public.tls.key - - src: - schema: pegleg/CommonAddresses/v1 - name: common-addresses - path: .ldap.base_url - dest: - path: .osh_infra.ldap.host_fqdn_override.public.host - pattern: DOMAIN - - src: - schema: pegleg/CommonAddresses/v1 - name: common-addresses - path: .ldap.auth_path - dest: - path: .osh_infra.ldap.path.default - pattern: AUTH_PATH + # substitutions: + # - src: + # schema: pegleg/CommonAddresses/v1 + # name: common-addresses + # path: .dns.ingress_domain + # dest: + # path: .osh_infra.kibana.host_fqdn_override.public.host + # pattern: DOMAIN + # - src: + # schema: pegleg/CommonAddresses/v1 + # name: common-addresses + # path: .dns.ingress_domain + # dest: + # path: .osh_infra.grafana.host_fqdn_override.public.host + # pattern: DOMAIN + # - src: + # schema: pegleg/CommonAddresses/v1 + # name: common-addresses + # path: .dns.ingress_domain + # dest: + # path: .osh_infra.nagios.host_fqdn_override.public.host + # pattern: DOMAIN + # - src: + # schema: deckhand/Certificate/v1 + # name: ingress-crt + # path: . + # dest: + # path: .osh_infra.kibana.host_fqdn_override.public.tls.crt + # - src: + # schema: deckhand/CertificateAuthority/v1 + # name: ingress-ca + # path: . + # dest: + # path: .osh_infra.kibana.host_fqdn_override.public.tls.ca + # - src: + # schema: deckhand/CertificateKey/v1 + # name: ingress-key + # path: . + # dest: + # path: .osh_infra.kibana.host_fqdn_override.public.tls.key + # - src: + # schema: deckhand/Certificate/v1 + # name: ingress-crt + # path: . + # dest: + # path: .osh_infra.grafana.host_fqdn_override.public.tls.crt + # - src: + # schema: deckhand/CertificateAuthority/v1 + # name: ingress-ca + # path: . + # dest: + # path: .osh_infra.grafana.host_fqdn_override.public.tls.ca + # - src: + # schema: deckhand/CertificateKey/v1 + # name: ingress-key + # path: . + # dest: + # path: .osh_infra.grafana.host_fqdn_override.public.tls.key + # - src: + # schema: deckhand/Certificate/v1 + # name: ingress-crt + # path: . + # dest: + # path: .osh_infra.nagios.host_fqdn_override.public.tls.crt + # - src: + # schema: deckhand/CertificateAuthority/v1 + # name: ingress-ca + # path: . + # dest: + # path: .osh_infra.nagios.host_fqdn_override.public.tls.ca + # - src: + # schema: deckhand/CertificateKey/v1 + # name: ingress-key + # path: . + # dest: + # path: .osh_infra.nagios.host_fqdn_override.public.tls.key + # path: .osh_infra.nagios.host_fqdn_override.public.tls.key + # - src: + # schema: pegleg/CommonAddresses/v1 + # name: common-addresses + # path: .ldap.base_url + # dest: + # path: .osh_infra.ldap.host_fqdn_override.public.host + # pattern: DOMAIN + # - src: + # schema: pegleg/CommonAddresses/v1 + # name: common-addresses + # path: .ldap.auth_path + # dest: + # path: .osh_infra.ldap.path.default + # pattern: AUTH_PATH data: osh_infra: elasticsearch: @@ -1418,17 +1418,17 @@ data: public: grafana host_fqdn_override: default: null - public: - host: grafana.DOMAIN + # public: + # host: grafana.DOMAIN path: default: null scheme: default: "http" - public: "https" + # public: "https" port: grafana: default: 3000 - public: 443 + # public: 443 monitoring: name: prometheus namespace: osh-infra @@ -1453,17 +1453,17 @@ data: public: kibana host_fqdn_override: default: null - public: - host: kibana.DOMAIN + # public: + # host: kibana.DOMAIN path: default: null scheme: default: "http" - public: "https" + # public: "https" port: kibana: default: 5601 - public: 443 + # public: 443 alerts: name: alertmanager namespace: osh-infra @@ -1542,17 +1542,17 @@ data: public: nagios host_fqdn_override: default: null - public: - host: nagios.DOMAIN + # public: + # host: nagios.DOMAIN path: default: null scheme: default: http - public: https + # public: https port: http: default: 80 - public: 443 + # public: 443 ldap: hosts: default: ldap diff --git a/site/airship-seaworthy/software/manifests/full-site.yaml b/site/airship-seaworthy/software/manifests/full-site.yaml index 4bcb124f0..593dfc106 100644 --- a/site/airship-seaworthy/software/manifests/full-site.yaml +++ b/site/airship-seaworthy/software/manifests/full-site.yaml @@ -35,22 +35,22 @@ data: - ucp-drydock - ucp-promenade - ucp-shipyard - # - osh-infra-ingress-controller - # - osh-infra-ceph-config - # - osh-infra-logging - # - osh-infra-monitoring - # - osh-infra-mariadb - # - osh-infra-dashboards - # - openstack-ingress-controller - # - openstack-ceph-config - # - openstack-mariadb - # - openstack-memcached - # - openstack-keystone - # - openstack-radosgw - # - openstack-glance - # - openstack-cinder - # - openstack-compute-kit - # - openstack-heat - # - osh-infra-prometheus-openstack-exporter - # - openstack-horizon + - osh-infra-ingress-controller + - osh-infra-ceph-config + - osh-infra-logging + - osh-infra-monitoring + - osh-infra-mariadb + - osh-infra-dashboards + - openstack-ingress-controller + - openstack-ceph-config + - openstack-mariadb + - openstack-memcached + - openstack-keystone + - openstack-radosgw + - openstack-glance + - openstack-cinder + - openstack-compute-kit + - openstack-heat + - osh-infra-prometheus-openstack-exporter + - openstack-horizon ...