summaryrefslogtreecommitdiffstats
path: root/snaps
diff options
context:
space:
mode:
authorspisarski <s.pisarski@cablelabs.com>2017-06-21 11:38:35 -0600
committerspisarski <s.pisarski@cablelabs.com>2017-06-21 11:38:35 -0600
commit39b46e7e43dffff8f4abfbc142c9e28c9ce0d260 (patch)
tree3f603967cd8aab9f6811ff78697806bc60f5de17 /snaps
parent43512a64f87dacdb43fd03e58a210d10fb0e5da7 (diff)
Fixed launcher app to support new settings kwargs.
Additionally, found issue with importing ansible libraries. Needed to rename the snaps.provisioning.ansible package to 'ansible_pb'. JIRA: SNAPS-107 & SNAPS-93 Change-Id: I8c8628d3af5ce30849229ed47bfbb0ecaad5b3ad Signed-off-by: spisarski <s.pisarski@cablelabs.com>
Diffstat (limited to 'snaps')
-rw-r--r--snaps/openstack/create_network.py3
-rw-r--r--snaps/openstack/tests/openstack_tests.py205
-rw-r--r--snaps/provisioning/ansible/__init__.py15
-rw-r--r--snaps/provisioning/ansible/centos-network-setup/__init__.py15
-rw-r--r--snaps/provisioning/ansible/centos-network-setup/playbooks/__init__.py15
-rw-r--r--snaps/provisioning/ansible/ubuntu-network-setup/__init__.py15
-rw-r--r--snaps/provisioning/ansible/ubuntu-network-setup/playbooks/__init__.py15
-rw-r--r--snaps/provisioning/ansible_pb/__init__.py0
-rw-r--r--snaps/provisioning/ansible_pb/centos-network-setup/__init__.py0
-rw-r--r--snaps/provisioning/ansible_pb/centos-network-setup/playbooks/__init__.py0
-rw-r--r--snaps/provisioning/ansible_pb/centos-network-setup/playbooks/configure_host.yml (renamed from snaps/provisioning/ansible/centos-network-setup/playbooks/configure_host.yml)0
-rw-r--r--snaps/provisioning/ansible_pb/centos-network-setup/templates/ifcfg-interface (renamed from snaps/provisioning/ansible/centos-network-setup/templates/ifcfg-interface)0
-rw-r--r--snaps/provisioning/ansible_pb/ubuntu-network-setup/__init__.py0
-rw-r--r--snaps/provisioning/ansible_pb/ubuntu-network-setup/playbooks/__init__.py0
-rw-r--r--snaps/provisioning/ansible_pb/ubuntu-network-setup/playbooks/configure_host.yml (renamed from snaps/provisioning/ansible/ubuntu-network-setup/playbooks/configure_host.yml)0
-rw-r--r--snaps/provisioning/ansible_pb/ubuntu-network-setup/templates/ethN.cfg (renamed from snaps/provisioning/ansible/ubuntu-network-setup/templates/ethN.cfg)0
16 files changed, 136 insertions, 147 deletions
diff --git a/snaps/openstack/create_network.py b/snaps/openstack/create_network.py
index 8357313..3aa379b 100644
--- a/snaps/openstack/create_network.py
+++ b/snaps/openstack/create_network.py
@@ -413,6 +413,9 @@ class PortSettings:
For example, a virtual server.
:return:
"""
+ if 'port' in kwargs:
+ kwargs = kwargs['port']
+
self.network = None
self.name = kwargs.get('name')
diff --git a/snaps/openstack/tests/openstack_tests.py b/snaps/openstack/tests/openstack_tests.py
index 71d4d0e..bfcadaf 100644
--- a/snaps/openstack/tests/openstack_tests.py
+++ b/snaps/openstack/tests/openstack_tests.py
@@ -12,46 +12,53 @@
# 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.
-import pkg_resources
+import logging
import re
+import pkg_resources
from snaps import file_utils
-from snaps.openstack.utils import glance_utils
+from snaps.openstack.create_image import ImageSettings
from snaps.openstack.create_network import NetworkSettings, SubnetSettings
from snaps.openstack.create_router import RouterSettings
from snaps.openstack.os_credentials import OSCreds, ProxySettings
-from snaps.openstack.create_image import ImageSettings
-import logging
+from snaps.openstack.utils import glance_utils
__author__ = 'spisarski'
-
logger = logging.getLogger('openstack_tests')
-CIRROS_DEFAULT_IMAGE_URL = 'http://download.cirros-cloud.net/0.3.4/cirros-0.3.4-x86_64-disk.img'
-CIRROS_DEFAULT_KERNEL_IMAGE_URL = 'http://download.cirros-cloud.net/0.3.4/cirros-0.3.4-x86_64-kernel'
-CIRROS_DEFAULT_RAMDISK_IMAGE_URL = 'http://download.cirros-cloud.net/0.3.4/cirros-0.3.4-x86_64-initramfs'
+CIRROS_DEFAULT_IMAGE_URL =\
+ 'http://download.cirros-cloud.net/0.3.4/cirros-0.3.4-x86_64-disk.img'
+CIRROS_DEFAULT_KERNEL_IMAGE_URL =\
+ 'http://download.cirros-cloud.net/0.3.4/cirros-0.3.4-x86_64-kernel'
+CIRROS_DEFAULT_RAMDISK_IMAGE_URL =\
+ 'http://download.cirros-cloud.net/0.3.4/cirros-0.3.4-x86_64-initramfs'
CIRROS_USER = 'cirros'
-CENTOS_DEFAULT_IMAGE_URL = 'http://cloud.centos.org/centos/7/images/CentOS-7-x86_64-GenericCloud.qcow2'
+CENTOS_DEFAULT_IMAGE_URL =\
+ 'http://cloud.centos.org/centos/7/images/' \
+ 'CentOS-7-x86_64-GenericCloud.qcow2'
CENTOS_USER = 'centos'
-UBUNTU_DEFAULT_IMAGE_URL =\
- 'http://uec-images.ubuntu.com/releases/trusty/14.04/ubuntu-14.04-server-cloudimg-amd64-disk1.img'
+UBUNTU_DEFAULT_IMAGE_URL = \
+ 'http://uec-images.ubuntu.com/releases/trusty/14.04/' \
+ 'ubuntu-14.04-server-cloudimg-amd64-disk1.img'
UBUNTU_USER = 'ubuntu'
DEFAULT_IMAGE_FORMAT = 'qcow2'
-def get_credentials(os_env_file=None, proxy_settings_str=None, ssh_proxy_cmd=None, dev_os_env_file=None):
+def get_credentials(os_env_file=None, proxy_settings_str=None,
+ ssh_proxy_cmd=None, dev_os_env_file=None):
"""
- Returns the OpenStack credentials object. It first attempts to retrieve them from a standard OpenStack source file.
- If that file is None, it will attempt to retrieve them with a YAML file.
- it will retrieve them from a
+ Returns the OpenStack credentials object. It first attempts to retrieve
+ them from a standard OpenStack source file. If that file is None, it will
+ attempt to retrieve them with a YAML file.
:param os_env_file: the OpenStack source file
:param proxy_settings_str: proxy settings string <host>:<port> (optional)
:param ssh_proxy_cmd: the SSH proxy command for your environment (optional)
- :param dev_os_env_file: the YAML file to retrieve both the OS credentials and proxy settings
+ :param dev_os_env_file: the YAML file to retrieve both the OS credentials
+ and proxy settings
:return: the SNAPS credentials object
"""
if os_env_file:
@@ -101,31 +108,42 @@ def get_credentials(os_env_file=None, proxy_settings_str=None, ssh_proxy_cmd=Non
proxy_str = config.get('http_proxy')
if proxy_str:
tokens = re.split(':', proxy_str)
- proxy_settings = ProxySettings(tokens[0], tokens[1], config.get('ssh_proxy_cmd'))
-
- os_creds = OSCreds(username=config['username'], password=config['password'],
- auth_url=config['os_auth_url'], project_name=config['project_name'],
- identity_api_version=identity_api_version, image_api_version=image_api_version,
+ proxy_settings = ProxySettings(tokens[0], tokens[1],
+ config.get('ssh_proxy_cmd'))
+
+ os_creds = OSCreds(username=config['username'],
+ password=config['password'],
+ auth_url=config['os_auth_url'],
+ project_name=config['project_name'],
+ identity_api_version=identity_api_version,
+ image_api_version=image_api_version,
proxy_settings=proxy_settings)
logger.info('OS Credentials = ' + str(os_creds))
return os_creds
-def create_image_settings(image_name, image_user, image_format, metadata, disk_url=None, default_url=None,
- kernel_settings=None, ramdisk_settings=None, public=False, nic_config_pb_loc=None):
+def create_image_settings(image_name, image_user, image_format, metadata,
+ disk_url=None, default_url=None,
+ kernel_settings=None, ramdisk_settings=None,
+ public=False, nic_config_pb_loc=None):
"""
Returns the image settings object
:param image_name: the name of the image
:param image_user: the image's sudo user
:param image_format: the image's format string
- :param metadata: custom metadata for overriding default behavior for test image settings
+ :param metadata: custom metadata for overriding default behavior for test
+ image settings
:param disk_url: the disk image's URL
:param default_url: the default URL for the disk image
- :param kernel_settings: override to the kernel settings from the image_metadata
- :param ramdisk_settings: override to the ramdisk settings from the image_metadata
- :param public: True denotes image can be used by other projects where False indicates the converse (default: False)
- :param nic_config_pb_loc: The location of the playbook used for configuring multiple NICs
+ :param kernel_settings: override to the kernel settings from the
+ image_metadata
+ :param ramdisk_settings: override to the ramdisk settings from the
+ image_metadata
+ :param public: True denotes image can be used by other projects where False
+ indicates the converse (default: False)
+ :param nic_config_pb_loc: The location of the playbook used for configuring
+ multiple NICs
:return:
"""
@@ -143,17 +161,25 @@ def create_image_settings(image_name, image_user, image_format, metadata, disk_u
else:
disk_url = disk_url
- if metadata and ('kernel_file' in metadata or 'kernel_url' in metadata) and kernel_settings is None:
+ if metadata and \
+ ('kernel_file' in metadata or 'kernel_url' in metadata) and \
+ kernel_settings is None:
kernel_image_settings = ImageSettings(
- name=image_name + '-kernel', image_user=image_user, img_format=image_format,
- image_file=metadata.get('kernel_file'), url=metadata.get('kernel_url'), public=public)
+ name=image_name + '-kernel', image_user=image_user,
+ img_format=image_format,
+ image_file=metadata.get('kernel_file'),
+ url=metadata.get('kernel_url'), public=public)
else:
kernel_image_settings = kernel_settings
- if metadata and ('ramdisk_file' in metadata or 'ramdisk_url' in metadata) and ramdisk_settings is None:
+ if metadata and \
+ ('ramdisk_file' in metadata or 'ramdisk_url' in metadata) and \
+ ramdisk_settings is None:
ramdisk_image_settings = ImageSettings(
- name=image_name + '-ramdisk', image_user=image_user, img_format=image_format,
- image_file=metadata.get('ramdisk_file'), url=metadata.get('ramdisk_url'), public=public)
+ name=image_name + '-ramdisk', image_user=image_user,
+ img_format=image_format,
+ image_file=metadata.get('ramdisk_file'),
+ url=metadata.get('ramdisk_url'), public=public)
else:
ramdisk_image_settings = ramdisk_settings
@@ -161,22 +187,30 @@ def create_image_settings(image_name, image_user, image_format, metadata, disk_u
if metadata and 'extra_properties' in metadata:
extra_properties = metadata['extra_properties']
- return ImageSettings(name=image_name, image_user=image_user, img_format=image_format, image_file=disk_file,
- url=disk_url, extra_properties=extra_properties, kernel_image_settings=kernel_image_settings,
- ramdisk_image_settings=ramdisk_image_settings, public=public,
+ return ImageSettings(name=image_name, image_user=image_user,
+ img_format=image_format, image_file=disk_file,
+ url=disk_url, extra_properties=extra_properties,
+ kernel_image_settings=kernel_image_settings,
+ ramdisk_image_settings=ramdisk_image_settings,
+ public=public,
nic_config_pb_loc=nic_config_pb_loc)
-def cirros_image_settings(name=None, url=None, image_metadata=None, kernel_settings=None, ramdisk_settings=None,
+def cirros_image_settings(name=None, url=None, image_metadata=None,
+ kernel_settings=None, ramdisk_settings=None,
public=False):
"""
Returns the image settings for a Cirros QCOW2 image
:param name: the name of the image
:param url: the image's URL
- :param image_metadata: dict() values to override URLs for disk, kernel, and ramdisk
- :param kernel_settings: override to the kernel settings from the image_metadata
- :param ramdisk_settings: override to the ramdisk settings from the image_metadata
- :param public: True denotes image can be used by other projects where False indicates the converse
+ :param image_metadata: dict() values to override URLs for disk, kernel, and
+ ramdisk
+ :param kernel_settings: override to the kernel settings from the
+ image_metadata
+ :param ramdisk_settings: override to the ramdisk settings from the
+ image_metadata
+ :param public: True denotes image can be used by other projects where False
+ indicates the converse
:return:
"""
if image_metadata and 'cirros' in image_metadata:
@@ -185,25 +219,33 @@ def cirros_image_settings(name=None, url=None, image_metadata=None, kernel_setti
metadata = image_metadata
return create_image_settings(
- image_name=name, image_user=CIRROS_USER, image_format=DEFAULT_IMAGE_FORMAT, metadata=metadata, disk_url=url,
+ image_name=name, image_user=CIRROS_USER,
+ image_format=DEFAULT_IMAGE_FORMAT, metadata=metadata, disk_url=url,
default_url=CIRROS_DEFAULT_IMAGE_URL,
- kernel_settings=kernel_settings, ramdisk_settings=ramdisk_settings, public=public)
+ kernel_settings=kernel_settings, ramdisk_settings=ramdisk_settings,
+ public=public)
def file_image_test_settings(name, file_path, image_user=CIRROS_USER):
- return ImageSettings(name=name, image_user=image_user, img_format=DEFAULT_IMAGE_FORMAT, image_file=file_path)
+ return ImageSettings(name=name, image_user=image_user,
+ img_format=DEFAULT_IMAGE_FORMAT, image_file=file_path)
-def centos_image_settings(name, url=None, image_metadata=None, kernel_settings=None, ramdisk_settings=None,
+def centos_image_settings(name, url=None, image_metadata=None,
+ kernel_settings=None, ramdisk_settings=None,
public=False):
"""
Returns the image settings for a Centos QCOW2 image
:param name: the name of the image
:param url: the image's URL
- :param image_metadata: dict() values to override URLs for disk, kernel, and ramdisk
- :param kernel_settings: override to the kernel settings from the image_metadata
- :param ramdisk_settings: override to the ramdisk settings from the image_metadata
- :param public: True denotes image can be used by other projects where False indicates the converse
+ :param image_metadata: dict() values to override URLs for disk, kernel, and
+ ramdisk
+ :param kernel_settings: override to the kernel settings from the
+ image_metadata
+ :param ramdisk_settings: override to the ramdisk settings from the
+ image_metadata
+ :param public: True denotes image can be used by other projects where False
+ indicates the converse
:return:
"""
if image_metadata and 'centos' in image_metadata:
@@ -211,24 +253,32 @@ def centos_image_settings(name, url=None, image_metadata=None, kernel_settings=N
else:
metadata = image_metadata
- pb_path = pkg_resources.resource_filename('snaps.provisioning.ansible.centos-network-setup.playbooks',
- 'configure_host.yml')
+ pb_path = pkg_resources.resource_filename(
+ 'snaps.provisioning.ansible_pb.centos-network-setup.playbooks',
+ 'configure_host.yml')
return create_image_settings(
- image_name=name, image_user=CENTOS_USER, image_format=DEFAULT_IMAGE_FORMAT, metadata=metadata, disk_url=url,
+ image_name=name, image_user=CENTOS_USER,
+ image_format=DEFAULT_IMAGE_FORMAT, metadata=metadata, disk_url=url,
default_url=CENTOS_DEFAULT_IMAGE_URL,
- kernel_settings=kernel_settings, ramdisk_settings=ramdisk_settings, public=public, nic_config_pb_loc=pb_path)
+ kernel_settings=kernel_settings, ramdisk_settings=ramdisk_settings,
+ public=public, nic_config_pb_loc=pb_path)
-def ubuntu_image_settings(name, url=None, image_metadata=None, kernel_settings=None, ramdisk_settings=None,
+def ubuntu_image_settings(name, url=None, image_metadata=None,
+ kernel_settings=None, ramdisk_settings=None,
public=False):
"""
Returns the image settings for a Ubuntu QCOW2 image
:param name: the name of the image
:param url: the image's URL
- :param image_metadata: dict() values to override URLs for disk, kernel, and ramdisk
- :param kernel_settings: override to the kernel settings from the image_metadata
- :param ramdisk_settings: override to the ramdisk settings from the image_metadata
- :param public: True denotes image can be used by other projects where False indicates the converse
+ :param image_metadata: dict() values to override URLs for disk, kernel, and
+ ramdisk
+ :param kernel_settings: override to the kernel settings from the
+ image_metadata
+ :param ramdisk_settings: override to the ramdisk settings from the
+ image_metadata
+ :param public: True denotes image can be used by other projects where False
+ indicates the converse
:return:
"""
if image_metadata and 'ubuntu' in image_metadata:
@@ -236,20 +286,27 @@ def ubuntu_image_settings(name, url=None, image_metadata=None, kernel_settings=N
else:
metadata = image_metadata
- pb_path = pkg_resources.resource_filename('snaps.provisioning.ansible.ubuntu-network-setup.playbooks',
- 'configure_host.yml')
+ pb_path = pkg_resources.resource_filename(
+ 'snaps.provisioning.ansible_pb.ubuntu-network-setup.playbooks',
+ 'configure_host.yml')
return create_image_settings(
- image_name=name, image_user=UBUNTU_USER, image_format=DEFAULT_IMAGE_FORMAT, metadata=metadata, disk_url=url,
+ image_name=name, image_user=UBUNTU_USER,
+ image_format=DEFAULT_IMAGE_FORMAT, metadata=metadata, disk_url=url,
default_url=UBUNTU_DEFAULT_IMAGE_URL,
- kernel_settings=kernel_settings, ramdisk_settings=ramdisk_settings, public=public, nic_config_pb_loc=pb_path)
+ kernel_settings=kernel_settings, ramdisk_settings=ramdisk_settings,
+ public=public, nic_config_pb_loc=pb_path)
-def get_priv_net_config(net_name, subnet_name, router_name=None, cidr='10.55.0.0/24', external_net=None):
- return OSNetworkConfig(net_name, subnet_name, cidr, router_name, external_gateway=external_net)
+def get_priv_net_config(net_name, subnet_name, router_name=None,
+ cidr='10.55.0.0/24', external_net=None):
+ return OSNetworkConfig(net_name, subnet_name, cidr, router_name,
+ external_gateway=external_net)
-def get_pub_net_config(net_name, subnet_name=None, router_name=None, cidr='10.55.1.0/24', external_net=None):
- return OSNetworkConfig(net_name, subnet_name, cidr, router_name, external_gateway=external_net)
+def get_pub_net_config(net_name, subnet_name=None, router_name=None,
+ cidr='10.55.1.0/24', external_net=None):
+ return OSNetworkConfig(net_name, subnet_name, cidr, router_name,
+ external_gateway=external_net)
class OSNetworkConfig:
@@ -257,17 +314,21 @@ class OSNetworkConfig:
Represents the settings required for the creation of a network in OpenStack
"""
- def __init__(self, net_name, subnet_name=None, subnet_cidr=None, router_name=None, external_gateway=None):
+ def __init__(self, net_name, subnet_name=None, subnet_cidr=None,
+ router_name=None, external_gateway=None):
if subnet_name and subnet_cidr:
self.network_settings = NetworkSettings(
- name=net_name, subnet_settings=[SubnetSettings(cidr=subnet_cidr, name=subnet_name)])
+ name=net_name, subnet_settings=[
+ SubnetSettings(cidr=subnet_cidr, name=subnet_name)])
else:
self.network_settings = NetworkSettings(name=net_name)
if router_name:
if subnet_name:
- self.router_settings = RouterSettings(name=router_name, external_gateway=external_gateway,
- internal_subnets=[subnet_name])
+ self.router_settings = RouterSettings(
+ name=router_name, external_gateway=external_gateway,
+ internal_subnets=[subnet_name])
else:
- self.router_settings = RouterSettings(name=router_name, external_gateway=external_gateway)
+ self.router_settings = RouterSettings(
+ name=router_name, external_gateway=external_gateway)
diff --git a/snaps/provisioning/ansible/__init__.py b/snaps/provisioning/ansible/__init__.py
deleted file mode 100644
index e3e876e..0000000
--- a/snaps/provisioning/ansible/__init__.py
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright (c) 2016 Cable Television Laboratories, Inc. ("CableLabs")
-# and others. All rights reserved.
-#
-# 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.
-__author__ = 'spisarski'
diff --git a/snaps/provisioning/ansible/centos-network-setup/__init__.py b/snaps/provisioning/ansible/centos-network-setup/__init__.py
deleted file mode 100644
index e3e876e..0000000
--- a/snaps/provisioning/ansible/centos-network-setup/__init__.py
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright (c) 2016 Cable Television Laboratories, Inc. ("CableLabs")
-# and others. All rights reserved.
-#
-# 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.
-__author__ = 'spisarski'
diff --git a/snaps/provisioning/ansible/centos-network-setup/playbooks/__init__.py b/snaps/provisioning/ansible/centos-network-setup/playbooks/__init__.py
deleted file mode 100644
index e3e876e..0000000
--- a/snaps/provisioning/ansible/centos-network-setup/playbooks/__init__.py
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright (c) 2016 Cable Television Laboratories, Inc. ("CableLabs")
-# and others. All rights reserved.
-#
-# 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.
-__author__ = 'spisarski'
diff --git a/snaps/provisioning/ansible/ubuntu-network-setup/__init__.py b/snaps/provisioning/ansible/ubuntu-network-setup/__init__.py
deleted file mode 100644
index e3e876e..0000000
--- a/snaps/provisioning/ansible/ubuntu-network-setup/__init__.py
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright (c) 2016 Cable Television Laboratories, Inc. ("CableLabs")
-# and others. All rights reserved.
-#
-# 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.
-__author__ = 'spisarski'
diff --git a/snaps/provisioning/ansible/ubuntu-network-setup/playbooks/__init__.py b/snaps/provisioning/ansible/ubuntu-network-setup/playbooks/__init__.py
deleted file mode 100644
index e3e876e..0000000
--- a/snaps/provisioning/ansible/ubuntu-network-setup/playbooks/__init__.py
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright (c) 2016 Cable Television Laboratories, Inc. ("CableLabs")
-# and others. All rights reserved.
-#
-# 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.
-__author__ = 'spisarski'
diff --git a/snaps/provisioning/ansible_pb/__init__.py b/snaps/provisioning/ansible_pb/__init__.py
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/snaps/provisioning/ansible_pb/__init__.py
diff --git a/snaps/provisioning/ansible_pb/centos-network-setup/__init__.py b/snaps/provisioning/ansible_pb/centos-network-setup/__init__.py
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/snaps/provisioning/ansible_pb/centos-network-setup/__init__.py
diff --git a/snaps/provisioning/ansible_pb/centos-network-setup/playbooks/__init__.py b/snaps/provisioning/ansible_pb/centos-network-setup/playbooks/__init__.py
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/snaps/provisioning/ansible_pb/centos-network-setup/playbooks/__init__.py
diff --git a/snaps/provisioning/ansible/centos-network-setup/playbooks/configure_host.yml b/snaps/provisioning/ansible_pb/centos-network-setup/playbooks/configure_host.yml
index 8df03cb..8df03cb 100644
--- a/snaps/provisioning/ansible/centos-network-setup/playbooks/configure_host.yml
+++ b/snaps/provisioning/ansible_pb/centos-network-setup/playbooks/configure_host.yml
diff --git a/snaps/provisioning/ansible/centos-network-setup/templates/ifcfg-interface b/snaps/provisioning/ansible_pb/centos-network-setup/templates/ifcfg-interface
index 47aa3fa..47aa3fa 100644
--- a/snaps/provisioning/ansible/centos-network-setup/templates/ifcfg-interface
+++ b/snaps/provisioning/ansible_pb/centos-network-setup/templates/ifcfg-interface
diff --git a/snaps/provisioning/ansible_pb/ubuntu-network-setup/__init__.py b/snaps/provisioning/ansible_pb/ubuntu-network-setup/__init__.py
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/snaps/provisioning/ansible_pb/ubuntu-network-setup/__init__.py
diff --git a/snaps/provisioning/ansible_pb/ubuntu-network-setup/playbooks/__init__.py b/snaps/provisioning/ansible_pb/ubuntu-network-setup/playbooks/__init__.py
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/snaps/provisioning/ansible_pb/ubuntu-network-setup/playbooks/__init__.py
diff --git a/snaps/provisioning/ansible/ubuntu-network-setup/playbooks/configure_host.yml b/snaps/provisioning/ansible_pb/ubuntu-network-setup/playbooks/configure_host.yml
index 5d43f96..5d43f96 100644
--- a/snaps/provisioning/ansible/ubuntu-network-setup/playbooks/configure_host.yml
+++ b/snaps/provisioning/ansible_pb/ubuntu-network-setup/playbooks/configure_host.yml
diff --git a/snaps/provisioning/ansible/ubuntu-network-setup/templates/ethN.cfg b/snaps/provisioning/ansible_pb/ubuntu-network-setup/templates/ethN.cfg
index 3fa7708..3fa7708 100644
--- a/snaps/provisioning/ansible/ubuntu-network-setup/templates/ethN.cfg
+++ b/snaps/provisioning/ansible_pb/ubuntu-network-setup/templates/ethN.cfg