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>

14 files changed, 0 insertions, 75 deletions

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