From 2c6077ddb798b502511a697bb2f7c5cbf7beac09 Mon Sep 17 00:00:00 2001 From: dmburmistrov Date: Thu, 18 Feb 2016 18:00:24 +0300 Subject: [PATCH] Add aodh parameters to hiera Change-Id: I2bdd7066a808b31e1ad9cc7f5c13ee85c12c2df3 Blueprint: fuel-aodh-integration --- hiera/neut_gre.generate_vms.yaml | 9 +++++++++ ...vlan.ceph.ceil-compute.overridden_ssl.yaml | 9 +++++++++ ...eil-primary-controller.overridden_ssl.yaml | 18 ++++++++++++++++++ ...neut_vlan.ceph.compute-ephemeral-ceph.yaml | 8 ++++++++ ...t_vlan.ceph.controller-ephemeral-ceph.yaml | 8 ++++++++ ...neut_vlan.cinder-block-device.compute.yaml | 9 +++++++++ hiera/neut_vlan.compute.nossl.yaml | 9 +++++++++ hiera/neut_vlan.compute.ssl.overridden.yaml | 9 +++++++++ hiera/neut_vlan.compute.ssl.yaml | 9 +++++++++ hiera/neut_vlan.ironic.conductor.yaml | 6 ++++++ hiera/neut_vlan.ironic.controller.yaml | 6 ++++++ hiera/neut_vlan_l3ha.ceph.ceil-ceph-osd.yaml | 9 +++++++++ hiera/neut_vlan_l3ha.ceph.ceil-compute.yaml | 9 +++++++++ .../neut_vlan_l3ha.ceph.ceil-controller.yaml | 19 +++++++++++++++++++ ...lan_l3ha.ceph.ceil-primary-controller.yaml | 19 +++++++++++++++++++ ...eut_vlan_l3ha.ceph.ceil-primary-mongo.yaml | 9 +++++++++ hiera/neut_vxlan_dvr.sahara-cinder.yaml | 9 +++++++++ hiera/neut_vxlan_dvr.sahara-compute.yaml | 9 +++++++++ hiera/neut_vxlan_dvr.sahara-controller.yaml | 9 +++++++++ ...ara-primary-controller.overridden_ssl.yaml | 9 +++++++++ ...t_vxlan_dvr.sahara-primary-controller.yaml | 9 +++++++++ 21 files changed, 210 insertions(+) diff --git a/hiera/neut_gre.generate_vms.yaml b/hiera/neut_gre.generate_vms.yaml index 0b25f8c..596500f 100644 --- a/hiera/neut_gre.generate_vms.yaml +++ b/hiera/neut_gre.generate_vms.yaml @@ -23,6 +23,9 @@ ceilometer: enabled: false metering_secret: 7aqxzabx user_password: FQUfTQ6a +aodh: + user_password: Be0Oloop + db_password: Thu5ieY6 cinder: db_password: 71kNkN9U fixed_key: 0ded0202e2a355df942df2bacbaba992658a0345f68f2db6e1bdb6dbb8f682cf @@ -128,6 +131,7 @@ network_metadata: sahara/api: 192.168.0.1 heat/api: 192.168.0.1 ceilometer/api: 192.168.0.1 + aodh/api: 192.168.0.1 ex: ceph/public: 192.168.0.1 ceph/radosgw: @@ -168,6 +172,7 @@ network_metadata: sahara/api: 192.168.0.2 heat/api: 192.168.0.2 ceilometer/api: 192.168.0.2 + aodh/api: 192.168.0.2 ex: 172.16.0.2 ceph/public: 192.168.0.2 ceph/radosgw: 172.16.0.2 @@ -209,6 +214,7 @@ network_metadata: sahara/api: 192.168.0.3 heat/api: 192.168.0.3 ceilometer/api: 192.168.0.3 + aodh/api: 192.168.0.3 ex: 172.16.0.3 ceph/public: 192.168.0.3 ceph/radosgw: 172.16.0.3 @@ -249,6 +255,7 @@ network_metadata: sahara/api: 192.168.0.4 heat/api: 192.168.0.4 ceilometer/api: 192.168.0.4 + aodh/api: 192.168.0.4 ex: 172.16.0.4 ceph/public: 192.168.0.4 ceph/radosgw: 172.16.0.4 @@ -289,6 +296,7 @@ network_metadata: sahara/api: 192.168.0.4 heat/api: 192.168.0.4 ceilometer/api: 192.168.0.4 + aodh/api: 192.168.0.4 ex: ceph/public: 192.168.0.4 ceph/radosgw: @@ -416,6 +424,7 @@ network_scheme: mgmt/database: br-mgmt sahara/api: br-mgmt ceilometer/api: br-mgmt + aodh/api: br-mgmt mgmt/vip: br-mgmt ceph/public: br-mgmt mgmt/messaging: br-mgmt diff --git a/hiera/neut_vlan.ceph.ceil-compute.overridden_ssl.yaml b/hiera/neut_vlan.ceph.ceil-compute.overridden_ssl.yaml index eb12b55..87ebe90 100644 --- a/hiera/neut_vlan.ceph.ceil-compute.overridden_ssl.yaml +++ b/hiera/neut_vlan.ceph.ceil-compute.overridden_ssl.yaml @@ -16,6 +16,9 @@ ceilometer: enabled: true metering_secret: tHq2rcoq user_password: WBfBSo6U +aodh: + user_password: Be0Oloop + db_password: Thu5ieY6 cinder: db_password: trj609V8 fixed_key: 7883d66c643ce9a508ebcd4cd5516fc98814a11276bc98c4e8e671188b54e941 @@ -282,6 +285,7 @@ network_metadata: sahara/api: 192.168.0.1 heat/api: 192.168.0.1 ceilometer/api: 192.168.0.1 + aodh/api: 192.168.0.1 ex: ceph/public: 192.168.0.1 ceph/radosgw: @@ -322,6 +326,7 @@ network_metadata: sahara/api: 192.168.0.2 heat/api: 192.168.0.2 ceilometer/api: 192.168.0.2 + aodh/api: 192.168.0.2 ex: ceph/public: 192.168.0.2 ceph/radosgw: @@ -362,6 +367,7 @@ network_metadata: sahara/api: 192.168.0.3 heat/api: 192.168.0.3 ceilometer/api: 192.168.0.3 + aodh/api: 192.168.0.3 ex: 172.16.0.2 ceph/public: 192.168.0.3 ceph/radosgw: 172.16.0.2 @@ -402,6 +408,7 @@ network_metadata: sahara/api: 192.168.0.4 heat/api: 192.168.0.4 ceilometer/api: 192.168.0.4 + aodh/api: 192.168.0.4 ex: ceph/public: 192.168.0.4 ceph/radosgw: @@ -442,6 +449,7 @@ network_metadata: sahara/api: 192.168.0.5 heat/api: 192.168.0.5 ceilometer/api: 192.168.0.5 + aodh/api: 192.168.0.5 ex: ceph/public: 192.168.0.5 ceph/radosgw: @@ -567,6 +575,7 @@ network_scheme: mgmt/database: br-mgmt sahara/api: br-mgmt ceilometer/api: br-mgmt + aodh/api: br-mgmt mgmt/vip: br-mgmt ceph/public: br-mgmt mgmt/messaging: br-mgmt diff --git a/hiera/neut_vlan.ceph.ceil-primary-controller.overridden_ssl.yaml b/hiera/neut_vlan.ceph.ceil-primary-controller.overridden_ssl.yaml index e41e3e0..adb8fb0 100644 --- a/hiera/neut_vlan.ceph.ceil-primary-controller.overridden_ssl.yaml +++ b/hiera/neut_vlan.ceph.ceil-primary-controller.overridden_ssl.yaml @@ -16,6 +16,9 @@ ceilometer: enabled: true metering_secret: tHq2rcoq user_password: WBfBSo6U +aodh: + user_password: Be0Oloop + db_password: Thu5ieY6 cinder: db_password: trj609V8 fixed_key: 7883d66c643ce9a508ebcd4cd5516fc98814a11276bc98c4e8e671188b54e941 @@ -281,6 +284,7 @@ network_metadata: sahara/api: 192.168.0.1 heat/api: 192.168.0.1 ceilometer/api: 192.168.0.1 + aodh/api: 192.168.0.1 ex: ceph/public: 192.168.0.1 ceph/radosgw: @@ -321,6 +325,7 @@ network_metadata: sahara/api: 192.168.0.2 heat/api: 192.168.0.2 ceilometer/api: 192.168.0.2 + aodh/api: 192.168.0.2 ex: ceph/public: 192.168.0.2 ceph/radosgw: @@ -361,6 +366,7 @@ network_metadata: sahara/api: 192.168.0.3 heat/api: 192.168.0.3 ceilometer/api: 192.168.0.3 + aodh/api: 192.168.0.3 ex: 172.16.0.2 ceph/public: 192.168.0.3 ceph/radosgw: 172.16.0.2 @@ -401,6 +407,7 @@ network_metadata: sahara/api: 192.168.0.4 heat/api: 192.168.0.4 ceilometer/api: 192.168.0.4 + aodh/api: 192.168.0.4 ex: ceph/public: 192.168.0.4 ceph/radosgw: @@ -441,6 +448,7 @@ network_metadata: sahara/api: 192.168.0.5 heat/api: 192.168.0.5 ceilometer/api: 192.168.0.5 + aodh/api: 192.168.0.5 ex: ceph/public: 192.168.0.5 ceph/radosgw: @@ -574,6 +582,7 @@ network_scheme: mgmt/database: br-mgmt sahara/api: br-mgmt ceilometer/api: br-mgmt + aodh/api: br-mgmt mgmt/vip: br-mgmt ceph/public: br-mgmt mgmt/messaging: br-mgmt @@ -980,6 +989,15 @@ tasks: type: puppet uids: - '125' +- parameters: + cwd: / + puppet_manifest: /etc/puppet/modules/osnailyfacter/modular/aodh/aodh.pp + puppet_modules: /etc/puppet/modules + timeout: 3600 + priority: 1800 + type: puppet + uids: + - '125' - parameters: cwd: / puppet_manifest: /etc/puppet/modules/osnailyfacter/modular/ceilometer/controller.pp diff --git a/hiera/neut_vlan.ceph.compute-ephemeral-ceph.yaml b/hiera/neut_vlan.ceph.compute-ephemeral-ceph.yaml index 758a0e9..1fabd74 100644 --- a/hiera/neut_vlan.ceph.compute-ephemeral-ceph.yaml +++ b/hiera/neut_vlan.ceph.compute-ephemeral-ceph.yaml @@ -137,6 +137,9 @@ ceilometer: user_password: 5fXkIlEW metering_secret: k3mrQHsh enabled: false +aodh: + user_password: Be0Oloop + db_password: Thu5ieY6 cobbler: profile: ubuntu_1404_x86_64 mongo: @@ -382,6 +385,7 @@ network_metadata: mgmt/database: 10.122.12.5 sahara/api: 10.122.12.5 ceilometer/api: 10.122.12.5 + aodh/api: 10.122.12.5 ceph/public: 10.122.12.5 mgmt/messaging: 10.122.12.5 management: 10.122.12.5 @@ -419,6 +423,7 @@ network_metadata: sahara/api: 10.122.12.3 heat/api: 10.122.12.3 ceilometer/api: 10.122.12.3 + aodh/api: 10.122.12.3 ex: 10.122.11.4 ceph/public: 10.122.12.3 mgmt/messaging: 10.122.12.3 @@ -458,6 +463,7 @@ network_metadata: mgmt/database: 10.122.12.4 sahara/api: 10.122.12.4 ceilometer/api: 10.122.12.4 + aodh/api: 10.122.12.4 ceph/public: 10.122.12.4 mgmt/messaging: 10.122.12.4 management: 10.122.12.4 @@ -494,6 +500,7 @@ network_metadata: mgmt/database: 10.122.12.6 sahara/api: 10.122.12.6 ceilometer/api: 10.122.12.6 + aodh/api: 10.122.12.6 ceph/public: 10.122.12.6 mgmt/messaging: 10.122.12.6 management: 10.122.12.6 @@ -582,6 +589,7 @@ network_scheme: mgmt/database: br-mgmt sahara/api: br-mgmt ceilometer/api: br-mgmt + aodh/api: br-mgmt ceph/public: br-mgmt mgmt/messaging: br-mgmt management: br-mgmt diff --git a/hiera/neut_vlan.ceph.controller-ephemeral-ceph.yaml b/hiera/neut_vlan.ceph.controller-ephemeral-ceph.yaml index 292501b..346fcbc 100644 --- a/hiera/neut_vlan.ceph.controller-ephemeral-ceph.yaml +++ b/hiera/neut_vlan.ceph.controller-ephemeral-ceph.yaml @@ -568,6 +568,9 @@ ceilometer: user_password: 5fXkIlEW metering_secret: k3mrQHsh enabled: false +aodh: + user_password: Be0Oloop + db_password: Thu5ieY6 cobbler: profile: ubuntu_1404_x86_64 mongo: @@ -813,6 +816,7 @@ network_metadata: mgmt/database: 10.122.12.5 sahara/api: 10.122.12.5 ceilometer/api: 10.122.12.5 + aodh/api: 10.122.12.5 ceph/public: 10.122.12.5 mgmt/messaging: 10.122.12.5 management: 10.122.12.5 @@ -850,6 +854,7 @@ network_metadata: sahara/api: 10.122.12.3 heat/api: 10.122.12.3 ceilometer/api: 10.122.12.3 + aodh/api: 10.122.12.3 ex: 10.122.11.4 ceph/public: 10.122.12.3 mgmt/messaging: 10.122.12.3 @@ -889,6 +894,7 @@ network_metadata: mgmt/database: 10.122.12.4 sahara/api: 10.122.12.4 ceilometer/api: 10.122.12.4 + aodh/api: 10.122.12.4 ceph/public: 10.122.12.4 mgmt/messaging: 10.122.12.4 management: 10.122.12.4 @@ -925,6 +931,7 @@ network_metadata: mgmt/database: 10.122.12.6 sahara/api: 10.122.12.6 ceilometer/api: 10.122.12.6 + aodh/api: 10.122.12.6 ceph/public: 10.122.12.6 mgmt/messaging: 10.122.12.6 management: 10.122.12.6 @@ -1026,6 +1033,7 @@ network_scheme: mgmt/database: br-mgmt sahara/api: br-mgmt ceilometer/api: br-mgmt + aodh/api: br-mgmt ex: br-ex ceph/public: br-mgmt mgmt/messaging: br-mgmt diff --git a/hiera/neut_vlan.cinder-block-device.compute.yaml b/hiera/neut_vlan.cinder-block-device.compute.yaml index cac33b0..5b0f08f 100644 --- a/hiera/neut_vlan.cinder-block-device.compute.yaml +++ b/hiera/neut_vlan.cinder-block-device.compute.yaml @@ -175,6 +175,9 @@ ceilometer: user_password: cS5zJ0og7qA7zT5hqOEedSDk metering_secret: xM5KbQJtxZd9NwFinAHTzYdQ enabled: false +aodh: + user_password: Be0Oloop + db_password: Thu5ieY6 corosync: group: 226.94.1.1 verified: false @@ -275,6 +278,7 @@ network_metadata: mgmt/database: 192.168.0.4 sahara/api: 192.168.0.4 ceilometer/api: 192.168.0.4 + aodh/api: 192.168.0.4 ceph/public: 192.168.0.4 mgmt/messaging: 192.168.0.4 management: 192.168.0.4 @@ -313,6 +317,7 @@ network_metadata: mgmt/database: 192.168.0.3 sahara/api: 192.168.0.3 ceilometer/api: 192.168.0.3 + aodh/api: 192.168.0.3 ex: 172.18.79.164 ceph/public: 192.168.0.3 mgmt/messaging: 192.168.0.3 @@ -353,6 +358,7 @@ network_metadata: mgmt/database: 192.168.0.5 sahara/api: 192.168.0.5 ceilometer/api: 192.168.0.5 + aodh/api: 192.168.0.5 ceph/public: 192.168.0.5 mgmt/messaging: 192.168.0.5 management: 192.168.0.5 @@ -391,6 +397,7 @@ network_metadata: mgmt/database: 192.168.0.6 sahara/api: 192.168.0.6 ceilometer/api: 192.168.0.6 + aodh/api: 192.168.0.6 ex: 172.18.79.163 ceph/public: 192.168.0.6 mgmt/messaging: 192.168.0.6 @@ -431,6 +438,7 @@ network_metadata: mgmt/database: 192.168.0.7 sahara/api: 192.168.0.7 ceilometer/api: 192.168.0.7 + aodh/api: 192.168.0.7 ceph/public: 192.168.0.7 mgmt/messaging: 192.168.0.7 management: 192.168.0.7 @@ -516,6 +524,7 @@ network_scheme: mgmt/database: br-mgmt sahara/api: br-mgmt ceilometer/api: br-mgmt + aodh/api: br-mgmt ceph/public: br-mgmt mgmt/messaging: br-mgmt management: br-mgmt diff --git a/hiera/neut_vlan.compute.nossl.yaml b/hiera/neut_vlan.compute.nossl.yaml index 3855e94..4142fab 100644 --- a/hiera/neut_vlan.compute.nossl.yaml +++ b/hiera/neut_vlan.compute.nossl.yaml @@ -137,6 +137,9 @@ ceilometer: user_password: ycMeNdmo metering_secret: zjAKZxtd enabled: false +aodh: + user_password: Be0Oloop + db_password: Thu5ieY6 cobbler: profile: ubuntu_1404_x86_64 mongo: @@ -384,6 +387,7 @@ network_metadata: mgmt/database: 10.122.7.3 sahara/api: 10.122.7.3 ceilometer/api: 10.122.7.3 + aodh/api: 10.122.7.3 ceph/public: 10.122.7.3 mgmt/messaging: 10.122.7.3 management: 10.122.7.3 @@ -420,6 +424,7 @@ network_metadata: mgmt/database: 10.122.7.2 sahara/api: 10.122.7.2 ceilometer/api: 10.122.7.2 + aodh/api: 10.122.7.2 ceph/public: 10.122.7.2 mgmt/messaging: 10.122.7.2 management: 10.122.7.2 @@ -457,6 +462,7 @@ network_metadata: sahara/api: 10.122.7.1 heat/api: 10.122.7.1 ceilometer/api: 10.122.7.1 + aodh/api: 10.122.7.1 ex: 10.122.6.2 ceph/public: 10.122.7.1 mgmt/messaging: 10.122.7.1 @@ -497,6 +503,7 @@ network_metadata: sahara/api: 10.122.7.5 heat/api: 10.122.7.5 ceilometer/api: 10.122.7.5 + aodh/api: 10.122.7.5 ex: 10.122.6.3 ceph/public: 10.122.7.5 mgmt/messaging: 10.122.7.5 @@ -537,6 +544,7 @@ network_metadata: sahara/api: 10.122.7.4 heat/api: 10.122.7.4 ceilometer/api: 10.122.7.4 + aodh/api: 10.122.7.4 ex: 10.122.6.4 ceph/public: 10.122.7.4 mgmt/messaging: 10.122.7.4 @@ -627,6 +635,7 @@ network_scheme: mgmt/database: br-mgmt sahara/api: br-mgmt ceilometer/api: br-mgmt + aodh/api: br-mgmt ceph/public: br-mgmt mgmt/messaging: br-mgmt management: br-mgmt diff --git a/hiera/neut_vlan.compute.ssl.overridden.yaml b/hiera/neut_vlan.compute.ssl.overridden.yaml index 7459576..1e357f1 100644 --- a/hiera/neut_vlan.compute.ssl.overridden.yaml +++ b/hiera/neut_vlan.compute.ssl.overridden.yaml @@ -137,6 +137,9 @@ ceilometer: user_password: ycMeNdmo metering_secret: zjAKZxtd enabled: false +aodh: + user_password: Be0Oloop + db_password: Thu5ieY6 cobbler: profile: ubuntu_1404_x86_64 mongo: @@ -382,6 +385,7 @@ network_metadata: mgmt/database: 10.122.7.3 sahara/api: 10.122.7.3 ceilometer/api: 10.122.7.3 + aodh/api: 10.122.7.3 ceph/public: 10.122.7.3 mgmt/messaging: 10.122.7.3 management: 10.122.7.3 @@ -418,6 +422,7 @@ network_metadata: mgmt/database: 10.122.7.2 sahara/api: 10.122.7.2 ceilometer/api: 10.122.7.2 + aodh/api: 10.122.7.2 ceph/public: 10.122.7.2 mgmt/messaging: 10.122.7.2 management: 10.122.7.2 @@ -455,6 +460,7 @@ network_metadata: sahara/api: 10.122.7.1 heat/api: 10.122.7.1 ceilometer/api: 10.122.7.1 + aodh/api: 10.122.7.1 ex: 10.122.6.2 ceph/public: 10.122.7.1 mgmt/messaging: 10.122.7.1 @@ -495,6 +501,7 @@ network_metadata: sahara/api: 10.122.7.5 heat/api: 10.122.7.5 ceilometer/api: 10.122.7.5 + aodh/api: 10.122.7.5 ex: 10.122.6.3 ceph/public: 10.122.7.5 mgmt/messaging: 10.122.7.5 @@ -535,6 +542,7 @@ network_metadata: sahara/api: 10.122.7.4 heat/api: 10.122.7.4 ceilometer/api: 10.122.7.4 + aodh/api: 10.122.7.4 ex: 10.122.6.4 ceph/public: 10.122.7.4 mgmt/messaging: 10.122.7.4 @@ -625,6 +633,7 @@ network_scheme: mgmt/database: br-mgmt sahara/api: br-mgmt ceilometer/api: br-mgmt + aodh/api: br-mgmt ceph/public: br-mgmt mgmt/messaging: br-mgmt management: br-mgmt diff --git a/hiera/neut_vlan.compute.ssl.yaml b/hiera/neut_vlan.compute.ssl.yaml index 46fabf1..bf4ade4 100644 --- a/hiera/neut_vlan.compute.ssl.yaml +++ b/hiera/neut_vlan.compute.ssl.yaml @@ -137,6 +137,9 @@ ceilometer: user_password: ycMeNdmo metering_secret: zjAKZxtd enabled: false +aodh: + user_password: Be0Oloop + db_password: Thu5ieY6 cobbler: profile: ubuntu_1404_x86_64 mongo: @@ -382,6 +385,7 @@ network_metadata: mgmt/database: 10.122.7.3 sahara/api: 10.122.7.3 ceilometer/api: 10.122.7.3 + aodh/api: 10.122.7.3 ceph/public: 10.122.7.3 mgmt/messaging: 10.122.7.3 management: 10.122.7.3 @@ -418,6 +422,7 @@ network_metadata: mgmt/database: 10.122.7.2 sahara/api: 10.122.7.2 ceilometer/api: 10.122.7.2 + aodh/api: 10.122.7.2 ceph/public: 10.122.7.2 mgmt/messaging: 10.122.7.2 management: 10.122.7.2 @@ -455,6 +460,7 @@ network_metadata: sahara/api: 10.122.7.1 heat/api: 10.122.7.1 ceilometer/api: 10.122.7.1 + aodh/api: 10.122.7.1 ex: 10.122.6.2 ceph/public: 10.122.7.1 mgmt/messaging: 10.122.7.1 @@ -495,6 +501,7 @@ network_metadata: sahara/api: 10.122.7.5 heat/api: 10.122.7.5 ceilometer/api: 10.122.7.5 + aodh/api: 10.122.7.5 ex: 10.122.6.3 ceph/public: 10.122.7.5 mgmt/messaging: 10.122.7.5 @@ -535,6 +542,7 @@ network_metadata: sahara/api: 10.122.7.4 heat/api: 10.122.7.4 ceilometer/api: 10.122.7.4 + aodh/api: 10.122.7.4 ex: 10.122.6.4 ceph/public: 10.122.7.4 mgmt/messaging: 10.122.7.4 @@ -625,6 +633,7 @@ network_scheme: mgmt/database: br-mgmt sahara/api: br-mgmt ceilometer/api: br-mgmt + aodh/api: br-mgmt ceph/public: br-mgmt mgmt/messaging: br-mgmt management: br-mgmt diff --git a/hiera/neut_vlan.ironic.conductor.yaml b/hiera/neut_vlan.ironic.conductor.yaml index bed3173..1f6f360 100644 --- a/hiera/neut_vlan.ironic.conductor.yaml +++ b/hiera/neut_vlan.ironic.conductor.yaml @@ -290,6 +290,9 @@ ceilometer: user_password: duH6N8su3soEWT1UbHQEoVPi metering_secret: zPaQgIhyUYD1q0MWBf1UJgjb enabled: false +aodh: + user_password: Be0Oloop + db_password: Thu5ieY6 corosync: verified: false group: 226.94.1.1 @@ -391,6 +394,7 @@ network_metadata: sahara/api: 192.168.0.3 heat/api: 192.168.0.3 ceilometer/api: 192.168.0.3 + aodh/api: 192.168.0.3 ex: 172.16.51.117 ceph/public: 192.168.0.3 mgmt/messaging: 192.168.0.3 @@ -431,6 +435,7 @@ network_metadata: mgmt/database: 192.168.0.4 sahara/api: 192.168.0.4 ceilometer/api: 192.168.0.4 + aodh/api: 192.168.0.4 mgmt/vip: 192.168.0.4 ceph/public: 192.168.0.4 mgmt/messaging: 192.168.0.4 @@ -540,6 +545,7 @@ network_scheme: mgmt/database: br-mgmt sahara/api: br-mgmt ceilometer/api: br-mgmt + aodh/api: br-mgmt ceph/public: br-mgmt mgmt/messaging: br-mgmt management: br-mgmt diff --git a/hiera/neut_vlan.ironic.controller.yaml b/hiera/neut_vlan.ironic.controller.yaml index f4e2101..8798b8b 100644 --- a/hiera/neut_vlan.ironic.controller.yaml +++ b/hiera/neut_vlan.ironic.controller.yaml @@ -776,6 +776,9 @@ ceilometer: user_password: duH6N8su3soEWT1UbHQEoVPi metering_secret: zPaQgIhyUYD1q0MWBf1UJgjb enabled: false +aodh: + user_password: Be0Oloop + db_password: Thu5ieY6 corosync: verified: false group: 226.94.1.1 @@ -879,6 +882,7 @@ network_metadata: sahara/api: 192.168.0.3 heat/api: 192.168.0.3 ceilometer/api: 192.168.0.3 + aodh/api: 192.168.0.3 ex: 172.16.51.117 ceph/public: 192.168.0.3 mgmt/messaging: 192.168.0.3 @@ -919,6 +923,7 @@ network_metadata: mgmt/database: 192.168.0.4 sahara/api: 192.168.0.4 ceilometer/api: 192.168.0.4 + aodh/api: 192.168.0.4 mgmt/vip: 192.168.0.4 ceph/public: 192.168.0.4 mgmt/messaging: 192.168.0.4 @@ -1042,6 +1047,7 @@ network_scheme: mgmt/database: br-mgmt sahara/api: br-mgmt ceilometer/api: br-mgmt + aodh/api: br-mgmt ex: br-ex ceph/public: br-mgmt mgmt/messaging: br-mgmt diff --git a/hiera/neut_vlan_l3ha.ceph.ceil-ceph-osd.yaml b/hiera/neut_vlan_l3ha.ceph.ceil-ceph-osd.yaml index f71b328..b2df464 100644 --- a/hiera/neut_vlan_l3ha.ceph.ceil-ceph-osd.yaml +++ b/hiera/neut_vlan_l3ha.ceph.ceil-ceph-osd.yaml @@ -16,6 +16,9 @@ ceilometer: enabled: true metering_secret: tHq2rcoq user_password: WBfBSo6U +aodh: + user_password: Be0Oloop + db_password: Thu5ieY6 cinder: db_password: trj609V8 fixed_key: 7883d66c643ce9a508ebcd4cd5516fc98814a11276bc98c4e8e671188b54e941 @@ -121,6 +124,7 @@ network_metadata: sahara/api: 192.168.0.1 heat/api: 192.168.0.1 ceilometer/api: 192.168.0.1 + aodh/api: 192.168.0.1 ex: ceph/public: 192.168.0.1 ceph/radosgw: @@ -161,6 +165,7 @@ network_metadata: sahara/api: 192.168.0.2 heat/api: 192.168.0.2 ceilometer/api: 192.168.0.2 + aodh/api: 192.168.0.2 ex: ceph/public: 192.168.0.2 ceph/radosgw: @@ -201,6 +206,7 @@ network_metadata: sahara/api: 192.168.0.3 heat/api: 192.168.0.3 ceilometer/api: 192.168.0.3 + aodh/api: 192.168.0.3 ex: 172.16.0.2 ceph/public: 192.168.0.3 ceph/radosgw: 172.16.0.2 @@ -241,6 +247,7 @@ network_metadata: sahara/api: 192.168.0.4 heat/api: 192.168.0.4 ceilometer/api: 192.168.0.4 + aodh/api: 192.168.0.4 ex: ceph/public: 192.168.0.4 ceph/radosgw: @@ -281,6 +288,7 @@ network_metadata: sahara/api: 192.168.0.5 heat/api: 192.168.0.5 ceilometer/api: 192.168.0.5 + aodh/api: 192.168.0.5 ex: ceph/public: 192.168.0.5 ceph/radosgw: @@ -406,6 +414,7 @@ network_scheme: mgmt/database: br-mgmt sahara/api: br-mgmt ceilometer/api: br-mgmt + aodh/api: br-mgmt mgmt/vip: br-mgmt ceph/public: br-mgmt mgmt/messaging: br-mgmt diff --git a/hiera/neut_vlan_l3ha.ceph.ceil-compute.yaml b/hiera/neut_vlan_l3ha.ceph.ceil-compute.yaml index de100f2..0ee3887 100644 --- a/hiera/neut_vlan_l3ha.ceph.ceil-compute.yaml +++ b/hiera/neut_vlan_l3ha.ceph.ceil-compute.yaml @@ -16,6 +16,9 @@ ceilometer: enabled: true metering_secret: tHq2rcoq user_password: WBfBSo6U +aodh: + user_password: Be0Oloop + db_password: Thu5ieY6 cinder: db_password: trj609V8 fixed_key: 7883d66c643ce9a508ebcd4cd5516fc98814a11276bc98c4e8e671188b54e941 @@ -122,6 +125,7 @@ network_metadata: sahara/api: 192.168.0.1 heat/api: 192.168.0.1 ceilometer/api: 192.168.0.1 + aodh/api: 192.168.0.1 ex: ceph/public: 192.168.0.1 ceph/radosgw: @@ -162,6 +166,7 @@ network_metadata: sahara/api: 192.168.0.2 heat/api: 192.168.0.2 ceilometer/api: 192.168.0.2 + aodh/api: 192.168.0.2 ex: ceph/public: 192.168.0.2 ceph/radosgw: @@ -202,6 +207,7 @@ network_metadata: sahara/api: 192.168.0.3 heat/api: 192.168.0.3 ceilometer/api: 192.168.0.3 + aodh/api: 192.168.0.3 ex: 172.16.0.2 ceph/public: 192.168.0.3 ceph/radosgw: 172.16.0.2 @@ -242,6 +248,7 @@ network_metadata: sahara/api: 192.168.0.4 heat/api: 192.168.0.4 ceilometer/api: 192.168.0.4 + aodh/api: 192.168.0.4 ex: ceph/public: 192.168.0.4 ceph/radosgw: @@ -282,6 +289,7 @@ network_metadata: sahara/api: 192.168.0.5 heat/api: 192.168.0.5 ceilometer/api: 192.168.0.5 + aodh/api: 192.168.0.5 ex: ceph/public: 192.168.0.5 ceph/radosgw: @@ -407,6 +415,7 @@ network_scheme: mgmt/database: br-mgmt sahara/api: br-mgmt ceilometer/api: br-mgmt + aodh/api: br-mgmt mgmt/vip: br-mgmt ceph/public: br-mgmt mgmt/messaging: br-mgmt diff --git a/hiera/neut_vlan_l3ha.ceph.ceil-controller.yaml b/hiera/neut_vlan_l3ha.ceph.ceil-controller.yaml index 2174a6b..962fd7b 100644 --- a/hiera/neut_vlan_l3ha.ceph.ceil-controller.yaml +++ b/hiera/neut_vlan_l3ha.ceph.ceil-controller.yaml @@ -16,6 +16,9 @@ ceilometer: enabled: true metering_secret: tHq2rcoq user_password: WBfBSo6U +aodh: + user_password: Be0Oloop + db_password: Thu5ieY6 cinder: db_password: trj609V8 fixed_key: 7883d66c643ce9a508ebcd4cd5516fc98814a11276bc98c4e8e671188b54e941 @@ -121,6 +124,7 @@ network_metadata: sahara/api: 192.168.0.1 heat/api: 192.168.0.1 ceilometer/api: 192.168.0.1 + aodh/api: 192.168.0.1 ex: ceph/public: 192.168.0.1 ceph/radosgw: @@ -161,6 +165,7 @@ network_metadata: sahara/api: 192.168.0.2 heat/api: 192.168.0.2 ceilometer/api: 192.168.0.2 + aodh/api: 192.168.0.2 ex: ceph/public: 192.168.0.2 ceph/radosgw: @@ -201,6 +206,7 @@ network_metadata: sahara/api: 192.168.0.3 heat/api: 192.168.0.3 ceilometer/api: 192.168.0.3 + aodh/api: 192.168.0.3 ex: 172.16.0.2 ceph/public: 192.168.0.3 ceph/radosgw: 172.16.0.2 @@ -241,6 +247,7 @@ network_metadata: sahara/api: 192.168.0.4 heat/api: 192.168.0.4 ceilometer/api: 192.168.0.4 + aodh/api: 192.168.0.4 ex: ceph/public: 192.168.0.4 ceph/radosgw: @@ -281,6 +288,7 @@ network_metadata: sahara/api: 192.168.0.5 heat/api: 192.168.0.5 ceilometer/api: 192.168.0.5 + aodh/api: 192.168.0.5 ex: ceph/public: 192.168.0.5 ceph/radosgw: @@ -321,6 +329,7 @@ network_metadata: sahara/api: 192.168.0.8 heat/api: 192.168.0.8 ceilometer/api: 192.168.0.8 + aodh/api: 192.168.0.8 ex: 172.16.0.8 ceph/public: 192.168.0.8 ceph/radosgw: 172.16.0.8 @@ -454,6 +463,7 @@ network_scheme: mgmt/database: br-mgmt sahara/api: br-mgmt ceilometer/api: br-mgmt + aodh/api: br-mgmt mgmt/vip: br-mgmt ceph/public: br-mgmt mgmt/messaging: br-mgmt @@ -861,6 +871,15 @@ tasks: type: puppet uids: - '125' +- parameters: + cwd: / + puppet_manifest: /etc/puppet/modules/osnailyfacter/modular/aodh/aodh.pp + puppet_modules: /etc/puppet/modules + timeout: 3600 + priority: 1800 + type: puppet + uids: + - '125' - parameters: cwd: / puppet_manifest: /etc/puppet/modules/osnailyfacter/modular/ceilometer/controller.pp diff --git a/hiera/neut_vlan_l3ha.ceph.ceil-primary-controller.yaml b/hiera/neut_vlan_l3ha.ceph.ceil-primary-controller.yaml index 9055594..c485914 100644 --- a/hiera/neut_vlan_l3ha.ceph.ceil-primary-controller.yaml +++ b/hiera/neut_vlan_l3ha.ceph.ceil-primary-controller.yaml @@ -16,6 +16,9 @@ ceilometer: enabled: true metering_secret: tHq2rcoq user_password: WBfBSo6U +aodh: + user_password: Be0Oloop + db_password: Thu5ieY6 cinder: db_password: trj609V8 fixed_key: 7883d66c643ce9a508ebcd4cd5516fc98814a11276bc98c4e8e671188b54e941 @@ -121,6 +124,7 @@ network_metadata: sahara/api: 192.168.0.1 heat/api: 192.168.0.1 ceilometer/api: 192.168.0.1 + aodh/api: 192.168.0.1 ex: ceph/public: 192.168.0.1 ceph/radosgw: @@ -161,6 +165,7 @@ network_metadata: sahara/api: 192.168.0.2 heat/api: 192.168.0.2 ceilometer/api: 192.168.0.2 + aodh/api: 192.168.0.2 ex: ceph/public: 192.168.0.2 ceph/radosgw: @@ -201,6 +206,7 @@ network_metadata: sahara/api: 192.168.0.3 heat/api: 192.168.0.3 ceilometer/api: 192.168.0.3 + aodh/api: 192.168.0.3 ex: 172.16.0.2 ceph/public: 192.168.0.3 ceph/radosgw: 172.16.0.2 @@ -241,6 +247,7 @@ network_metadata: sahara/api: 192.168.0.4 heat/api: 192.168.0.4 ceilometer/api: 192.168.0.4 + aodh/api: 192.168.0.4 ex: ceph/public: 192.168.0.4 ceph/radosgw: @@ -281,6 +288,7 @@ network_metadata: sahara/api: 192.168.0.5 heat/api: 192.168.0.5 ceilometer/api: 192.168.0.5 + aodh/api: 192.168.0.5 ex: ceph/public: 192.168.0.5 ceph/radosgw: @@ -321,6 +329,7 @@ network_metadata: sahara/api: 192.168.0.8 heat/api: 192.168.0.8 ceilometer/api: 192.168.0.8 + aodh/api: 192.168.0.8 ex: 172.16.0.8 ceph/public: 192.168.0.8 ceph/radosgw: 172.16.0.8 @@ -454,6 +463,7 @@ network_scheme: mgmt/database: br-mgmt sahara/api: br-mgmt ceilometer/api: br-mgmt + aodh/api: br-mgmt mgmt/vip: br-mgmt ceph/public: br-mgmt mgmt/messaging: br-mgmt @@ -861,6 +871,15 @@ tasks: type: puppet uids: - '125' +- parameters: + cwd: / + puppet_manifest: /etc/puppet/modules/osnailyfacter/modular/aodh/aodh.pp + puppet_modules: /etc/puppet/modules + timeout: 3600 + priority: 1800 + type: puppet + uids: + - '125' - parameters: cwd: / puppet_manifest: /etc/puppet/modules/osnailyfacter/modular/ceilometer/controller.pp diff --git a/hiera/neut_vlan_l3ha.ceph.ceil-primary-mongo.yaml b/hiera/neut_vlan_l3ha.ceph.ceil-primary-mongo.yaml index 4fa094c..fc4d96d 100644 --- a/hiera/neut_vlan_l3ha.ceph.ceil-primary-mongo.yaml +++ b/hiera/neut_vlan_l3ha.ceph.ceil-primary-mongo.yaml @@ -16,6 +16,9 @@ ceilometer: enabled: true metering_secret: tHq2rcoq user_password: WBfBSo6U +aodh: + user_password: Be0Oloop + db_password: Thu5ieY6 cinder: db_password: trj609V8 fixed_key: 7883d66c643ce9a508ebcd4cd5516fc98814a11276bc98c4e8e671188b54e941 @@ -121,6 +124,7 @@ network_metadata: sahara/api: 192.168.0.1 heat/api: 192.168.0.1 ceilometer/api: 192.168.0.1 + aodh/api: 192.168.0.1 ex: ceph/public: 192.168.0.1 ceph/radosgw: @@ -161,6 +165,7 @@ network_metadata: sahara/api: 192.168.0.2 heat/api: 192.168.0.2 ceilometer/api: 192.168.0.2 + aodh/api: 192.168.0.2 ex: ceph/public: 192.168.0.2 ceph/radosgw: @@ -201,6 +206,7 @@ network_metadata: sahara/api: 192.168.0.3 heat/api: 192.168.0.3 ceilometer/api: 192.168.0.3 + aodh/api: 192.168.0.3 ex: 172.16.0.2 ceph/public: 192.168.0.3 ceph/radosgw: 172.16.0.2 @@ -241,6 +247,7 @@ network_metadata: sahara/api: 192.168.0.4 heat/api: 192.168.0.4 ceilometer/api: 192.168.0.4 + aodh/api: 192.168.0.4 ex: ceph/public: 192.168.0.4 ceph/radosgw: @@ -281,6 +288,7 @@ network_metadata: sahara/api: 192.168.0.5 heat/api: 192.168.0.5 ceilometer/api: 192.168.0.5 + aodh/api: 192.168.0.5 ex: ceph/public: 192.168.0.5 ceph/radosgw: @@ -406,6 +414,7 @@ network_scheme: mgmt/database: br-mgmt sahara/api: br-mgmt ceilometer/api: br-mgmt + aodh/api: br-mgmt mgmt/vip: br-mgmt ceph/public: br-mgmt mgmt/messaging: br-mgmt diff --git a/hiera/neut_vxlan_dvr.sahara-cinder.yaml b/hiera/neut_vxlan_dvr.sahara-cinder.yaml index ee5cef0..bb2dcfd 100644 --- a/hiera/neut_vxlan_dvr.sahara-cinder.yaml +++ b/hiera/neut_vxlan_dvr.sahara-cinder.yaml @@ -16,6 +16,9 @@ ceilometer: enabled: false metering_secret: 7aqxzabx user_password: FQUfTQ6a +aodh: + user_password: Be0Oloop + db_password: Thu5ieY6 cinder: db_password: 71kNkN9U fixed_key: 0ded0202e2a355df942df2bacbaba992658a0345f68f2db6e1bdb6dbb8f682cf @@ -121,6 +124,7 @@ network_metadata: sahara/api: 192.168.0.1 heat/api: 192.168.0.1 ceilometer/api: 192.168.0.1 + aodh/api: 192.168.0.1 ex: ceph/public: 192.168.0.1 ceph/radosgw: @@ -161,6 +165,7 @@ network_metadata: sahara/api: 192.168.0.2 heat/api: 192.168.0.2 ceilometer/api: 192.168.0.2 + aodh/api: 192.168.0.2 ex: 172.16.0.2 ceph/public: 192.168.0.2 ceph/radosgw: 172.16.0.2 @@ -201,6 +206,7 @@ network_metadata: sahara/api: 192.168.0.3 heat/api: 192.168.0.3 ceilometer/api: 192.168.0.3 + aodh/api: 192.168.0.3 ex: 172.16.0.3 ceph/public: 192.168.0.3 ceph/radosgw: 172.16.0.3 @@ -241,6 +247,7 @@ network_metadata: sahara/api: 192.168.0.4 heat/api: 192.168.0.4 ceilometer/api: 192.168.0.4 + aodh/api: 192.168.0.4 ex: 172.16.0.4 ceph/public: 192.168.0.4 ceph/radosgw: 172.16.0.4 @@ -281,6 +288,7 @@ network_metadata: sahara/api: 192.168.0.5 heat/api: 192.168.0.5 ceilometer/api: 192.168.0.5 + aodh/api: 192.168.0.5 ex: ceph/public: 192.168.0.5 ceph/radosgw: @@ -400,6 +408,7 @@ network_scheme: mgmt/database: br-mgmt sahara/api: br-mgmt ceilometer/api: br-mgmt + aodh/api: br-mgmt mgmt/vip: br-mgmt ceph/public: br-mgmt mgmt/messaging: br-mgmt diff --git a/hiera/neut_vxlan_dvr.sahara-compute.yaml b/hiera/neut_vxlan_dvr.sahara-compute.yaml index 33379c6..9c90746 100644 --- a/hiera/neut_vxlan_dvr.sahara-compute.yaml +++ b/hiera/neut_vxlan_dvr.sahara-compute.yaml @@ -16,6 +16,9 @@ ceilometer: enabled: false metering_secret: 7aqxzabx user_password: FQUfTQ6a +aodh: + user_password: Be0Oloop + db_password: Thu5ieY6 cinder: db_password: 71kNkN9U fixed_key: 0ded0202e2a355df942df2bacbaba992658a0345f68f2db6e1bdb6dbb8f682cf @@ -122,6 +125,7 @@ network_metadata: sahara/api: 192.168.0.1 heat/api: 192.168.0.1 ceilometer/api: 192.168.0.1 + aodh/api: 192.168.0.1 ex: ceph/public: 192.168.0.1 ceph/radosgw: @@ -162,6 +166,7 @@ network_metadata: sahara/api: 192.168.0.2 heat/api: 192.168.0.2 ceilometer/api: 192.168.0.2 + aodh/api: 192.168.0.2 ex: 172.16.0.2 ceph/public: 192.168.0.2 ceph/radosgw: 172.16.0.2 @@ -202,6 +207,7 @@ network_metadata: sahara/api: 192.168.0.3 heat/api: 192.168.0.3 ceilometer/api: 192.168.0.3 + aodh/api: 192.168.0.3 ex: 172.16.0.3 ceph/public: 192.168.0.3 ceph/radosgw: 172.16.0.3 @@ -242,6 +248,7 @@ network_metadata: sahara/api: 192.168.0.4 heat/api: 192.168.0.4 ceilometer/api: 192.168.0.4 + aodh/api: 192.168.0.4 ex: 172.16.0.4 ceph/public: 192.168.0.4 ceph/radosgw: 172.16.0.4 @@ -282,6 +289,7 @@ network_metadata: sahara/api: 192.168.0.5 heat/api: 192.168.0.5 ceilometer/api: 192.168.0.5 + aodh/api: 192.168.0.5 ex: ceph/public: 192.168.0.5 ceph/radosgw: @@ -409,6 +417,7 @@ network_scheme: mgmt/database: br-mgmt sahara/api: br-mgmt ceilometer/api: br-mgmt + aodh/api: br-mgmt mgmt/vip: br-mgmt ceph/public: br-mgmt mgmt/messaging: br-mgmt diff --git a/hiera/neut_vxlan_dvr.sahara-controller.yaml b/hiera/neut_vxlan_dvr.sahara-controller.yaml index 073341b..0caaa02 100644 --- a/hiera/neut_vxlan_dvr.sahara-controller.yaml +++ b/hiera/neut_vxlan_dvr.sahara-controller.yaml @@ -16,6 +16,9 @@ ceilometer: enabled: false metering_secret: 7aqxzabx user_password: FQUfTQ6a +aodh: + user_password: Be0Oloop + db_password: Thu5ieY6 cinder: db_password: 71kNkN9U fixed_key: 0ded0202e2a355df942df2bacbaba992658a0345f68f2db6e1bdb6dbb8f682cf @@ -121,6 +124,7 @@ network_metadata: sahara/api: 192.168.0.1 heat/api: 192.168.0.1 ceilometer/api: 192.168.0.1 + aodh/api: 192.168.0.1 ex: ceph/public: 192.168.0.1 ceph/radosgw: @@ -161,6 +165,7 @@ network_metadata: sahara/api: 192.168.0.2 heat/api: 192.168.0.2 ceilometer/api: 192.168.0.2 + aodh/api: 192.168.0.2 ex: 172.16.0.2 ceph/public: 192.168.0.2 ceph/radosgw: 172.16.0.2 @@ -201,6 +206,7 @@ network_metadata: sahara/api: 192.168.0.3 heat/api: 192.168.0.3 ceilometer/api: 192.168.0.3 + aodh/api: 192.168.0.3 ex: 172.16.0.3 ceph/public: 192.168.0.3 ceph/radosgw: 172.16.0.3 @@ -241,6 +247,7 @@ network_metadata: sahara/api: 192.168.0.4 heat/api: 192.168.0.4 ceilometer/api: 192.168.0.4 + aodh/api: 192.168.0.4 ex: 172.16.0.4 ceph/public: 192.168.0.4 ceph/radosgw: 172.16.0.4 @@ -281,6 +288,7 @@ network_metadata: sahara/api: 192.168.0.5 heat/api: 192.168.0.5 ceilometer/api: 192.168.0.5 + aodh/api: 192.168.0.5 ex: ceph/public: 192.168.0.5 ceph/radosgw: @@ -408,6 +416,7 @@ network_scheme: mgmt/database: br-mgmt sahara/api: br-mgmt ceilometer/api: br-mgmt + aodh/api: br-mgmt mgmt/vip: br-mgmt ceph/public: br-mgmt mgmt/messaging: br-mgmt diff --git a/hiera/neut_vxlan_dvr.sahara-primary-controller.overridden_ssl.yaml b/hiera/neut_vxlan_dvr.sahara-primary-controller.overridden_ssl.yaml index 2c4ee07..ee6e54f 100644 --- a/hiera/neut_vxlan_dvr.sahara-primary-controller.overridden_ssl.yaml +++ b/hiera/neut_vxlan_dvr.sahara-primary-controller.overridden_ssl.yaml @@ -16,6 +16,9 @@ ceilometer: enabled: false metering_secret: 7aqxzabx user_password: FQUfTQ6a +aodh: + user_password: Be0Oloop + db_password: Thu5ieY6 cinder: db_password: 71kNkN9U fixed_key: 0ded0202e2a355df942df2bacbaba992658a0345f68f2db6e1bdb6dbb8f682cf @@ -281,6 +284,7 @@ network_metadata: sahara/api: 192.168.0.1 heat/api: 192.168.0.1 ceilometer/api: 192.168.0.1 + aodh/api: 192.168.0.1 ex: ceph/public: 192.168.0.1 ceph/radosgw: @@ -321,6 +325,7 @@ network_metadata: sahara/api: 192.168.0.2 heat/api: 192.168.0.2 ceilometer/api: 192.168.0.2 + aodh/api: 192.168.0.2 ex: 172.16.0.2 ceph/public: 192.168.0.2 ceph/radosgw: 172.16.0.2 @@ -361,6 +366,7 @@ network_metadata: sahara/api: 192.168.0.3 heat/api: 192.168.0.3 ceilometer/api: 192.168.0.3 + aodh/api: 192.168.0.3 ex: 172.16.0.3 ceph/public: 192.168.0.3 ceph/radosgw: 172.16.0.3 @@ -401,6 +407,7 @@ network_metadata: sahara/api: 192.168.0.4 heat/api: 192.168.0.4 ceilometer/api: 192.168.0.4 + aodh/api: 192.168.0.4 ex: 172.16.0.4 ceph/public: 192.168.0.4 ceph/radosgw: 172.16.0.4 @@ -441,6 +448,7 @@ network_metadata: sahara/api: 192.168.0.5 heat/api: 192.168.0.5 ceilometer/api: 192.168.0.5 + aodh/api: 192.168.0.5 ex: ceph/public: 192.168.0.5 ceph/radosgw: @@ -568,6 +576,7 @@ network_scheme: mgmt/database: br-mgmt sahara/api: br-mgmt ceilometer/api: br-mgmt + aodh/api: br-mgmt mgmt/vip: br-mgmt ceph/public: br-mgmt mgmt/messaging: br-mgmt diff --git a/hiera/neut_vxlan_dvr.sahara-primary-controller.yaml b/hiera/neut_vxlan_dvr.sahara-primary-controller.yaml index 241b8a7..6d29dc4 100644 --- a/hiera/neut_vxlan_dvr.sahara-primary-controller.yaml +++ b/hiera/neut_vxlan_dvr.sahara-primary-controller.yaml @@ -16,6 +16,9 @@ ceilometer: enabled: false metering_secret: 7aqxzabx user_password: FQUfTQ6a +aodh: + user_password: Be0Oloop + db_password: Thu5ieY6 cinder: db_password: 71kNkN9U fixed_key: 0ded0202e2a355df942df2bacbaba992658a0345f68f2db6e1bdb6dbb8f682cf @@ -121,6 +124,7 @@ network_metadata: sahara/api: 192.168.0.1 heat/api: 192.168.0.1 ceilometer/api: 192.168.0.1 + aodh/api: 192.168.0.1 ex: ceph/public: 192.168.0.1 ceph/radosgw: @@ -161,6 +165,7 @@ network_metadata: sahara/api: 192.168.0.2 heat/api: 192.168.0.2 ceilometer/api: 192.168.0.2 + aodh/api: 192.168.0.2 ex: 172.16.0.2 ceph/public: 192.168.0.2 ceph/radosgw: 172.16.0.2 @@ -201,6 +206,7 @@ network_metadata: sahara/api: 192.168.0.3 heat/api: 192.168.0.3 ceilometer/api: 192.168.0.3 + aodh/api: 192.168.0.3 ex: 172.16.0.3 ceph/public: 192.168.0.3 ceph/radosgw: 172.16.0.3 @@ -241,6 +247,7 @@ network_metadata: sahara/api: 192.168.0.4 heat/api: 192.168.0.4 ceilometer/api: 192.168.0.4 + aodh/api: 192.168.0.4 ex: 172.16.0.4 ceph/public: 192.168.0.4 ceph/radosgw: 172.16.0.4 @@ -281,6 +288,7 @@ network_metadata: sahara/api: 192.168.0.5 heat/api: 192.168.0.5 ceilometer/api: 192.168.0.5 + aodh/api: 192.168.0.5 ex: ceph/public: 192.168.0.5 ceph/radosgw: @@ -408,6 +416,7 @@ network_scheme: mgmt/database: br-mgmt sahara/api: br-mgmt ceilometer/api: br-mgmt + aodh/api: br-mgmt mgmt/vip: br-mgmt ceph/public: br-mgmt mgmt/messaging: br-mgmt