diff options
-rw-r--r-- | modules/role/manifests/cryptoportfolio.pp | 2 | ||||
-rw-r--r-- | modules/role/templates/cryptoportfolio/api_conf.toml.erb | 8 | ||||
-rw-r--r-- | python/reboot_ovh_cloud_instance.py | 2 |
3 files changed, 10 insertions, 2 deletions
diff --git a/modules/role/manifests/cryptoportfolio.pp b/modules/role/manifests/cryptoportfolio.pp index 966f549..5aaaee3 100644 --- a/modules/role/manifests/cryptoportfolio.pp +++ b/modules/role/manifests/cryptoportfolio.pp | |||
@@ -7,7 +7,7 @@ class role::cryptoportfolio ( | |||
7 | String $pg_user, | 7 | String $pg_user, |
8 | String $pg_user_replication, | 8 | String $pg_user_replication, |
9 | String $pg_db, | 9 | String $pg_db, |
10 | Optional[String] $pg_hostname = "localhost", | 10 | Optional[String] $pg_hostname = "/run/postgresql", |
11 | Optional[String] $pg_port = "5432", | 11 | Optional[String] $pg_port = "5432", |
12 | Optional[String] $redis_host = "/run/redis/redis.sock", | 12 | Optional[String] $redis_host = "/run/redis/redis.sock", |
13 | Optional[String] $web_host = undef, | 13 | Optional[String] $web_host = undef, |
diff --git a/modules/role/templates/cryptoportfolio/api_conf.toml.erb b/modules/role/templates/cryptoportfolio/api_conf.toml.erb index 63f39c7..d806778 100644 --- a/modules/role/templates/cryptoportfolio/api_conf.toml.erb +++ b/modules/role/templates/cryptoportfolio/api_conf.toml.erb | |||
@@ -6,7 +6,13 @@ log_out="stdout" | |||
6 | user="<%= @pg_user %>" | 6 | user="<%= @pg_user %>" |
7 | password="<%= @pg_password %>" | 7 | password="<%= @pg_password %>" |
8 | database="<%= @pg_db %>" | 8 | database="<%= @pg_db %>" |
9 | address="<%= @pg_host %>" | 9 | <%- if @pg_hostname[0] == "/" -%> |
10 | type="unix" | ||
11 | address="<%= @pg_hostname %>/.s.PGSQL.<%= @pg_port %>" | ||
12 | <%- else -%> | ||
13 | type="tcp" | ||
14 | address="<%= @pg_hostname %>:<%= @pg_port %>" | ||
15 | <%- end -%> | ||
10 | 16 | ||
11 | <%- if !@redis_host.nil? && @redis_host != "" -%> | 17 | <%- if !@redis_host.nil? && @redis_host != "" -%> |
12 | [redis] | 18 | [redis] |
diff --git a/python/reboot_ovh_cloud_instance.py b/python/reboot_ovh_cloud_instance.py index de20c07..bd70e0b 100644 --- a/python/reboot_ovh_cloud_instance.py +++ b/python/reboot_ovh_cloud_instance.py | |||
@@ -26,3 +26,5 @@ if netboot_mode is not None: | |||
26 | instance["id"]), imageId=instance["imageId"], rescue=(netboot_mode == "rescue")) | 26 | instance["id"]), imageId=instance["imageId"], rescue=(netboot_mode == "rescue")) |
27 | print(result) | 27 | print(result) |
28 | 28 | ||
29 | # reboot normal: | ||
30 | #result = client.post("/cloud/project/{}/instance/{}/reboot".format(project, instance["id"]), type="soft") | ||