airship
/
drydock
Code Issues Proposed changes

Clean missed merge conflicts

This commit is contained in:
Scott Hussey 2017-07-13 21:06:02 -05:00
parent eca07e47e4
commit ae5d18cb12
2 changed files with 0 additions and 57 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
drydock_provisioner/drydock.py
View File

@ -12,15 +12,10 @@
# See the License for the specific language governing permissions and
# limitations under the License.
import logging
<<<<<<< HEAD
import sys
import os
from oslo_config import cfg
=======
from oslo_config import cfg
import sys
>>>>>>> attcomdev/master
import drydock_provisioner.config as config
import drydock_provisioner.objects as objects
@ -42,11 +37,7 @@ def start_drydock():
cfg.CONF(sys.argv[1:])
if cfg.CONF.debug:
<<<<<<< HEAD
cfg.CONF.set_override(name='log_level', override='DEBUG', group='logging')
=======
cfg.CONF.logging.log_level = 'DEBUG'
>>>>>>> attcomdev/master
# Setup root logger
logger = logging.getLogger(cfg.CONF.logging.global_logger_name)
@ -72,7 +63,6 @@ def start_drydock():
input_ingester = ingester.Ingester()
input_ingester.enable_plugins(cfg.CONF.plugins.ingester)
<<<<<<< HEAD
# Check if we have an API key in the environment
# Hack around until we move MaaS configs to the YAML schema
if 'MAAS_API_KEY' in os.environ:
@ -85,14 +75,6 @@ def start_drydock():
cfg.CONF.log_opt_values(logging.getLogger(cfg.CONF.logging.global_logger_name), logging.DEBUG)
return wsgi_callable
=======
# Now that loggers are configured, log the effective config
cfg.CONF.log_opt_values(logging.getLogger(cfg.CONF.logging.global_logger_name), logging.DEBUG)
# Now that loggers are configured, log the effective config
drydock_provisioner.conf.log_opt_values(logging.getLogger(drydock_provisioner.conf.logging.global_logger_name), logging.DEBUG)
>>>>>>> attcomdev/master
drydock = start_drydock()

39
drydock_provisioner/ingester/plugins/yaml.py
View File

@ -272,19 +272,10 @@ class YamlIngester(IngesterPlugin):
storage = spec.get('storage', {})
model.storage_layout = storage.get('layout', 'lvm')
<<<<<<< HEAD
bootdisk = storage.get('bootdisk', {})
model.bootdisk_device = bootdisk.get('device', None)
model.bootdisk_root_size = bootdisk.get('root_size', None)
model.bootdisk_boot_size = bootdisk.get('boot_size', None)
=======
model.oob_parameters = {}
for k,v in oob.items():
if k == 'type':
model.oob_type = oob.get('type', None)
else:
model.oob_parameters[k] = v
>>>>>>> attcomdev/master
partitions = storage.get('partitions', [])
model.partitions = objects.HostPartitionList()
@ -317,13 +308,8 @@ class YamlIngester(IngesterPlugin):
int_model.hardware_slaves = []
slaves = i.get('slaves', [])
<<<<<<< HEAD
for s in slaves:
int_model.hardware_slaves.append(s)
=======
int_model.device_name = i.get('device_name', None)
int_model.network_link = i.get('device_link', None)
>>>>>>> attcomdev/master
int_model.networks = []
networks = i.get('networks', [])
@ -347,24 +333,6 @@ class YamlIngester(IngesterPlugin):
node_metadata = spec.get('metadata', {})
metadata_tags = node_metadata.get('tags', [])
<<<<<<< HEAD
model.tags = [t for t in metadata_tags]
=======
platform = spec.get('platform', {})
model.image = platform.get('image', None)
model.kernel = platform.get('kernel', None)
model.kernel_params = {}
for k, v in platform.get('kernel_params', {}).items():
model.kernel_params[k] = v
model.primary_network = spec.get('primary_network', None)
node_metadata = spec.get('metadata', {})
metadata_tags = node_metadata.get('tags', [])
model.tags = []
>>>>>>> attcomdev/master
owner_data = node_metadata.get('owner_data', {})
model.owner_data = {}
@ -377,14 +345,7 @@ class YamlIngester(IngesterPlugin):
if kind == 'BaremetalNode':
model.boot_mac = node_metadata.get('boot_mac', None)
<<<<<<< HEAD
addresses = spec.get('addressing', [])
=======
if kind == 'BaremetalNode':
model.boot_mac = node_metadata.get('boot_mac', None)
addresses = spec.get('addressing', [])
>>>>>>> attcomdev/master
if len(addresses) == 0:
raise ValueError('BaremetalNode needs at least' \