aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDan Prince <dprince@redhat.com>2015-10-02 17:32:23 -0400
committerDan Prince <dprince@redhat.com>2015-10-02 17:54:23 -0400
commit969e6e6671d2a61cd801541c1306cc51241f6c09 (patch)
treef2005460c100a43787caeaf82f649f7714a7be1d
parent83d628654990f4198661143d2a1a326fbd75041a (diff)
Drop stale base, nagios, debian-mirror templates
This patch removes a couple (top-level) templates that are no longer used. Change-Id: I71ba379b0d026e04fbcd45aaa2a0b587ba457c8c
-rw-r--r--base.yaml77
-rw-r--r--debian-mirror.yaml31
-rw-r--r--nagios3.yaml137
3 files changed, 0 insertions, 245 deletions
diff --git a/base.yaml b/base.yaml
deleted file mode 100644
index a1ba509f..00000000
--- a/base.yaml
+++ /dev/null
@@ -1,77 +0,0 @@
-heat_template_version: 2013-05-23
-description: 'Tie OpenStack components together'
-parameters:
- KeystoneAdminToken:
- description: Admin Token needed for keystone
- type: string
- hidden: true
- TemplateRoot:
- description: URL Base where all of our templates are available
- type: string
-resources:
- RabbitMQ:
- type: AWS::CloudFormation::Stack
- TemplateURL:
- Fn::Join:
- - {get_param: TemplateRoot}
- - rabbitmq.yaml
- parameters:
- InstanceType: m1.small
- KeyName: default
- RabbitMQImage: image-rabbitmq
- MySQL:
- type: AWS::CloudFormation::Stack
- TemplateURL:
- Fn::Join:
- - {get_param: TemplateRoot}
- - mysql.yaml
- parameters:
- InstanceType: m1.small
- KeyName: default
- MySQLImage: image-mysql
- Keystone:
- type: AWS::CloudFormation::Stack
- TemplateURL:
- Fn::Join:
- - {get_param: TemplateRoot}
- - keystone.yaml
- parameters:
- AdminToken: {get_param: KeystoneAdminToken}
- KeyName: default
- KeystoneDSN:
- Fn::Join:
- - 'mysql://keystone:'
- - {get_attr: [ MySQL , KeystonePassword ]}
- - '@'
- - {get_attr: [ MySQL , MySQLHost ]}
- - '/keystone'
- Glance:
- type: AWS::CloudFormation::Stack
- TemplateURL:
- Fn::Join:
- - {get_param: TemplateRoot}
- - glance.yaml
- parameters:
- KeyName: default
- HeatDSN:
- Fn::Join:
- - 'mysql://glance:'
- - {get_attr: [ MySQL, GlancePassword ] }
- - '@'
- - {get_attr: [ MySQL, MySQLHost ]}
- - '/glance'
- Heat:
- type: AWS::CloudFormation::Stack
- TemplateURL:
- Fn::Join:
- - {get_param: TemplateRoot}
- - heat.yaml
- parameters:
- KeyName: default
- HeatDSN:
- Fn::Join:
- - 'mysql://heat:'
- - {get_attr: [ MySQL, HeatPassword ] }
- - '@'
- - {get_attr: [ MySQL, MySQLHost ]}
- - '/heat'
diff --git a/debian-mirror.yaml b/debian-mirror.yaml
deleted file mode 100644
index ddfff6a6..00000000
--- a/debian-mirror.yaml
+++ /dev/null
@@ -1,31 +0,0 @@
-description: 'Debian-mirror: A Debian or Ubuntu mirror in the cloud'
-parameters:
- DebianMirrorArchitectures:
- default: [{"arch": "amd64"}]
- description: The architectures to be mirrored
- type: JSON
- DebianMirrorComponents:
- default: ["main", "restricted", "universe", "multiverse"]
- description: The components to be mirrored
- type: JSON
- DebianMirrorMirror:
- default: http://archive.ubuntu.com/ubuntu
- description: The mirror that is to be used as the source
- type: string
- DebianMirrorSuites:
- default: ["saucy", "saucy-updates", "saucy-security"]
- description: The suites to be mirrored
- type: JSON
-resources:
- debianMirrorConfig:
- type: AWS::AutoScaling::LaunchConfiguration
- metadata:
- debian-mirror:
- mirror:
- get_param: DebianMirrorMirror
- suites:
- get_param: DebianMirrorSuites
- architectures:
- get_param: DebianMirrorArchitectures
- components:
- get_param: DebianMirrorComponents
diff --git a/nagios3.yaml b/nagios3.yaml
deleted file mode 100644
index e2ba8ccf..00000000
--- a/nagios3.yaml
+++ /dev/null
@@ -1,137 +0,0 @@
-# Copyright 2014 Hewlett-Packard Development Company, L.P.
-#
-# Licensed under the Apache License, Version 2.0 (the "License"); you may
-# not use this file except in compliance with the License. You may obtain
-# a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
-# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
-# License for the specific language governing permissions and limitations
-# under the License.
-#
-heat_template_version: 2013-05-23
-description: Deploy Nagios
-parameters:
- adm_web_passwd:
- type: string
- description: Password for initial admin user
- hidden: true
- external_network:
- type: string
- description: Network to attach floating ips to.
- default: ext-net
- flavor:
- type: string
- description: What flavor to use for the nagios server.
- default: m1.small
- image:
- type: string
- description: Image for Nagios.
- default: nagios
- key_name:
- type: string
- description: What Nova SSH key to use for the nagios server.
- default: default
- monitor_networks:
- type: json
- description: Neutron networks to monitor.
- default: []
- nova_os_auth_url:
- type: string
- default: ''
- description: URL for Keystone to access Nova.
- nova_os_password:
- type: string
- hidden: true
- description: password to present to nova_host_ip.
- default: ''
- nova_os_username:
- type: string
- description: username to present to nova_host_ip.
- default: ''
- nova_os_tenant_name:
- type: string
- description: tenant name to present to nova_host_ip.
- default: ''
- server_network:
- type: string
- description: Network id for server.
- default: default-net
-resources:
- nagios_config:
- type: OS::Heat::StructuredConfig
- properties:
- config:
- nagios3:
- adm_web_passwd: { get_input: adm_web_passwd }
- os_auth_url: { get_input: nova_os_auth_url }
- os_password: { get_input: nova_os_password }
- os_username: { get_input: nova_os_username }
- os_tenant_name: { get_input: nova_os_tenant_name }
- monitor_networks: { get_input: monitor_networks }
- completion-signal: { get_input: deploy_signal_id }
- nagios_security_group:
- type: OS::Neutron::SecurityGroup
- properties:
- name: monitoring
- rules:
- - direction: ingress
- port_range_max: 22
- port_range_min: 22
- protocol: tcp
- - direction: ingress
- port_range_max: 80
- port_range_min: 80
- protocol: tcp
- - direction: ingress
- protocol: icmp
- - direction: egress
- protocol: tcp
- - direction: egress
- protocol: udp
- - direction: egress
- protocol: icmp
- nagios_net_port:
- type: OS::Neutron::Port
- properties:
- network_id: { get_param: server_network }
- security_groups: [ { get_resource: nagios_security_group } ]
- nagios_server:
- type: OS::Nova::Server
- properties:
- flavor: { get_param: flavor }
- image: { get_param: image }
- key_name: { get_param: key_name }
- networks:
- - network: { get_param: server_network }
- port: { get_resource: nagios_net_port }
- user_data_format: SOFTWARE_CONFIG
- user_data: {get_resource: NodeUserData}
-
- NodeUserData:
- type: OS::TripleO::NodeUserData
-
- nagios_floating_ip:
- type: OS::Neutron::FloatingIP
- properties:
- floating_network_id: { get_param: external_network }
- port_id: { get_resource: nagios_net_port }
- nagios_deploy:
- type: OS::Heat::StructuredDeployment
- properties:
- server: { get_resource: nagios_server }
- config: { get_resource: nagios_config }
- input_values:
- adm_web_passwd: { get_param: adm_web_passwd }
- nova_os_auth_url: { get_param: nova_os_auth_url }
- nova_os_password: { get_param: nova_os_password }
- nova_os_username: { get_param: nova_os_username }
- nova_os_tenant_name: { get_param: nova_os_tenant_name }
- monitor_networks: { get_param: monitor_networks }
-outputs:
- nagios_address:
- description: Address of Nagios admin interface.
- value: { get_attr: [ nagios_floating_ip, floating_ip_address ] }