diff --git a/bundle.yaml b/bundle.yaml index 81060e5..e3d07a8 100644 --- a/bundle.yaml +++ b/bundle.yaml @@ -43,13 +43,6 @@ api-bindings: &api-bindings "": metal public: provider - admin: metal - internal: metal - shared-db: metal - amqp: metal - certificates: metal - cluster: metal - ha: metal # ----- Bindings for backend / internal-only charms (all metal) --------------- # Used for ceph-mon (Ceph public network IS metal, not OpenStack public), @@ -94,10 +87,7 @@ channel: 1.8/stable num_units: 1 # 3 on Roosevelt (D-009) to: [lxd:11] - options: - vip: 10.12.4.236 - os-public-hostname: vault.omega.dc0.vr0.cloud.neumatrix.local - bindings: *api-bindings + bindings: *internal-bindings constraints: arch=amd64 vault-mysql-router: @@ -477,7 +467,7 @@ octavia-hacluster: { charm: hacluster, channel: 2.4/stable } barbican-hacluster: { charm: hacluster, channel: 2.4/stable } magnum-hacluster: { charm: hacluster, channel: 2.4/stable } - vault-hacluster: { charm: hacluster, channel: 2.4/stable } + # vault-hacluster: { charm: hacluster, channel: 2.4/stable } # v2-deferred: ceph-radosgw-hacluster: { charm: hacluster, channel: 2.4/stable } # v2-deferred (D-019): designate-hacluster: { charm: hacluster, channel: 2.4/stable } @@ -489,7 +479,7 @@ - [vault-mysql-router:db-router, mysql-innodb-cluster:db-router] - [vault:shared-db, vault-mysql-router:shared-db] - [mysql-innodb-cluster:certificates, vault:certificates] - - [vault:ha, vault-hacluster:ha] + # - [vault:ha, vault-hacluster:ha] # ---- Keystone (identity, hub of all OS service relations) - [keystone-mysql-router:db-router, mysql-innodb-cluster:db-router]