Clean up CR's, whitespace and service description

openstack/openstack-ansible-os_designate

Code Issues Proposed changes

This patch removes unnecessary whitespace and converts Windows
CR's to Unix LF's.
It also makes a small change to the default description for
Designate in the Keystone service catalogue to ensure that it
is more consistent with other services in OpenStack-Ansible.

This commit is contained in:

Jesse Pretorius

2016年03月11日 11:50:55 +00:00

parent 6c1be36c8f

commit efb3648384

5 changed files with 65 additions and 65 deletions

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download Patch File Download Diff File Expand all files Collapse all files

8
defaults/main.yml

View File

@@ -63,7 +63,7 @@ designate_system_user_home: "/var/lib/{{ designate_system_user_name }}"

## DB info

designate_galera_user:designate

designate_galera_password:"{{ designate_container_mysql_password }}"

designate_galera_database:designate

## RabbitMQ info

designate_rabbitmq_userid:designate

@@ -90,10 +90,10 @@ designate_api_program_name: designate-api

designate_service_region:RegionOne

designate_service_endpoint_type:internalURL

designate_service_name:designate

designate_service_port:9001

designate_service_proto:http

designate_service_type:dns

designate_service_description:"DNS as a service"

designate_service_type:dns

designate_service_description:"Designate DNS as a Service"

designate_service_project_domain_id:default

designate_service_user_domain_id:default

designate_service_user_name:designate

4
extras/conf.d/designate.yml.aio

View File

@@ -1,3 +1,3 @@

dnsaas_hosts:

aio1:

dnsaas_hosts:

aio1:

ip: 172.29.236.100

102
extras/env.d/designate.yml

View File

@@ -1,53 +1,53 @@

---

#

# 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.

component_skel:

designate_api:

belongs_to:

- designate_all

designate_central:

belongs_to:

- designate_all

designate_mdns:

belongs_to:

- designate_all

designate_pool_manager:

belongs_to:

- designate_all

designate_sink:

belongs_to:

- designate_all

container_skel:

designate_container:

belongs_to:

- dnsaas_containers

contains:

- designate_api

- designate_central

- designate_mdns

- designate_pool_manager

- designate_sink

properties:

service_name:designate

container_release:trusty

physical_skel:

dnsaas_containers:

belongs_to:

- all_containers

dnsaas_hosts:

belongs_to:

#

# 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.

component_skel:

designate_api:

belongs_to:

- designate_all

designate_central:

belongs_to:

- designate_all

designate_mdns:

belongs_to:

- designate_all

designate_pool_manager:

belongs_to:

- designate_all

designate_sink:

belongs_to:

- designate_all

container_skel:

designate_container:

belongs_to:

- dnsaas_containers

contains:

- designate_api

- designate_central

- designate_mdns

- designate_pool_manager

- designate_sink

properties:

service_name:designate

container_release:trusty

physical_skel:

dnsaas_containers:

belongs_to:

- all_containers

dnsaas_hosts:

belongs_to:

- hosts

8
handlers/main.yml

View File

@@ -18,25 +18,25 @@

state:"restarted"

pattern:"{{ designate_api_program_name }}"

- name:Restart designate central

service:

name:"{{ designate_central_program_name }}"

state:"restarted"

pattern:"{{ designate_central_program_name }}"

- name:Restart designate pool-manager

service:

name:"{{ designate_pool_manager_program_name }}"

state:"restarted"

pattern:"{{ designate_pool_manager_program_name }}"

- name:Restart designate mdns

service:

name:"{{ designate_mdns_program_name }}"

state:"restarted"

pattern:"{{ designate_mdns_program_name }}"

- name:Restart designate sink

service:

name:"{{ designate_sink_program_name }}"

state:"restarted"

8
meta/main.yml

View File

@@ -15,10 +15,10 @@

galaxy_info:

author:rcbops

description:Installation and setup of designate

company:Rackspace

description:Installation and setup of Designate

company:OpenStack

license:Apache2

min_ansible_version:1.6.6

min_ansible_version:1.9.0

platforms:

- name:Ubuntu

versions:

@@ -26,7 +26,7 @@ galaxy_info:

categories:

- cloud

- python

- designate

- development

- openstack

dependencies: