Skip to content

Adds DigitalOcean metadata service #133

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
paulaCrismaru wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Adds DigitalOcean metadata service #133

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion argus/config_generator/windows/cb_init.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,8 @@ class BasePopulatedCBInitConfig(base.BaseWindowsConfig):
util.EC2_SERVICE: "ec2service.EC2Service",
util.OPEN_NEBULA_SERVICE: "opennebulaservice.OpenNebulaService",
util.CLOUD_STACK_SERVICE: "cloudstack.CloudStack",
util.MAAS_SERVICE: "maasservice.MaaSHttpService"
util.MAAS_SERVICE: "maasservice.MaaSHttpService",
util.DIGITALOCEAN_SERVICE: "digitalocean.DigitalOceanService"
}

def __init__(self, client):
Expand Down
5 changes: 5 additions & 0 deletions argus/recipes/cloud/windows.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -831,3 +831,8 @@ def prepare_cbinit_config(self, service_type):
self._cbinit_conf.set_conf_value(
name="user_password_length",
value="3")


class DigitalOceanRecipe(CloudbaseinitRecipe):

config_group = util.DIGITALOCEAN_SERVICE
2 changes: 2 additions & 0 deletions argus/util.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,11 +54,13 @@
OPEN_NEBULA_SERVICE = 'opennebula'
CLOUD_STACK_SERVICE = 'cloudstack'
MAAS_SERVICE = 'maas'
DIGITALOCEAN_SERVICE = "digitalocean"

DEFAULT_METADATA_URL = {

@mateimicu mateimicu Jul 3, 2017

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

You could add the default metadata URL for DO (I think is this one http://169.254.169.254/metadata/v1/).

HTTP_SERVICE: "http://169.254.169.254/",
EC2_SERVICE: "http://169.254.169.254/",
CLOUD_STACK_SERVICE: "http://10.1.1.1/",
DIGITALOCEAN_SERVICE: "http://169.254.169.254/metadata/v1/",

OPEN_NEBULA_SERVICE: "",
MAAS_SERVICE: "",
Expand Down
7 changes: 7 additions & 0 deletions ci/tests.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -261,3 +261,10 @@ class ScenarioPasswordLength(BaseWindowsScenario):

test_classes = (test_smoke.TestPasswordLength,)
recipe_type = recipe.CloudbaseinitPasswordRecipe


class ScenarioDigitalOcean(BaseWindowsScenario):

test_classes = (smoke.TestNoError, )
service_type = util.DIGITALOCEAN_SERVICE
recipe_type = recipe.DigitalOceanRecipe
2 changes: 1 addition & 1 deletion requirements.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,4 +8,4 @@ oslo.config
python-keystoneclient
python-heatclient
cherrypy
git+https://github.com/cloudbase/arestor.git@master#egg=arestor-0.1.0
git+https://github.com/cloudbase/arestor.git@master#egg=arestor-0.1.1