openstack/openstack-ansible
Code Issues Proposed changes

Merge "trivialfix"

Browse Source
This commit is contained in:
Jenkins 2017-08-18 07:49:56 +00:00 committed by Gerrit Code Review
commit 35972daf6f
4 changed files with 23 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
etc/openstack_deploy/env.d/extra_container.yml.example
View File

@ -1,17 +1,17 @@
--- ---
# Copyright 2014, Rackspace US, Inc. # Copyright 2014, Rackspace US, Inc.
# # #
# # Licensed under the Apache License, Version 2.0 (the "License"); # Licensed under the Apache License, Version 2.0 (the "License");
# # you may not use this file except in compliance with the License. # you may not use this file except in compliance with the License.
# # You may obtain a copy of the License at # You may obtain a copy of the License at
# # #
# # http://www.apache.org/licenses/LICENSE-2.0 # http://www.apache.org/licenses/LICENSE-2.0
# # #
# # Unless required by applicable law or agreed to in writing, software # Unless required by applicable law or agreed to in writing, software
# # distributed under the License is distributed on an "AS IS" BASIS, # distributed under the License is distributed on an "AS IS" BASIS,
# # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
# # See the License for the specific language governing permissions and # See the License for the specific language governing permissions and
# # limitations under the License. # limitations under the License.
component_skel: component_skel:
example_api: example_api:

18
etc/openstack_deploy/user_variables.yml
View File

@ -74,15 +74,15 @@ debug: false
# By default, your deployment host will connect to one of the mons defined above to # By default, your deployment host will connect to one of the mons defined above to
# obtain a copy of your cluster's ceph.conf. If you prefer, uncomment ceph_conf_file # obtain a copy of your cluster's ceph.conf. If you prefer, uncomment ceph_conf_file
# and customise to avoid ceph.conf being copied from a mon. # and customise to avoid ceph.conf being copied from a mon.
#ceph_conf_file: | # ceph_conf_file: |
# [global] # [global]
# fsid = 00000000-1111-2222-3333-444444444444 # fsid = 00000000-1111-2222-3333-444444444444
# mon_initial_members = mon1.example.local,mon2.example.local,mon3.example.local # mon_initial_members = mon1.example.local,mon2.example.local,mon3.example.local
# mon_host = 10.16.5.40,10.16.5.41,10.16.5.42 # mon_host = 10.16.5.40,10.16.5.41,10.16.5.42
# # optionally, you can use this construct to avoid defining this list twice: # # optionally, you can use this construct to avoid defining this list twice:
# # mon_host = {{ ceph_mons|join(',') }} # # mon_host = {{ ceph_mons|join(',') }}
# auth_cluster_required = cephx # auth_cluster_required = cephx
# auth_service_required = cephx # auth_service_required = cephx
# By default, openstack-ansible configures all OpenStack services to talk to # By default, openstack-ansible configures all OpenStack services to talk to

2
scripts/gen-config.py
View File

@ -19,7 +19,7 @@ import argparse
import os import os
import sys import sys
from osa_toolki import tools from osa_toolkit import tools
def args(arg_list): def args(arg_list):

2
tests/test_manage.py
View File

@ -93,7 +93,7 @@ class TestRemoveIpfunction(unittest.TestCase):
mi.remove_inventory_item("log_hosts", inventory) mi.remove_inventory_item("log_hosts", inventory)
mi.remove_inventory_item("log_hosts", inventory, TARGET_DIR) mi.remove_inventory_item("log_hosts", inventory, TARGET_DIR)
# No make sure it's gone # Now make sure it's gone
self.assertIn('log_hosts', inventory) self.assertIn('log_hosts', inventory)
def test_metal_ips_kept(self): def test_metal_ips_kept(self):