diff options
| -rw-r--r-- | bootstack-vm.yaml | 2 | ||||
| -rw-r--r-- | nagios3.yaml | 81 | ||||
| -rw-r--r-- | nova-compute-instance.yaml | 16 |
3 files changed, 95 insertions, 4 deletions
diff --git a/bootstack-vm.yaml b/bootstack-vm.yaml index 91456c67..77b74161 100644 --- a/bootstack-vm.yaml +++ b/bootstack-vm.yaml @@ -76,6 +76,8 @@ Resources: host: 127.0.0.1 quantum: floatingip_range: 172.17.41.0/24 + floatingip_start: 172.17.41.2 + floatingip_end: 172.17.41.254 host: 127.0.0.1 metadata_proxy_shared_secret: unset ovs_db: mysql://quantum:unset@localhost/ovs_quantum?charset=utf8 diff --git a/nagios3.yaml b/nagios3.yaml new file mode 100644 index 00000000..6d86ebbf --- /dev/null +++ b/nagios3.yaml @@ -0,0 +1,81 @@ +HeatTemplateFormatVersion: '2012-12-12' +Description: 'Nagios3' +Parameters: + KeyName: + Description: Name of an existing EC2 KeyPair to enable SSH access to the instance + Type: String + Default: default + AdmWebPasswd: + Description: Password for nagiosadmin web admin user. + Type: String + Default: nagiosadmin + NovaHostIp: + Description: nova ip. + Type: String + Default: 192.0.2.1 + NovaOsPassword: + Description: nova OS_PASSWORD. + Type: String + Default: unset + NovaOsUsername: + Description: nova OS_USERNAME. + Type: String + Default: admin + NovaOsTenantName: + Description: nova OS_TENANT_NAME. + Type: String + Default: admin + Nagios3ImageId: + Description: Nagios image. + Type: String + Default: nagios3 + InstanceType: + Description: Use this flavor. + Type: String + Default: baremetal + InitialIpSplitKey: + Description: Network name from nova list to get initial ip list from. + Type: String + Default: ctlplane + Apache2SnakeoilPem: + Description: Snakeoil PEM file. + Type: String + Default: | + ----- BEGIN PlaceHolder... + Apache2SnakeoilKey: + Description: Snakeoil Key file. + Type: String + Default: | + ----- BEGIN PlaceHolder... +Resources: + nagios3: + Metadata: + OpenStack::ImageBuilder::Elements: [ nagios3 ] + apache2: + snakeoil_pem: + Ref: Apache2SnakeoilPem + snakeoil_key: + Ref: Apache2SnakeoilKey + nagios3: + adm_web_passwd: + Ref: AdmWebPasswd + nova_host_ip: + Ref: NovaHostIp + nova_os_password: + Ref: NovaOsPassword + nova_os_username: + Ref: NovaOsUsername + nova_os_tenant_name: + Ref: NovaOsTenantName + initial_network_split_key: + Ref: InitialIpSplitKey + Type: AWS::EC2::Instance + Properties: + KeyName: + Ref: KeyName + ImageId: + Ref: Nagios3ImageId + InstanceType: {Ref: InstanceType} +Outputs: + Nagios3Host: + Fn::GetAtt: [ nagios3 , PrivateIp ]
\ No newline at end of file diff --git a/nova-compute-instance.yaml b/nova-compute-instance.yaml index f508377a..d885cba3 100644 --- a/nova-compute-instance.yaml +++ b/nova-compute-instance.yaml @@ -36,6 +36,14 @@ Parameters: Type: String QuantumDSN: Type: String + QuantumBridgeMappings: + Type: String + QuantumNetworkVLANRanges: + Type: String + QuantumNetworkType: + Type: String + QuantumEnableTunnelling: + Type: String Resources: AccessPolicy: Type: OS::Heat::AccessPolicy @@ -83,10 +91,10 @@ Resources: ovs: local_ip: Fn::GetAtt: [ NovaCompute, PrivateIp ] - tenant_network_type: gre - network_vlan_ranges: '' - bridge_mappings: '' - enable_tunneling: 'True' + tenant_network_type: {Ref: QuantumNetworkType} + network_vlan_ranges: {Ref: QuantumNetworkVLANRanges} + bridge_mappings: {Ref: QuantumBridgeMappings} + enable_tunneling: {Ref: QuantumEnableTunnelling} service-password: {Ref: ServicePassword} admin-password: {Ref: ServicePassword} |