From c22247be81e29276fa40072413f1194d95ef6d49 Mon Sep 17 00:00:00 2001
From: Tiago Ilieve <tiago.myhro@gmail.com>
Date: Thu, 28 Jan 2016 23:20:25 -0200
Subject: [PATCH] oracle: remove cloud-init customization

It is working now out-of-the-box with "Ec2" metadata source.
---
 bootstrapvz/providers/oracle/README.md        |  2 --
 bootstrapvz/providers/oracle/__init__.py      |  3 --
 .../oracle/assets/cloud-init/90_dpkg.cfg      |  4 ---
 bootstrapvz/providers/oracle/tasks/network.py | 11 -------
 .../examples/oracle/jessie-cloud-init.yml     | 30 -------------------
 manifests/examples/oracle/jessie.yml          |  5 ++--
 6 files changed, 3 insertions(+), 52 deletions(-)
 delete mode 100644 bootstrapvz/providers/oracle/assets/cloud-init/90_dpkg.cfg
 delete mode 100644 manifests/examples/oracle/jessie-cloud-init.yml

diff --git a/bootstrapvz/providers/oracle/README.md b/bootstrapvz/providers/oracle/README.md
index 5fd0429..c574dc8 100644
--- a/bootstrapvz/providers/oracle/README.md
+++ b/bootstrapvz/providers/oracle/README.md
@@ -32,5 +32,3 @@ Create a new local branch from this one:
 Bootstrap a new image:
 
     $ sudo ./bootstrap-vz --debug manifests/examples/oracle/jessie.yml
-
-P.s.: you probably want to change the root password define on the example manifest, as `cloud-init` isn't properly fetching public keys on Oracle Compute Cloud right now.
diff --git a/bootstrapvz/providers/oracle/__init__.py b/bootstrapvz/providers/oracle/__init__.py
index a1bc29a..ada07fb 100644
--- a/bootstrapvz/providers/oracle/__init__.py
+++ b/bootstrapvz/providers/oracle/__init__.py
@@ -29,9 +29,6 @@ def resolve_tasks(taskset, manifest):
 	                tasks.network.InstallDHCPCD,
 	                ])
 
-	if 'cloud_init' in manifest.plugins:
-		taskset.add(tasks.network.SetCloudInitMetadataURL)
-
 
 def resolve_rollback_tasks(taskset, manifest, completed, counter_task):
 	taskset.update(task_groups.get_standard_rollback_tasks(completed))
diff --git a/bootstrapvz/providers/oracle/assets/cloud-init/90_dpkg.cfg b/bootstrapvz/providers/oracle/assets/cloud-init/90_dpkg.cfg
deleted file mode 100644
index b064094..0000000
--- a/bootstrapvz/providers/oracle/assets/cloud-init/90_dpkg.cfg
+++ /dev/null
@@ -1,4 +0,0 @@
-# Created by bootstrap-vz, can be generated using "dpkg-reconfigure cloud-init"
-datasource:
-  Ec2:
-    metadata_urls: [ 'http://192.0.0.192/' ]
diff --git a/bootstrapvz/providers/oracle/tasks/network.py b/bootstrapvz/providers/oracle/tasks/network.py
index b18e0dc..8eb9271 100644
--- a/bootstrapvz/providers/oracle/tasks/network.py
+++ b/bootstrapvz/providers/oracle/tasks/network.py
@@ -14,14 +14,3 @@ class InstallDHCPCD(Task):
 		info.packages.add('dhcpcd5')
 		info.exclude_packages.add('isc-dhcp-client')
 		info.exclude_packages.add('isc-dhcp-common')
-
-
-class SetCloudInitMetadataURL(Task):
-	description = 'Setting cloud-init metadata URL'
-	phase = phases.system_modification
-
-	@classmethod
-	def run(cls, info):
-		cfg_src = os.path.join(assets, 'cloud-init/90_dpkg.cfg')
-		cfg_dst = os.path.join(info.root, 'etc/cloud/cloud.cfg.d/90_dpkg.cfg')
-		shutil.copy(cfg_src, cfg_dst)
diff --git a/manifests/examples/oracle/jessie-cloud-init.yml b/manifests/examples/oracle/jessie-cloud-init.yml
deleted file mode 100644
index e22be39..0000000
--- a/manifests/examples/oracle/jessie-cloud-init.yml
+++ /dev/null
@@ -1,30 +0,0 @@
----
-name: debian-{system.release}-{system.architecture}-{%Y}{%m}{%d}
-provider:
-  name: oracle
-bootstrapper:
-  workspace: /target
-system:
-  release: jessie
-  architecture: amd64
-  bootloader: grub
-  charmap: UTF-8
-  locale: en_US
-  timezone: UTC
-volume:
-  backing: raw
-  partitions:
-    type: msdos
-    root:
-      filesystem: ext4
-      size: 8GiB
-packages:
-  install:
-      - initramfs-tools
-      - /tmp/linux-image-3.16.7-ckt11-gzip-1_amd64.deb
-plugins:
-  cloud_init:
-    username: opc
-    metadata_sources: Ec2
-  root_password:
-    password: ARealSecurePassword
diff --git a/manifests/examples/oracle/jessie.yml b/manifests/examples/oracle/jessie.yml
index 46a205d..f01e64b 100644
--- a/manifests/examples/oracle/jessie.yml
+++ b/manifests/examples/oracle/jessie.yml
@@ -23,5 +23,6 @@ packages:
       - initramfs-tools
       - /tmp/linux-image-3.16.7-ckt11-gzip-1_amd64.deb
 plugins:
-  root_password:
-    password: ARealSecurePassword
+  cloud_init:
+    username: opc
+    metadata_sources: Ec2