summaryrefslogtreecommitdiff
path: root/clusters
diff options
context:
space:
mode:
authorFrancisco Redondo Marchena <francisco.marchena@codethink.co.uk>2015-04-22 16:39:13 +0000
committerBaserock Gerrit <gerrit@baserock.org>2015-04-27 14:47:46 +0000
commit717aef60fccc3c6932f21adf3d9852e710817800 (patch)
treef8a0cb8fc5118a991028b07777f511f6f1330355 /clusters
parenteb2c33af1b56b322524d058dd6f560cb21d98a0d (diff)
downloaddefinitions-717aef60fccc3c6932f21adf3d9852e710817800.tar.gz
ceilometer: Configure ceilometer for multinode deployment
Change-Id: I065dcd8926775c5469830af25c3fc6a49d89e432
Diffstat (limited to 'clusters')
-rw-r--r--clusters/openstack-one-node.morph3
-rw-r--r--clusters/openstack-three-node-installer.morph19
-rw-r--r--clusters/openstack-two-node-installer.morph16
3 files changed, 33 insertions, 5 deletions
diff --git a/clusters/openstack-one-node.morph b/clusters/openstack-one-node.morph
index d57b1bc6..be229084 100644
--- a/clusters/openstack-one-node.morph
+++ b/clusters/openstack-one-node.morph
@@ -30,7 +30,8 @@ description: |
- NOVA_VIRT_TYPE can be either 'kvm' or 'qemu', depending on where the
system is being deployed to.
- We recommend changing all the PASSWORDs variables, also the
- KEYSTONE_TEMPORARY_ADMIN_TOKEN and METADATA_PROXY_SHARED_SECRET.
+ KEYSTONE_TEMPORARY_ADMIN_TOKEN, METADATA_PROXY_SHARED_SECRET and
+ METERING_SECRET
- Setting NOVA_BAREMETAL_SCHEDULING with an YAML truth value will configure
Nova to schedule baremetal machines through the Ironic driver, instead of
sheduling virtual machines.
diff --git a/clusters/openstack-three-node-installer.morph b/clusters/openstack-three-node-installer.morph
index 144033cb..91dfd9b1 100644
--- a/clusters/openstack-three-node-installer.morph
+++ b/clusters/openstack-three-node-installer.morph
@@ -21,7 +21,7 @@ description: |
Substitute the values of HOSTNAME, NETWORK_CONFIG, EXTERNAL_INTERFACE,
MANAGEMENT_IP_ADDRESS, CONTROLLER_HOST_ADDRESS, RABBITMQ_HOST and HOSTS_* to
- match your hardware ane networking configuration.
+ match your hardware and networking configuration.
Requirements to be able to run and test the system:
@@ -49,7 +49,8 @@ description: |
- NOVA_VIRT_TYPE can be either 'kvm' or 'qemu', depending on where the
system is being deployed to.
- We recommend changing all the PASSWORDs variables, also the
- KEYSTONE_TEMPORARY_ADMIN_TOKEN and METADATA_PROXY_SHARED_SECRET.
+ KEYSTONE_TEMPORARY_ADMIN_TOKEN, METADATA_PROXY_SHARED_SECRET and
+ METERING_SECRET.
- Setting NOVA_BAREMETAL_SCHEDULING with an YAML truth value will configure
Nova to schedule baremetal machines through the Ironic driver, instead of
sheduling virtual machines.
@@ -132,6 +133,14 @@ systems:
IRONIC_DB_USER: ironicDB
IRONIC_DB_PASSWORD: veryinsecure
+ CEILOMETER_SERVICE_USER: ceilometer
+ CEILOMETER_SERVICE_PASSWORD: veryinsecure
+ CEILOMETER_DB_USER: ceilometerDB
+ CEILOMETER_DB_PASSWORD: veryinsecure
+ CEILOMETER_ENABLE_CONTROLLER: False
+ CEILOMETER_ENABLE_COMPUTE: False
+ METERING_SECRET: insecureceilometersecret
+
CONTROLLER_HOST_ADDRESS: threenode-controller.os-mgmt
MANAGEMENT_INTERFACE_IP_ADDRESS: 10.0.0.1
@@ -170,6 +179,9 @@ systems:
IRONIC_ENABLE_SERVICE: True
+ CEILOMETER_ENABLE_CONTROLLER: True
+ CEILOMETER_ENABLE_COMPUTE: False
+
MANAGEMENT_INTERFACE_IP_ADDRESS: 10.0.0.2
HOSTS_SELF: 10.0.0.2 threenode-controller
EXTERNAL_INTERFACE: enp2s0
@@ -211,6 +223,9 @@ systems:
NEUTRON_ENABLE_CONTROLLER: False
METADATA_PROXY_SHARED_SECRET: novaneutronmetasecret
+ CEILOMETER_ENABLE_CONTROLLER: False
+ CEILOMETER_ENABLE_COMPUTE: True
+
MANAGEMENT_INTERFACE_IP_ADDRESS: 10.0.0.3
HOSTS_SELF: 10.0.0.3 threenode-compute
EXTERNAL_INTERFACE: eno1
diff --git a/clusters/openstack-two-node-installer.morph b/clusters/openstack-two-node-installer.morph
index 0541e784..2a278550 100644
--- a/clusters/openstack-two-node-installer.morph
+++ b/clusters/openstack-two-node-installer.morph
@@ -48,8 +48,9 @@ description: |
- NOVA_VIRT_TYPE can be either 'kvm' or 'qemu', depending on where the
system is being deployed to.
- We recommend changing all the PASSWORDs variables, also the
- KEYSTONE_TEMPORARY_ADMIN_TOKEN and METADATA_PROXY_SHARED_SECRET.
- - Setting NOVA_BAREMETAL_SCHEDULING with an YAML truth value will configure
+ KEYSTONE_TEMPORARY_ADMIN_TOKEN, METADATA_PROXY_SHARED_SECRET and
+ METERING_SECRET.
+ - Setting NOVA_BAREMETAL_SCHEDULING with a YAML truth value will configure
Nova to schedule baremetal machines through the Ironic driver, instead of
sheduling virtual machines.
@@ -131,6 +132,14 @@ systems:
IRONIC_DB_USER: ironicDB
IRONIC_DB_PASSWORD: veryinsecure
+ CEILOMETER_SERVICE_USER: ceilometer
+ CEILOMETER_SERVICE_PASSWORD: veryinsecure
+ CEILOMETER_DB_USER: ceilometerDB
+ CEILOMETER_DB_PASSWORD: veryinsecure
+ CEILOMETER_ENABLE_CONTROLLER: True
+ CEILOMETER_ENABLE_COMPUTE: False
+ METERING_SECRET: insecureceilometersecret
+
CONTROLLER_HOST_ADDRESS: twonode-controller.os-mgmt
MANAGEMENT_INTERFACE_IP_ADDRESS: 10.0.0.1
@@ -178,6 +187,9 @@ systems:
IRONIC_ENABLE_SERVICE: False
+ CEILOMETER_ENABLE_CONTROLLER: False
+ CEILOMETER_ENABLE_COMPUTE: True
+
MANAGEMENT_INTERFACE_IP_ADDRESS: 10.0.0.3
HOSTS_SELF: 10.0.0.3 twonode-compute
EXTERNAL_INTERFACE: eno1