diff --git a/resources/mariadb_db/actions/update.yaml b/resources/mariadb_db/actions/update.yaml deleted file mode 100644 index 11adc5ba..00000000 --- a/resources/mariadb_db/actions/update.yaml +++ /dev/null @@ -1,13 +0,0 @@ -- hosts: [{{host}}] - sudo: yes - tasks: - - name: mariadb db - mysql_db: - name: {{ db_name }} - state: present - login_user: root - login_password: {{ login_password }} - login_port: {{ login_port }} - login_host: {{db_host}} - collation: {{collation}} - encoding: {{encoding}} diff --git a/resources/mariadb_db/meta.yaml b/resources/mariadb_db/meta.yaml index 9eda22e5..0f452078 100644 --- a/resources/mariadb_db/meta.yaml +++ b/resources/mariadb_db/meta.yaml @@ -4,6 +4,7 @@ version: 1.0.0 actions: run: run.yaml remove: remove.yaml + update: run.yaml input: db_name: schema: str! diff --git a/resources/mariadb_service/actions/update.yaml b/resources/mariadb_service/actions/update.yaml deleted file mode 100644 index 7a10334c..00000000 --- a/resources/mariadb_service/actions/update.yaml +++ /dev/null @@ -1,21 +0,0 @@ -- hosts: [{{host}}] - sudo: yes - tasks: - - file: path=/var/lib/docker/data/{{resource_name}} state=directory - - name: mariadb container - docker: - name: {{ resource_name }} - image: {{ image }} - state: reloaded - ports: - - {{ port }}:3306 - env: - MYSQL_ROOT_PASSWORD: {{ root_password }} - volumes: - - /var/lib/docker/data/{{resource_name}}:/var/lib/mysql - - - shell: docker exec -t {{ resource_name }} mysql -p{{ root_password }} -uroot -e "SELECT 1" - register: result - until: result.rc == 0 - retries: 30 - delay: 0.5 diff --git a/resources/mariadb_service/meta.yaml b/resources/mariadb_service/meta.yaml index b440fe03..d7a32ca6 100644 --- a/resources/mariadb_service/meta.yaml +++ b/resources/mariadb_service/meta.yaml @@ -1,6 +1,9 @@ id: mariadb_service handler: ansible version: 1.0.0 +actions: + run: run.yaml + update: run.yaml input: image: schema: str! diff --git a/resources/neutron_server_puppet/actions/update.pp b/resources/neutron_server_puppet/actions/update.pp deleted file mode 100644 index 1d7d8315..00000000 --- a/resources/neutron_server_puppet/actions/update.pp +++ /dev/null @@ -1,93 +0,0 @@ -$resource = hiera($::resource_name) - -$ip = $resource['input']['ip']['value'] - -$db_user = $resource['input']['db_user']['value'] -$db_host = $resource['input']['db_host']['value'] -$db_port = $resource['input']['db_port']['value'] -$db_password = $resource['input']['db_password']['value'] -$db_name = $resource['input']['db_name']['value'] - -$package_ensure = $resource['input']['package_ensure']['value'] -$auth_password = $resource['input']['auth_password']['value'] -$auth_type = $resource['input']['auth_type']['value'] -$auth_host = $resource['input']['auth_host']['value'] -$auth_port = $resource['input']['auth_port']['value'] -$auth_admin_prefix = $resource['input']['auth_admin_prefix']['value'] -$auth_tenant = $resource['input']['auth_tenant']['value'] -$auth_user = $resource['input']['auth_user']['value'] -$auth_protocol = $resource['input']['auth_protocol']['value'] -$auth_uri = $resource['input']['auth_uri']['value'] -$database_max_retries = $resource['input']['database_max_retries']['value'] -$database_idle_timeout = $resource['input']['database_idle_timeout']['value'] -$database_retry_interval = $resource['input']['database_retry_interval']['value'] -$database_min_pool_size = $resource['input']['database_min_pool_size']['value'] -$database_max_pool_size = $resource['input']['database_max_pool_size']['value'] -$database_max_overflow = $resource['input']['database_max_overflow']['value'] -$sync_db = $resource['input']['sync_db']['value'] -$api_workers = $resource['input']['api_workers']['value'] -$rpc_workers = $resource['input']['rpc_workers']['value'] -$agent_down_time = $resource['input']['agent_down_time']['value'] -$router_scheduler_driver = $resource['input']['router_scheduler_driver']['value'] -$router_distributed = $resource['input']['router_distributed']['value'] -$l3_ha = $resource['input']['l3_ha']['value'] -$max_l3_agents_per_router = $resource['input']['max_l3_agents_per_router']['value'] -$min_l3_agents_per_router = $resource['input']['min_l3_agents_per_router']['value'] -$l3_ha_net_cidr = $resource['input']['l3_ha_net_cidr']['value'] -$mysql_module = $resource['input']['mysql_module']['value'] -$sql_max_retries = $resource['input']['sql_max_retries']['value'] -$max_retries = $resource['input']['max_retries']['value'] -$sql_idle_timeout = $resource['input']['sql_idle_timeout']['value'] -$idle_timeout = $resource['input']['idle_timeout']['value'] -$sql_reconnect_interval = $resource['input']['sql_reconnect_interval']['value'] -$retry_interval = $resource['input']['retry_interval']['value'] -$log_dir = $resource['input']['log_dir']['value'] -$log_file = $resource['input']['log_file']['value'] -$report_interval = $resource['input']['report_interval']['value'] - -class { 'neutron::server': - enabled => true, - manage_service => true, - database_connection => "mysql://${db_user}:${db_password}@${db_host}:${db_port}/${db_name}", - package_ensure => $package_ensure, - auth_password => $auth_password, - auth_type => $auth_type, - auth_host => $auth_host, - auth_port => $auth_port, - auth_admin_prefix => $auth_admin_prefix, - auth_tenant => $auth_tenant, - auth_user => $auth_user, - auth_protocol => $auth_protocol, - auth_uri => $auth_uri, - database_max_retries => $database_max_retries, - database_idle_timeout => $database_idle_timeout, - database_retry_interval => $database_retry_interval, - database_min_pool_size => $database_min_pool_size, - database_max_pool_size => $database_max_pool_size, - database_max_overflow => $database_max_overflow, - sync_db => $sync_db, - api_workers => $api_workers, - rpc_workers => $rpc_workers, - agent_down_time => $agent_down_time, - router_scheduler_driver => $router_scheduler_driver, - router_distributed => $router_distributed, - l3_ha => $l3_ha, - max_l3_agents_per_router => $max_l3_agents_per_router, - min_l3_agents_per_router => $min_l3_agents_per_router, - l3_ha_net_cidr => $l3_ha_net_cidr, - mysql_module => $mysql_module, - sql_max_retries => $sql_max_retries, - max_retries => $max_retries, - sql_idle_timeout => $sql_idle_timeout, - idle_timeout => $idle_timeout, - sql_reconnect_interval => $sql_reconnect_interval, - retry_interval => $retry_interval, - log_dir => $log_dir, - log_file => $log_file, - report_interval => $report_interval, -} - -# Remove external class dependency -Service <| title == 'neutron-server' |> { - require => undef -} diff --git a/resources/neutron_server_puppet/meta.yaml b/resources/neutron_server_puppet/meta.yaml index 009847a1..9189e348 100644 --- a/resources/neutron_server_puppet/meta.yaml +++ b/resources/neutron_server_puppet/meta.yaml @@ -1,5 +1,8 @@ handler: puppet id: 'neutron_server_puppet' +actions: + run: run.pp + update: run.pp input: ip: schema: str! diff --git a/resources/nova_puppet/actions/update.pp b/resources/nova_puppet/actions/update.pp deleted file mode 100644 index 46bf2b42..00000000 --- a/resources/nova_puppet/actions/update.pp +++ /dev/null @@ -1,138 +0,0 @@ -$resource = hiera($::resource_name) - -$db_user = $resource['input']['db_user']['value'] -$db_password = $resource['input']['db_password']['value'] -$db_name = $resource['input']['db_name']['value'] -$db_host = $resource['input']['db_host']['value'] -$db_port = $resource['input']['db_port']['value'] -$glance_api_servers_host = $resource['input']['glance_api_servers_host']['value'] -$glance_api_servers_port = $resource['input']['glance_api_servers_port']['value'] - -$ensure_package = $resource['input']['ensure_package']['value'] -$database_connection = $resource['input']['database_connection']['value'] -$slave_connection = $resource['input']['slave_connection']['value'] -$database_idle_timeout = $resource['input']['database_idle_timeout']['value'] -$rpc_backend = $resource['input']['rpc_backend']['value'] -$image_service = $resource['input']['image_service']['value'] -$glance_api_servers = $resource['input']['glance_api_servers']['value'] -$memcached_servers = $resource['input']['memcached_servers']['value'] -$rabbit_host = $resource['input']['rabbit_host']['value'] -$rabbit_hosts = $resource['input']['rabbit_hosts']['value'] -$rabbit_password = $resource['input']['rabbit_password']['value'] -$rabbit_port = $resource['input']['rabbit_port']['value'] -$rabbit_userid = $resource['input']['rabbit_userid']['value'] -$rabbit_virtual_host = $resource['input']['rabbit_virtual_host']['value'] -$rabbit_use_ssl = $resource['input']['rabbit_use_ssl']['value'] -$rabbit_ha_queues = $resource['input']['rabbit_ha_queues']['value'] -$kombu_ssl_ca_certs = $resource['input']['kombu_ssl_ca_certs']['value'] -$kombu_ssl_certfile = $resource['input']['kombu_ssl_certfile']['value'] -$kombu_ssl_keyfile = $resource['input']['kombu_ssl_keyfile']['value'] -$kombu_ssl_version = $resource['input']['kombu_ssl_version']['value'] -$amqp_durable_queues = $resource['input']['amqp_durable_queues']['value'] -$qpid_hostname = $resource['input']['qpid_hostname']['value'] -$qpid_port = $resource['input']['qpid_port']['value'] -$qpid_username = $resource['input']['qpid_username']['value'] -$qpid_password = $resource['input']['qpid_password']['value'] -$qpid_sasl_mechanisms = $resource['input']['qpid_sasl_mechanisms']['value'] -$qpid_heartbeat = $resource['input']['qpid_heartbeat']['value'] -$qpid_protocol = $resource['input']['qpid_protocol']['value'] -$qpid_tcp_nodelay = $resource['input']['qpid_tcp_nodelay']['value'] -$auth_strategy = $resource['input']['auth_strategy']['value'] -$service_down_time = $resource['input']['service_down_time']['value'] -$log_dir = $resource['input']['log_dir']['value'] -$state_path = $resource['input']['state_path']['value'] -$lock_path = $resource['input']['lock_path']['value'] -$verbose = $resource['input']['verbose']['value'] -$debug = $resource['input']['debug']['value'] -$periodic_interval = $resource['input']['periodic_interval']['value'] -$report_interval = $resource['input']['report_interval']['value'] -$rootwrap_config = $resource['input']['rootwrap_config']['value'] -$use_ssl = $resource['input']['use_ssl']['value'] -$enabled_ssl_apis = $resource['input']['enabled_ssl_apis']['value'] -$ca_file = $resource['input']['ca_file']['value'] -$cert_file = $resource['input']['cert_file']['value'] -$key_file = $resource['input']['key_file']['value'] -$nova_user_id = $resource['input']['nova_user_id']['value'] -$nova_group_id = $resource['input']['nova_group_id']['value'] -$nova_public_key = $resource['input']['nova_public_key']['value'] -$nova_private_key = $resource['input']['nova_private_key']['value'] -$nova_shell = $resource['input']['nova_shell']['value'] -$monitoring_notifications = $resource['input']['monitoring_notifications']['value'] -$use_syslog = $resource['input']['use_syslog']['value'] -$log_facility = $resource['input']['log_facility']['value'] -$install_utilities = $resource['input']['install_utilities']['value'] -$notification_driver = $resource['input']['notification_driver']['value'] -$notification_topics = $resource['input']['notification_topics']['value'] -$notify_api_faults = $resource['input']['notify_api_faults']['value'] -$notify_on_state_change = $resource['input']['notify_on_state_change']['value'] -$mysql_module = $resource['input']['mysql_module']['value'] -$nova_cluster_id = $resource['input']['nova_cluster_id']['value'] -$sql_connection = $resource['input']['sql_connection']['value'] -$sql_idle_timeout = $resource['input']['sql_idle_timeout']['value'] -$logdir = $resource['input']['logdir']['value'] -$os_region_name = $resource['input']['os_region_name']['value'] - -class { 'nova': - database_connection => "mysql://${db_user}:${db_password}@${db_host}:${db_port}/${db_name}?charset=utf8", - ensure_package => $ensure_package, - slave_connection => $slave_connection, - database_idle_timeout => $database_idle_timeout, - rpc_backend => $rpc_backend, - image_service => $image_service, - glance_api_servers => "${glance_api_servers_host}:${glance_api_servers_port}", - memcached_servers => $memcached_servers, - rabbit_host => $rabbit_host, - rabbit_hosts => $rabbit_hosts, - rabbit_password => $rabbit_password, - rabbit_port => $rabbit_port, - rabbit_userid => $rabbit_userid, - rabbit_virtual_host => $rabbit_virtual_host, - rabbit_use_ssl => $rabbit_use_ssl, - rabbit_ha_queues => $rabbit_ha_queues, - kombu_ssl_ca_certs => $kombu_ssl_ca_certs, - kombu_ssl_certfile => $kombu_ssl_certfile, - kombu_ssl_keyfile => $kombu_ssl_keyfile, - kombu_ssl_version => $kombu_ssl_version, - amqp_durable_queues => $amqp_durable_queues, - qpid_hostname => $qpid_hostname, - qpid_port => $qpid_port, - qpid_username => $qpid_username, - qpid_password => $qpid_password, - qpid_sasl_mechanisms => $qpid_sasl_mechanisms, - qpid_heartbeat => $qpid_heartbeat, - qpid_protocol => $qpid_protocol, - qpid_tcp_nodelay => $qpid_tcp_nodelay, - auth_strategy => $auth_strategy, - service_down_time => $service_down_time, - log_dir => $log_dir, - state_path => $state_path, - lock_path => $lock_path, - verbose => $verbose, - debug => $debug, - periodic_interval => $periodic_interval, - report_interval => $report_interval, - rootwrap_config => $rootwrap_config, - use_ssl => $use_ssl, - enabled_ssl_apis => $enabled_ssl_apis, - ca_file => $ca_file, - cert_file => $cert_file, - key_file => $key_file, - nova_user_id => $nova_user_id, - nova_group_id => $nova_group_id, - nova_public_key => $nova_public_key, - nova_private_key => $nova_private_key, - nova_shell => $nova_shell, - monitoring_notifications => $monitoring_notifications, - use_syslog => $use_syslog, - log_facility => $log_facility, - install_utilities => $install_utilities, - notification_driver => $notification_driver, - notification_topics => $notification_topics, - notify_api_faults => $notify_api_faults, - notify_on_state_change => $notify_on_state_change, - mysql_module => $mysql_module, - nova_cluster_id => $nova_cluster_id, - sql_idle_timeout => $sql_idle_timeout, - logdir => $logdir, - os_region_name => $os_region_name, -} diff --git a/resources/nova_puppet/meta.yaml b/resources/nova_puppet/meta.yaml index fd16f397..c14db698 100644 --- a/resources/nova_puppet/meta.yaml +++ b/resources/nova_puppet/meta.yaml @@ -2,6 +2,9 @@ id: nova handler: puppet puppet_module: nova version: 1.0.0 +actions: + run: run.pp + update: run.pp input: ensure_package: schema: str