diff options
| -rw-r--r-- | nova-compute-config.yaml | 4 | ||||
| -rw-r--r-- | nova-compute-instance.yaml | 13 | ||||
| -rw-r--r-- | overcloud-source.yaml | 17 | ||||
| -rw-r--r-- | undercloud-source.yaml | 13 |
4 files changed, 45 insertions, 2 deletions
diff --git a/nova-compute-config.yaml b/nova-compute-config.yaml index 02d8e002..b296083b 100644 --- a/nova-compute-config.yaml +++ b/nova-compute-config.yaml @@ -14,6 +14,10 @@ Resources: metering_secret: {get_input: ceilometer_metering_secret} service-password: {get_input: ceilometer_password} compute_agent: {get_input: ceilometer_compute_agent} + snmpd: + export_MIB: UCD-SNMP-MIB + readonly_user_name: {get_input: snmpd_readonly_user_name} + readonly_user_password: {get_input: snmpd_readonly_user_password} glance: host: {get_input: glance_host} hosts: {get_input: static_hosts} diff --git a/nova-compute-instance.yaml b/nova-compute-instance.yaml index 71e47ccc..fe04ee4a 100644 --- a/nova-compute-instance.yaml +++ b/nova-compute-instance.yaml @@ -43,7 +43,7 @@ Parameters: } } Type: Json - KeyName: + KeyName: Description: Name of an existing EC2 KeyPair to enable SSH access to the instances Type: String Default: default @@ -96,6 +96,15 @@ Parameters: Description: The password for the ceilometer service account. Type: String NoEcho: true + SnmpdReadonlyUserName: + Default: ro_snmp_user + Description: The user name for SNMPd with readonly rights running on all Overcloud nodes + Type: String + SnmpdReadonlyUserPassword: + Default: unset + Description: The user password for SNMPd with readonly rights running on all Overcloud nodes + Type: String + NoEcho: true NovaComputeDriver: Type: String Default: libvirt.LibvirtDriver @@ -176,6 +185,8 @@ Resources: ceilometer_metering_secret: {Ref: CeilometerMeteringSecret} ceilometer_password: {Ref: CeilometerPassword} ceilometer_compute_agent: {Ref: CeilometerComputeAgent} + snmpd_readonly_user_name: {Ref: SnmpdReadonlyUserName} + snmpd_readonly_user_password: {Ref: SnmpdReadonlyUserPassword} glance_host: {Ref: GlanceHost} static_hosts: {Ref: StaticHosts} keystone_host: {Ref: KeystoneHost} diff --git a/overcloud-source.yaml b/overcloud-source.yaml index 4794f042..d17042ae 100644 --- a/overcloud-source.yaml +++ b/overcloud-source.yaml @@ -121,6 +121,15 @@ Parameters: Description: The password for the ceilometer service account. Type: String NoEcho: true + SnmpdReadonlyUserName: + Default: ro_snmp_user + Description: The user name for SNMPd with readonly rights running on all Overcloud nodes + Type: String + SnmpdReadonlyUserPassword: + Default: unset + Description: The user password for SNMPd with readonly rights running on all Overcloud nodes + Type: String + NoEcho: true CloudName: Default: '' Description: The DNS name of this cloud. E.g. ci-overcloud.tripleo.org @@ -424,6 +433,12 @@ Resources: metering_secret: {Ref: CeilometerMeteringSecret} service-password: Ref: CeilometerPassword + snmpd: + export_MIB: UCD-SNMP-MIB + readonly_user_name: + Ref: SnmpdReadonlyUserName + readonly_user_password: + Ref: SnmpdReadonlyUserPassword nova: compute_driver: libvirt.LibvirtDriver db: mysql://nova:unset@localhost/nova @@ -479,7 +494,7 @@ Resources: config: {Ref: controllerConfig} server: {Ref: controller0} input_values: - controller_host: + controller_host: Fn::Select: - 0 - Fn::Select: diff --git a/undercloud-source.yaml b/undercloud-source.yaml index c64a6ad3..3cddb262 100644 --- a/undercloud-source.yaml +++ b/undercloud-source.yaml @@ -29,6 +29,15 @@ Parameters: Description: The password for the ceilometer service account. Type: String NoEcho: true + SnmpdReadonlyUserName: + Default: ro_snmp_user + Description: The user name for SNMPd with readonly rights running on all Overcloud nodes + Type: String + SnmpdReadonlyUserPassword: + Default: unset + Description: The user password for SNMPd with readonly rights running on all Overcloud nodes + Type: String + NoEcho: true Flavor: Default: baremetal Description: Flavor to request when deploying. @@ -156,6 +165,10 @@ Resources: ceilometer: db: mysql://ceilometer:unset@localhost/ceilometer metering_secret: {Ref: CeilometerMeteringSecret} + snmpd_readonly_user_name: + Ref: SnmpdReadonlyUserName + snmpd_readonly_user_password: + Ref: SnmpdReadonlyUserPassword service-password: Ref: CeilometerPassword cinder: |