Browse Source

Fix airskiff endpoint catalog

This cleans up the Airskiff endpoints by basing them off of the
sloop version.

Change-Id: I9207315a03469e59b205d74097ac83e56d1a9772
tags/v1.1
Matt McEuen 3 months ago
parent
commit
376e3882f9

+ 48
- 280
site/airskiff/software/config/endpoints.yaml View File

@@ -10,72 +10,21 @@ metadata:
10 10
     abstract: false
11 11
     layer: site
12 12
   storagePolicy: cleartext
13
-  substitutions:
14
-    - src:
15
-        schema: pegleg/CommonAddresses/v1
16
-        name: common-addresses
17
-        path: .dns.ingress_domain
18
-      dest:
19
-        - path: .ucp.identity.host_fqdn_override.public.host
20
-          pattern: DOMAIN
21
-        - path: .ucp.identity.host_fqdn_override.admin.host
22
-          pattern: DOMAIN
23
-        - path: .ceph.object_store.host_fqdn_override.public.host
24
-          pattern: DOMAIN
25
-        - path: .ceph.ceph_object_store.host_fqdn_override.public.host
26
-          pattern: DOMAIN
27
-    - src:
28
-        schema: deckhand/Certificate/v1
29
-        name: ingress-crt
30
-        path: .
31
-      dest:
32
-        - path: .ucp.identity.host_fqdn_override.public.tls.crt
33
-        - path: .ucp.shipyard.host_fqdn_override.public.tls.crt
34
-        - path: .ucp.physicalprovisioner.host_fqdn_override.public.tls.crt
35
-        - path: .ceph.object_store.host_fqdn_override.public.tls.crt
36
-        - path: .ceph.ceph_object_store.host_fqdn_override.public.tls.crt
37
-    - src:
38
-        schema: deckhand/CertificateAuthority/v1
39
-        name: ingress-ca
40
-        path: .
41
-      dest:
42
-        - path: .ucp.identity.host_fqdn_override.public.tls.ca
43
-        - path: .ucp.shipyard.host_fqdn_override.public.tls.ca
44
-        - path: .ucp.physicalprovisioner.host_fqdn_override.public.tls.ca
45
-        - path: .ceph.object_store.host_fqdn_override.public.tls.ca
46
-        - path: .ceph.ceph_object_store.host_fqdn_override.public.tls.ca
47
-    - src:
48
-        schema: deckhand/CertificateKey/v1
49
-        name: ingress-key
50
-        path: .
51
-      dest:
52
-        - path: .ucp.identity.host_fqdn_override.public.tls.key
53
-        - path: .ucp.shipyard.host_fqdn_override.public.tls.key
54
-        - path: .ucp.physicalprovisioner.host_fqdn_override.public.tls.key
55
-        - path: .ceph.object_store.host_fqdn_override.public.tls.key
56
-        - path: .ceph.ceph_object_store.host_fqdn_override.public.tls.key
57 13
 data:
58 14
   ucp:
59 15
     identity:
60 16
       namespace: ucp
61 17
       name: keystone
62
-      hosts:
63
-        default: keystone
64
-        internal: keystone-api
65 18
       host_fqdn_override:
66 19
         default: null
67
-        public:
68
-          host: keystone-api.DOMAIN
69
-        admin:
70
-          host: keystone-api.DOMAIN
71 20
       path:
72 21
         default: /v3
73 22
       scheme:
74
-        default: http
75
-        internal: http
23
+        default: "http"
24
+        internal: "http"
76 25
       port:
77 26
         api:
78
-          default: 5000
27
+          default: 80
79 28
           internal: 5000
80 29
     armada:
81 30
       name: armada
@@ -191,25 +140,24 @@ data:
191 140
       name: drydock
192 141
       hosts:
193 142
         default: drydock-api
143
+        public: drydock-api
194 144
       port:
195 145
         api:
196 146
           default: 9000
197 147
           nodeport: 31900
198
-          public: 443
148
+          public: 80
199 149
       path:
200 150
         default: /api/v1.0
201 151
       scheme:
202 152
         default: "http"
203
-        public: "https"
153
+        public: "http"
204 154
       host_fqdn_override:
205 155
         default: null
206
-        public:
207
-          host: drydock-sw.DOMAIN
208 156
     maas_region:
209 157
       name: maas-region
210 158
       hosts:
211 159
         default: maas-region
212
-        public: maas
160
+        public: maas-region
213 161
       path:
214 162
         default: /MAAS
215 163
       scheme:
@@ -224,8 +172,6 @@ data:
224 172
           default: 8000
225 173
       host_fqdn_override:
226 174
         default: null
227
-        public:
228
-          host: maas-sw.DOMAIN
229 175
     maas_ingress:
230 176
       hosts:
231 177
         default: maas-ingress
@@ -267,10 +213,12 @@ data:
267 213
       port:
268 214
         api:
269 215
           default: 9000
216
+          public: 80
270 217
       path:
271 218
         default: /api/v1.0
272 219
       scheme:
273 220
         default: "http"
221
+        public: "http"
274 222
       host_fqdn_override:
275 223
         default: null
276 224
     prometheus_openstack_exporter:
@@ -295,17 +243,15 @@ data:
295 243
         public: radosgw
296 244
       host_fqdn_override:
297 245
         default: null
298
-        public:
299
-          host: object-store-sw.DOMAIN
300 246
       path:
301 247
         default: /swift/v1
302 248
       scheme:
303 249
         default: "http"
304
-        public: "https"
250
+        public: "http"
305 251
       port:
306 252
         api:
307 253
           default: 8088
308
-          public: 443
254
+          public: 80
309 255
     ceph_object_store:
310 256
       name: radosgw
311 257
       namespace: ceph
@@ -314,17 +260,15 @@ data:
314 260
         public: radosgw
315 261
       host_fqdn_override:
316 262
         default: null
317
-        public:
318
-          host: object-store-sw.DOMAIN
319 263
       path:
320 264
         default: /auth/v1.0
321 265
       scheme:
322 266
         default: "http"
323
-        public: "https"
267
+        public: "http"
324 268
       port:
325 269
         api:
326 270
           default: 8088
327
-          public: 443
271
+          public: 80
328 272
     ceph_mon:
329 273
       namespace: ceph
330 274
       hosts:
@@ -379,99 +323,6 @@ metadata:
379 323
     abstract: false
380 324
     layer: site
381 325
   storagePolicy: cleartext
382
-  substitutions:
383
-    - src:
384
-        schema: pegleg/CommonAddresses/v1
385
-        name: common-addresses
386
-        path: .dns.ingress_domain
387
-      dest:
388
-        - path: .osh.object_store.host_fqdn_override.public.host
389
-          pattern: DOMAIN
390
-        - path: .osh.ceph_object_store.host_fqdn_override.public.host
391
-          pattern: DOMAIN
392
-        - path: .osh.image.host_fqdn_override.public.host
393
-          pattern: DOMAIN
394
-        - path: .osh.cloudformation.host_fqdn_override.public.host
395
-          pattern: DOMAIN
396
-        - path: .osh.orchestration.host_fqdn_override.public.host
397
-          pattern: DOMAIN
398
-        - path: .osh.compute.host_fqdn_override.public.host
399
-          pattern: DOMAIN
400
-        - path: .osh.compute_novnc_proxy.host_fqdn_override.public.host
401
-          pattern: DOMAIN
402
-        - path: .osh.placement.host_fqdn_override.public.host
403
-          pattern: DOMAIN
404
-        - path: .osh.network.host_fqdn_override.public.host
405
-          pattern: DOMAIN
406
-        - path: .osh.identity.host_fqdn_override.public.host
407
-          pattern: DOMAIN
408
-        - path: .osh.identity.host_fqdn_override.admin.host
409
-          pattern: DOMAIN
410
-        - path: .osh.dashboard.host_fqdn_override.public.host
411
-          pattern: DOMAIN
412
-        - path: .osh.volume.host_fqdn_override.public.host
413
-          pattern: DOMAIN
414
-        - path: .osh.volumev2.host_fqdn_override.public.host
415
-          pattern: DOMAIN
416
-        - path: .osh.volumev3.host_fqdn_override.public.host
417
-          pattern: DOMAIN
418
-    - src:
419
-        schema: deckhand/Certificate/v1
420
-        name: ingress-crt
421
-        path: .
422
-      dest:
423
-        - path: .osh.object_store.host_fqdn_override.public.tls.crt
424
-        - path: .osh.ceph_object_store.host_fqdn_override.public.tls.crt
425
-        - path: .osh.identity.host_fqdn_override.public.tls.crt
426
-        - path: .osh.orchestration.host_fqdn_override.public.tls.crt
427
-        - path: .osh.cloudformation.host_fqdn_override.public.tls.crt
428
-        - path: .osh.dashboard.host_fqdn_override.public.tls.crt
429
-        - path: .osh.image.host_fqdn_override.public.tls.crt
430
-        - path: .osh.volume.host_fqdn_override.public.tls.crt
431
-        - path: .osh.volumev2.host_fqdn_override.public.tls.crt
432
-        - path: .osh.volumev3.host_fqdn_override.public.tls.crt
433
-        - path: .osh.compute.host_fqdn_override.public.tls.crt
434
-        - path: .osh.compute_novnc_proxy.host_fqdn_override.public.tls.crt
435
-        - path: .osh.placement.host_fqdn_override.public.tls.crt
436
-        - path: .osh.network.host_fqdn_override.public.tls.crt
437
-    - src:
438
-        schema: deckhand/CertificateAuthority/v1
439
-        name: ingress-ca
440
-        path: .
441
-      dest:
442
-        - path: .osh.object_store.host_fqdn_override.public.tls.ca
443
-        - path: .osh.ceph_object_store.host_fqdn_override.public.tls.ca
444
-        - path: .osh.identity.host_fqdn_override.public.tls.ca
445
-        - path: .osh.orchestration.host_fqdn_override.public.tls.ca
446
-        - path: .osh.cloudformation.host_fqdn_override.public.tls.ca
447
-        - path: .osh.dashboard.host_fqdn_override.public.tls.ca
448
-        - path: .osh.image.host_fqdn_override.public.tls.ca
449
-        - path: .osh.volume.host_fqdn_override.public.tls.ca
450
-        - path: .osh.volumev2.host_fqdn_override.public.tls.ca
451
-        - path: .osh.volumev3.host_fqdn_override.public.tls.ca
452
-        - path: .osh.compute.host_fqdn_override.public.tls.ca
453
-        - path: .osh.compute_novnc_proxy.host_fqdn_override.public.tls.ca
454
-        - path: .osh.placement.host_fqdn_override.public.tls.ca
455
-        - path: .osh.network.host_fqdn_override.public.tls.ca
456
-    - src:
457
-        schema: deckhand/CertificateKey/v1
458
-        name: ingress-key
459
-        path: .
460
-      dest:
461
-        - path: .osh.object_store.host_fqdn_override.public.tls.key
462
-        - path: .osh.ceph_object_store.host_fqdn_override.public.tls.key
463
-        - path: .osh.identity.host_fqdn_override.public.tls.key
464
-        - path: .osh.orchestration.host_fqdn_override.public.tls.key
465
-        - path: .osh.cloudformation.host_fqdn_override.public.tls.key
466
-        - path: .osh.dashboard.host_fqdn_override.public.tls.key
467
-        - path: .osh.image.host_fqdn_override.public.tls.key
468
-        - path: .osh.volume.host_fqdn_override.public.tls.key
469
-        - path: .osh.volumev2.host_fqdn_override.public.tls.key
470
-        - path: .osh.volumev3.host_fqdn_override.public.tls.key
471
-        - path: .osh.compute.host_fqdn_override.public.tls.key
472
-        - path: .osh.compute_novnc_proxy.host_fqdn_override.public.tls.key
473
-        - path: .osh.placement.host_fqdn_override.public.tls.key
474
-        - path: .osh.network.host_fqdn_override.public.tls.key
475 326
 data:
476 327
   osh:
477 328
     object_store:
@@ -482,17 +333,15 @@ data:
482 333
         public: radosgw
483 334
       host_fqdn_override:
484 335
         default: null
485
-        public:
486
-          host: object-store-sw.DOMAIN
487 336
       path:
488 337
         default: /swift/v1/KEY_$(tenant_id)s
489 338
       scheme:
490 339
         default: "http"
491
-        public: "https"
340
+        public: "http"
492 341
       port:
493 342
         api:
494 343
           default: 8088
495
-          public: 443
344
+          public: 80
496 345
     ceph_object_store:
497 346
       name: radosgw
498 347
       namespace: openstack
@@ -501,17 +350,15 @@ data:
501 350
         public: radosgw
502 351
       host_fqdn_override:
503 352
         default: null
504
-        public:
505
-          host: object-store-sw.DOMAIN
506 353
       path:
507 354
         default: /auth/v1.0
508 355
       scheme:
509 356
         default: "http"
510
-        public: "https"
357
+        public: "http"
511 358
       port:
512 359
         api:
513 360
           default: 8088
514
-          public: 443
361
+          public: 80
515 362
     oslo_db:
516 363
       hosts:
517 364
         default: mariadb
@@ -576,23 +423,16 @@ data:
576 423
     identity:
577 424
       namespace: openstack
578 425
       name: keystone
579
-      hosts:
580
-        default: keystone
581
-        internal: keystone-api
582 426
       host_fqdn_override:
583 427
         default: null
584
-        public:
585
-          host: identity.DOMAIN
586
-        admin:
587
-          host: identity.DOMAIN
588 428
       path:
589 429
         default: /v3
590 430
       scheme:
591
-        default: "https"
431
+        default: "http"
592 432
         internal: "http"
593 433
       port:
594 434
         api:
595
-          default: 443
435
+          default: 80
596 436
           internal: 5000
597 437
     glance_oslo_messaging:
598 438
       namespace: openstack
@@ -627,17 +467,15 @@ data:
627 467
         public: glance
628 468
       host_fqdn_override:
629 469
         default: null
630
-        public:
631
-          host: image.DOMAIN
632 470
       path:
633 471
         default: null
634 472
       scheme:
635 473
         default: "http"
636
-        public: "https"
474
+        public: "http"
637 475
       port:
638 476
         api:
639 477
           default: 9292
640
-          public: 443
478
+          public: 80
641 479
     image_registry:
642 480
       name: glance-registry
643 481
       hosts:
@@ -686,17 +524,15 @@ data:
686 524
         public: cinder
687 525
       host_fqdn_override:
688 526
         default: null
689
-        public:
690
-          host: volume-sw.DOMAIN
691 527
       path:
692 528
         default: "/v1/%(tenant_id)s"
693 529
       scheme:
694 530
         default: "http"
695
-        public: "https"
531
+        public: "http"
696 532
       port:
697 533
         api:
698 534
           default: 8776
699
-          public: 443
535
+          public: 80
700 536
     volumev2:
701 537
       name: cinderv2
702 538
       hosts:
@@ -704,17 +540,15 @@ data:
704 540
         public: cinder
705 541
       host_fqdn_override:
706 542
         default: null
707
-        public:
708
-          host: volume-sw.DOMAIN
709 543
       path:
710 544
         default: "/v2/%(tenant_id)s"
711 545
       scheme:
712 546
         default: "http"
713
-        public: "https"
547
+        public: "http"
714 548
       port:
715 549
         api:
716 550
           default: 8776
717
-          public: 443
551
+          public: 80
718 552
     volumev3:
719 553
       name: cinderv3
720 554
       hosts:
@@ -722,17 +556,15 @@ data:
722 556
         public: cinder
723 557
       host_fqdn_override:
724 558
         default: null
725
-        public:
726
-          host: volume-sw.DOMAIN
727 559
       path:
728 560
         default: "/v3/%(tenant_id)s"
729 561
       scheme:
730 562
         default: "http"
731
-        public: "https"
563
+        public: "http"
732 564
       port:
733 565
         api:
734 566
           default: 8776
735
-          public: 443
567
+          public: 80
736 568
     heat_oslo_messaging:
737 569
       namespace: openstack
738 570
       hosts:
@@ -766,17 +598,15 @@ data:
766 598
         public: heat
767 599
       host_fqdn_override:
768 600
         default: null
769
-        public:
770
-          host: orchestration.DOMAIN
771 601
       path:
772 602
         default: "/v1/%(project_id)s"
773 603
       scheme:
774 604
         default: "http"
775
-        public: "https"
605
+        public: "http"
776 606
       port:
777 607
         api:
778 608
           default: 8004
779
-          public: 443
609
+          public: 80
780 610
     cloudformation:
781 611
       name: heat-cfn
782 612
       hosts:
@@ -784,17 +614,15 @@ data:
784 614
         public: cloudformation
785 615
       host_fqdn_override:
786 616
         default: null
787
-        public:
788
-          host: cloudformation.DOMAIN
789 617
       path:
790 618
         default: /v1
791 619
       scheme:
792 620
         default: "http"
793
-        public: "https"
621
+        public: "http"
794 622
       port:
795 623
         api:
796 624
           default: 8000
797
-          public: 443
625
+          public: 80
798 626
     cloudwatch:
799 627
       name: heat-cloudwatch
800 628
       hosts:
@@ -844,17 +672,15 @@ data:
844 672
         public: neutron
845 673
       host_fqdn_override:
846 674
         default: null
847
-        public:
848
-          host: network.DOMAIN
849 675
       path:
850 676
         default: null
851 677
       scheme:
852 678
         default: "http"
853
-        public: "https"
679
+        public: "http"
854 680
       port:
855 681
         api:
856 682
           default: 9696
857
-          public: 443
683
+          public: 80
858 684
     nova_oslo_messaging:
859 685
       namespace: openstack
860 686
       hosts:
@@ -888,19 +714,17 @@ data:
888 714
         public: nova
889 715
       host_fqdn_override:
890 716
         default: null
891
-        public:
892
-          host: compute.DOMAIN
893 717
       path:
894 718
         default: "/v2/%(tenant_id)s"
895 719
       scheme:
896 720
         default: "http"
897
-        public: "https"
721
+        public: "http"
898 722
       port:
899 723
         api:
900 724
           default: 8774
901
-          public: 443
725
+          public: 80
902 726
         novncproxy:
903
-          default: 443
727
+          default: 80
904 728
     compute_metadata:
905 729
       name: nova
906 730
       hosts:
@@ -923,17 +747,15 @@ data:
923 747
         public: novncproxy
924 748
       host_fqdn_override:
925 749
         default: null
926
-        public:
927
-          host: nova-novncproxy.DOMAIN
928 750
       path:
929 751
         default: /vnc_auto.html
930 752
       scheme:
931 753
         default: "http"
932
-        public: "https"
754
+        public: "http"
933 755
       port:
934 756
         novnc_proxy:
935 757
           default: 6080
936
-          public: 443
758
+          public: 80
937 759
     compute_spice_proxy:
938 760
       name: nova
939 761
       hosts:
@@ -954,17 +776,15 @@ data:
954 776
         public: placement
955 777
       host_fqdn_override:
956 778
         default: null
957
-        public:
958
-          host: placement.DOMAIN
959 779
       path:
960 780
         default: /
961 781
       scheme:
962 782
         default: "http"
963
-        public: "https"
783
+        public: "http"
964 784
       port:
965 785
         api:
966 786
           default: 8778
967
-          public: 443
787
+          public: 80
968 788
     dashboard:
969 789
       name: horizon
970 790
       hosts:
@@ -972,17 +792,15 @@ data:
972 792
         public: horizon
973 793
       host_fqdn_override:
974 794
         default: null
975
-        public:
976
-          host: dashboard-sw.DOMAIN
977 795
       path:
978 796
         default: null
979 797
       scheme:
980 798
         default: "http"
981
-        public: "https"
799
+        public: "http"
982 800
       port:
983 801
         web:
984 802
           default: 80
985
-          public: 443
803
+          public: 80
986 804
 ...
987 805
 ---
988 806
 schema: pegleg/EndpointCatalogue/v1
@@ -994,48 +812,6 @@ metadata:
994 812
     layer: site
995 813
   storagePolicy: cleartext
996 814
   substitutions:
997
-    - src:
998
-        schema: pegleg/CommonAddresses/v1
999
-        name: common-addresses
1000
-        path: .dns.ingress_domain
1001
-      dest:
1002
-        - path: .osh_infra.kibana.host_fqdn_override.public.host
1003
-          pattern: DOMAIN
1004
-        - path: .osh_infra.grafana.host_fqdn_override.public.host
1005
-          pattern: DOMAIN
1006
-        - path: .osh_infra.nagios.host_fqdn_override.public.host
1007
-          pattern: DOMAIN
1008
-    - src:
1009
-        schema: deckhand/Certificate/v1
1010
-        name: ingress-crt
1011
-        path: .
1012
-      dest:
1013
-        - path: .osh_infra.kibana.host_fqdn_override.public.tls.crt
1014
-        - path: .osh_infra.grafana.host_fqdn_override.public.tls.crt
1015
-        - path: .osh_infra.nagios.host_fqdn_override.public.tls.crt
1016
-    - src:
1017
-        schema: deckhand/CertificateAuthority/v1
1018
-        name: ingress-ca
1019
-        path: .
1020
-      dest:
1021
-        - path: .osh_infra.kibana.host_fqdn_override.public.tls.ca
1022
-        - path: .osh_infra.grafana.host_fqdn_override.public.tls.ca
1023
-        - path: .osh_infra.nagios.host_fqdn_override.public.tls.ca
1024
-    - src:
1025
-        schema: deckhand/CertificateKey/v1
1026
-        name: ingress-key
1027
-        path: .
1028
-      dest:
1029
-        - path: .osh_infra.kibana.host_fqdn_override.public.tls.key
1030
-        - path: .osh_infra.grafana.host_fqdn_override.public.tls.key
1031
-        - path: .osh_infra.nagios.host_fqdn_override.public.tls.key
1032
-    - src:
1033
-        schema: pegleg/CommonAddresses/v1
1034
-        name: common-addresses
1035
-        path: .ldap.base_url
1036
-      dest:
1037
-        path: .osh_infra.ldap.host_fqdn_override.public.host
1038
-        pattern: DOMAIN
1039 815
     - src:
1040 816
         schema: pegleg/CommonAddresses/v1
1041 817
         name: common-addresses
@@ -1149,17 +925,15 @@ data:
1149 925
         public: grafana
1150 926
       host_fqdn_override:
1151 927
         default: null
1152
-        public:
1153
-          host: grafana-sw.DOMAIN
1154 928
       path:
1155 929
         default: null
1156 930
       scheme:
1157 931
         default: "http"
1158
-        public: "https"
932
+        public: "http"
1159 933
       port:
1160 934
         grafana:
1161 935
           default: 3000
1162
-          public: 443
936
+          public: 80
1163 937
     monitoring:
1164 938
       name: prometheus
1165 939
       namespace: osh-infra
@@ -1185,17 +959,15 @@ data:
1185 959
         public: kibana
1186 960
       host_fqdn_override:
1187 961
         default: null
1188
-        public:
1189
-          host: kibana-sw.DOMAIN
1190 962
       path:
1191 963
         default: null
1192 964
       scheme:
1193 965
         default: "http"
1194
-        public: "https"
966
+        public: "http"
1195 967
       port:
1196 968
         kibana:
1197 969
           default: 5601
1198
-          public: 443
970
+          public: 80
1199 971
     alerts:
1200 972
       name: alertmanager
1201 973
       namespace: osh-infra
@@ -1287,24 +1059,20 @@ data:
1287 1059
         public: nagios
1288 1060
       host_fqdn_override:
1289 1061
         default: null
1290
-        public:
1291
-          host: nagios-sw.DOMAIN
1292 1062
       path:
1293 1063
         default: null
1294 1064
       scheme:
1295 1065
         default: "http"
1296
-        public: "https"
1066
+        public: "http"
1297 1067
       port:
1298 1068
         http:
1299 1069
           default: 80
1300
-          public: 443
1070
+          public: 80
1301 1071
     ldap:
1302 1072
       hosts:
1303 1073
         default: ldap
1304 1074
       host_fqdn_override:
1305 1075
         default: null
1306
-        public:
1307
-          host: DOMAIN
1308 1076
       path:
1309 1077
         default: /AUTH_PATH
1310 1078
       scheme:

+ 1
- 1
tools/deployment/airskiff/developer/020-setup-client.sh View File

@@ -44,5 +44,5 @@ clouds:
44 44
       project_name: 'admin'
45 45
       project_domain_name: 'default'
46 46
       user_domain_name: 'default'
47
-      auth_url: 'http://keystone.openstack.svc.cluster.local/v3'
47
+      auth_url: 'http://keystone-api.openstack.svc.cluster.local:5000/v3'
48 48
 EOF

Loading…
Cancel
Save