updated templates and scripts for Airship 1.3

[yaml_builds.git] / site_type / sriov-a13 / templates / software / config / service_accounts.j2

diff --git a/site_type/sriov/airship-treasuremap/site/airship-seaworthy/software/config/service_accounts.yaml b/site_type/sriov-a13/templates/software/config/service_accounts.j2
similarity index 91%
rename from site_type/sriov/airship-treasuremap/site/airship-seaworthy/software/config/service_accounts.yaml
rename to site_type/sriov-a13/templates/software/config/service_accounts.j2
index 7920729..751f1b1 100644 (file)
--- a/site_type/sriov/airship-treasuremap/site/airship-seaworthy/software/config/service_accounts.yaml
+++ b/site_type/sriov-a13/templates/software/config/service_accounts.j2
@@ -15,6 +15,10 @@ data:
         postgres:
             admin:
                 username: postgres
+            replica:
+                username: standby
+            exporter:
+                username: psql_exporter
         oslo_db:
             admin:
                 username: root
@@ -75,7 +79,10 @@ data:
                 username: airflow
                 database: airflow
             oslo_messaging:
-                username: rabbitmq
+                admin:
+                    username: rabbitmq
+                user:
+                    username: airflow
         maas:
             admin:
                 username: admin
@@ -108,7 +115,6 @@ data:
                 # NEWSITE-CHANGEME: Replace with the site name
                 region_name: RegionOne
                 role: admin
-                user_domain_name: default
                 username: armada
         deckhand:
             keystone:
@@ -122,6 +128,14 @@ data:
             postgres:
                 username: deckhand
                 database: deckhand
+        prometheus_openstack_exporter:
+            user:
+                region_name: RegionOne
+                role: admin
+                username: prometheus-openstack-exporter
+                project_name: service
+                user_domain_name: default
+                project_domain_name: default
     ceph:
         swift:
             keystone:
@@ -209,12 +223,6 @@ metadata:
         path: .osh.region_name
       dest:
         path: .osh.barbican.barbican.region_name
-    - src:
-        schema: pegleg/CommonSoftwareConfig/v1
-        name: common-software-config
-        path: .osh.region_name
-      dest:
-        path: .osh.barbican.barbican.region_name
 data:
   osh:
     keystone:
@@ -227,8 +235,6 @@ data:
         username: keystone
         database: keystone
       oslo_messaging:
-        admin:
-          username: keystone-rabbitmq-admin
         keystone:
           username: keystone-rabbitmq-user
       ldap:
@@ -247,8 +253,6 @@ data:
         username: cinder
         database: cinder
       oslo_messaging:
-        admin:
-          username: cinder-rabbitmq-admin
         cinder:
           username: cinder-rabbitmq-user
     glance:
@@ -262,8 +266,6 @@ data:
         username: glance
         database: glance
       oslo_messaging:
-        admin:
-          username: glance-rabbitmq-admin
         glance:
           username: glance-rabbitmq-user
       ceph_object_store:
@@ -289,8 +291,6 @@ data:
         username: heat
         database: heat
       oslo_messaging:
-        admin:
-          username: heat-rabbitmq-admin
         heat:
           username: heat-rabbitmq-user
     swift:
@@ -303,6 +303,9 @@ data:
     oslo_db:
       admin:
         username: root
+    prometheus_mysql_exporter:
+      user:
+        username: osh-oslodb-exporter
     neutron:
       neutron:
         role: admin
@@ -314,8 +317,6 @@ data:
         username: neutron
         database: neutron
       oslo_messaging:
-        admin:
-          username: neutron-rabbitmq-admin
         neutron:
           username: neutron-rabbitmq-user
     nova:
@@ -341,8 +342,6 @@ data:
         username: nova
         database: "nova_cell0"
       oslo_messaging:
-        admin:
-          username: nova-rabbitmq-admin
         nova:
           username: nova-rabbitmq-user
     horizon:
@@ -360,10 +359,18 @@ data:
         username: barbican
         database: barbican
       oslo_messaging:
-        admin:
-          username: barbican-rabbitmq-admin
         barbican:
           username: barbican-rabbitmq-user
+    oslo_messaging:
+      admin:
+        username: admin
+    tempest:
+      tempest:
+        role: admin
+        username: tempest
+        project_name: service
+        user_domain_name: default
+        project_domain_name: default
 ...
 ---
 schema: pegleg/AccountCatalogue/v1
@@ -383,6 +390,11 @@ metadata:
         path: .osh_infra.prometheus_openstack_exporter.user.region_name
 data:
   osh_infra:
+    ceph_object_store:
+      admin:
+        username: s3_admin
+      elasticsearch:
+        username: elasticsearch
     grafana:
       admin:
         username: grafana
@@ -395,12 +407,12 @@ data:
     elasticsearch:
       admin:
         username: elasticsearch
-    kibana:
-      admin:
-        username: kibana
     oslo_db:
       admin:
         username: root
+    prometheus_mysql_exporter:
+      user:
+        username: osh-infra-oslodb-exporter
     prometheus_openstack_exporter:
       user:
         role: admin
@@ -411,6 +423,9 @@ data:
     nagios:
       admin:
         username: nagios
+    prometheus:
+      admin:
+        username: prometheus
     ldap:
       admin:
         # NEWSITE-CHANGEME: Replace with the site's LDAP account used to