ANSIBLE Bootstrap changes for System Controller

This update contains the following misc. config changes to
support ansible bootstrap for system controller.

Creates deps model for dcmanager and dcorch puppet modules.
Creates a system controller postgres run time manifest which is
applied upon the creation of initial controller host or replay after
the distributed cloud role has been changed.
The patch_vault file system is created during the first controller
unlocked.
And allows the dc role to be modified during bootstrap.

Change-Id: Id7b416274b2a854c469bfdca7448bf1ddea639d7
Story: 2004766
Task: 35650
Signed-off-by: Tao Liu <tao.liu@windriver.com>

modules/puppet-dcmanager/src/dcmanager/manifests/api.pp

@@ -99,20 +99,18 @@ class dcmanager::api (
   $service_port               = '5000',
   $package_ensure             = 'latest',
   $bind_host                  = '0.0.0.0',
-  $enabled                    = false
+  $enabled                    = false,
+  $sync_db                    = false,
 ) {
 
   include dcmanager::params
-
-  Dcmanager_config<||> ~> Service['dcmanager-api']
-  Dcmanager_config<||> ~> Exec['dcmanager-dbsync']
+  include dcmanager::deps
 
   if $::dcmanager::params::api_package {
-    Package['dcmanager'] -> Dcmanager_config<||>
-    Package['dcmanager'] -> Service['dcmanager-api']
     package { 'dcmanager':
       ensure => $package_ensure,
       name   => $::dcmanager::params::api_package,
+      tag    => 'dcmanager-package',
     }
   }
 
@@ -194,15 +192,7 @@ class dcmanager::api (
   }
   Keystone_endpoint<||> -> Service['dcmanager-api']
 
-  exec { 'dcmanager-dbsync':
-    command     => $::dcmanager::params::db_sync_command,
-    path        => '/usr/bin',
-    refreshonly => true,
-    logoutput   => 'on_failure',
-    require     => Package['dcmanager'],
-    # Only do the db sync if both controllers are running the same software
-    # version. Avoids impacting mate controller during an upgrade.
-    onlyif      => "test ${::controller_sw_versions_match} = true",
+  if $sync_db {
+    include ::dcmanager::db::sync
   }
-
 }

modules/puppet-dcmanager/src/dcmanager/manifests/client.pp

@@ -22,9 +22,11 @@ class dcmanager::client(
 ) {
 
   include dcmanager::params
+  include dcmanager::deps
 
   package { 'dcmanagerclient':
     ensure => $package_ensure,
     name   => $::dcmanager::params::client_package,
+    tag    => 'dcmanager-package',
   }
 }

modules/puppet-dcmanager/src/dcmanager/manifests/db/postgresql.pp

@@ -40,6 +40,8 @@ class dcmanager::db::postgresql(
   $privileges = 'ALL',
 ) {
 
+  include dcmanager::deps
+
   ::openstacklib::db::postgresql { 'dcmanager':
     password_hash => postgresql_password($user, $password),
     dbname        => $dbname,
@@ -48,7 +50,7 @@ class dcmanager::db::postgresql(
     privileges    => $privileges,
   }
 
-  ::Openstacklib::Db::Postgresql['dcmanager'] ~> Service <| title == 'dcmanager-api' |>
-  ::Openstacklib::Db::Postgresql['dcmanager'] ~> Service <| title == 'dcmanager-manager' |>
-  ::Openstacklib::Db::Postgresql['dcmanager'] ~> Exec <| title == 'dcmanager-dbsync' |>
+  Anchor['dcmanager::db::begin']
+  ~> Class['dcmanager::db::postgresql']
+  ~> Anchor['dcmanager::db::end']
 }

modules/puppet-dcmanager/src/dcmanager/manifests/db/sync.pp

@@ -10,12 +10,22 @@
 class dcmanager::db::sync {
 
   include dcmanager::params
+  include dcmanager::deps
 
   exec { 'dcmanager-dbsync':
     command     => $::dcmanager::params::db_sync_command,
     path        => '/usr/bin',
     refreshonly => true,
-    require     => [File[$::dcmanager::params::dcmanager_conf], Class['dcmanager']],
     logoutput   => 'on_failure',
+    subscribe   => [
+      Anchor['dcmanager::install::end'],
+      Anchor['dcmanager::config::end'],
+      Anchor['dcmanager::db::end'],
+      Anchor['dcmanager::dbsync::begin']
+    ],
+    notify      => Anchor['dcmanager::dbsync::end'],
+    # Only do the db sync if both controllers are running the same software
+    # version. Avoids impacting mate controller during an upgrade.
+    onlyif      => "test ${::controller_sw_versions_match} = true",
   }
 }

modules/puppet-dcmanager/src/dcmanager/manifests/deps.pp

@@ -0,0 +1,25 @@
+# == Class: dcmanager::deps
+#
+#  dcmanager anchors and dependency management
+#
+class dcmanager::deps {
+  anchor { 'dcmanager::install::begin': }
+  -> Package<| tag == 'dcmanager-package'|>
+  ~> anchor { 'dcmanager::install::end': }
+  -> anchor { 'dcmanager::config::begin': }
+  -> Dcmanager_config<||>
+  ~> anchor { 'dcmanager::config::end': }
+  -> anchor { 'dcmanager::db::begin': }
+  -> anchor { 'dcmanager::db::end': }
+  ~> anchor { 'dcmanager::dbsync::begin': }
+  -> anchor { 'dcmanager::dbsync::end': }
+  ~> anchor { 'dcmanager::service::begin': }
+  ~> Service<| tag == 'dcmanager-service' |>
+  ~> anchor { 'dcmanager::service::end': }
+
+  Oslo::Db<||> -> Anchor['dcmanager::dbsync::begin']
+
+  # Installation or config changes will always restart services.
+  Anchor['dcmanager::install::end'] ~> Anchor['dcmanager::service::begin']
+  Anchor['dcmanager::config::end']  ~> Anchor['dcmanager::service::begin']
+}

modules/puppet-dcmanager/src/dcmanager/manifests/init.pp

@@ -45,8 +45,7 @@ class dcmanager (
 ) {
 
   include dcmanager::params
-
-  Package['dcmanager'] -> Dcmanager_config<||>
+  include dcmanager::deps
 
   # this anchor is used to simplify the graph between dcmanager components by
   # allowing a resource to serve as a point where the configuration of dcmanager begins

modules/puppet-dcmanager/src/dcmanager/manifests/manager.pp

@@ -14,15 +14,13 @@ class dcmanager::manager (
 ) {
 
   include dcmanager::params
-
-  Dcmanager_config<||> ~> Service['dcmanager-manager']
+  include dcmanager::deps
 
   if $::dcmanager::params::manager_package {
-    Package['dcmanager-manager'] -> Dcmanager_config<||>
-    Package['dcmanager-manager'] -> Service['dcmanager-manager']
     package { 'dcmanager-manager':
       ensure => $package_ensure,
       name   => $::dcmanager::params::manager_package,
+      tag    => 'dcmanager-package',
     }
   }
 
@@ -38,7 +36,6 @@ class dcmanager::manager (
     enable    => $enabled,
     hasstatus => false,
     require   => Package['dcmanager'],
+    tag       => 'dcmanager-service',
   }
-
-  Exec<| title == 'dcmanager-dbsync' |> -> Service['dcmanager-manager']
 }

modules/puppet-dcorch/src/dcorch/manifests/api_proxy.pp

@@ -99,22 +99,18 @@ class dcorch::api_proxy (
   $service_port               = '5000',
   $package_ensure             = 'latest',
   $bind_host                  = '0.0.0.0',
-  $enabled                    = false
+  $enabled                    = false,
+  $sync_db                    = false,
 ) {
 
   include dcorch::params
-
-  Dcorch_config<||> ~> Service['dcorch-api-proxy']
-  Dcorch_config<||> ~> Exec['dcorch-dbsync']
-  Dcorch_api_paste_ini<||> ~> Service['dcorch-api-proxy']
+  include dcorch::deps
 
   if $::dcorch::params::api_package {
-    Package['dcorch'] -> Dcorch_config<||>
-    Package['dcorch'] -> Dcorch_api_paste_ini<||>
-    Package['dcorch'] -> Service['dcorch-api-proxy']
     package { 'dcorch':
       ensure => $package_ensure,
       name   => $::dcorch::params::api_proxy_package,
+      tag    => 'dcorch-package',
     }
   }
 
@@ -196,15 +192,7 @@ class dcorch::api_proxy (
   }
   Keystone_endpoint<||> -> Service['dcorch-api-proxy']
 
-  exec { 'dcorch-dbsync':
-    command     => $::dcorch::params::db_sync_command,
-    path        => '/usr/bin',
-    refreshonly => true,
-    logoutput   => 'on_failure',
-    require     => Package['dcorch'],
-    # Only do the db sync if both controllers are running the same software
-    # version. Avoids impacting mate controller during an upgrade.
-    onlyif      => "test ${::controller_sw_versions_match} = true",
+  if $sync_db {
+    include ::dcorch::db::sync
   }
-
 }

modules/puppet-dcorch/src/dcorch/manifests/client.pp

@@ -23,9 +23,11 @@ class dcorch::client(
 ) {
 
   include dcorch::params
+  include dcorch::deps
 
   package { 'dcorchclient':
     ensure => $package_ensure,
     name   => $::dcorch::params::client_package,
+    tag    => 'dcorch-package',
   }
 }

modules/puppet-dcorch/src/dcorch/manifests/db/postgresql.pp

@@ -40,6 +40,8 @@ class dcorch::db::postgresql(
   $privileges = 'ALL',
 ) {
 
+  include dcorch::deps
+
   ::openstacklib::db::postgresql { 'dcorch':
     password_hash => postgresql_password($user, $password),
     dbname        => $dbname,
@@ -48,7 +50,7 @@ class dcorch::db::postgresql(
     privileges    => $privileges,
   }
 
-  ::Openstacklib::Db::Postgresql['dcorch'] ~> Service <| title == 'dcorch-api-proxy' |>
-  ::Openstacklib::Db::Postgresql['dcorch'] ~> Service <| title == 'dcorch-engine' |>
-  ::Openstacklib::Db::Postgresql['dcorch'] ~> Exec <| title == 'dcorch-dbsync' |>
+  Anchor['dcorch::db::begin']
+  ~> Class['dcorch::db::postgresql']
+  ~> Anchor['dcorch::db::end']
 }

modules/puppet-dcorch/src/dcorch/manifests/db/sync.pp

@@ -10,12 +10,22 @@
 class dcorch::db::sync {
 
   include dcorch::params
+  include dcorch::deps
 
   exec { 'dcorch-dbsync':
     command     => $::dcorch::params::db_sync_command,
     path        => '/usr/bin',
     refreshonly => true,
-    require     => [File[$::dcorch::params::dcorch_conf], Class['dcorch']],
     logoutput   => 'on_failure',
+    subscribe   => [
+      Anchor['dcorch::install::end'],
+      Anchor['dcorch::config::end'],
+      Anchor['dcorch::db::end'],
+      Anchor['dcorch::dbsync::begin']
+    ],
+    notify      => Anchor['dcorch::dbsync::end'],
+    # Only do the db sync if both controllers are running the same software
+    # version. Avoids impacting mate controller during an upgrade.
+    onlyif      => "test ${::controller_sw_versions_match} = true",
   }
 }

modules/puppet-dcorch/src/dcorch/manifests/deps.pp

@@ -0,0 +1,29 @@
+# == Class: dcorch::deps
+#
+#  dcorch anchors and dependency management
+#
+class dcorch::deps {
+  anchor { 'dcorch::install::begin': }
+  -> Package<| tag == 'dcorch-package'|>
+  ~> anchor { 'dcorch::install::end': }
+  -> anchor { 'dcorch::config::begin': }
+  -> Dcorch_config<||>
+  ~> anchor { 'dcorch::config::end': }
+  -> anchor { 'dcorch::db::begin': }
+  -> anchor { 'dcorch::db::end': }
+  ~> anchor { 'dcorch::dbsync::begin': }
+  -> anchor { 'dcorch::dbsync::end': }
+  ~> anchor { 'dcorch::service::begin': }
+  ~> Service<| tag == 'dcorch-service' |>
+  ~> anchor { 'dcorch::service::end': }
+
+  Anchor['dcorch::config::begin']
+  -> Dcorch_api_paste_ini<||>
+  ~> Anchor['dcorch::config::end']
+
+  Oslo::Db<||> -> Anchor['dcorch::dbsync::begin']
+
+  # Installation or config changes will always restart services.
+  Anchor['dcorch::install::end'] ~> Anchor['dcorch::service::begin']
+  Anchor['dcorch::config::end']  ~> Anchor['dcorch::service::begin']
+}

modules/puppet-dcorch/src/dcorch/manifests/engine.pp

@@ -14,15 +14,13 @@ class dcorch::engine (
 ) {
 
   include dcorch::params
-
-  Dcorch_config<||> ~> Service['dcorch-engine']
+  include dcorch::deps
 
   if $::dcorch::params::engine_package {
-    Package['dcorch-engine'] -> Dcorch_config<||>
-    Package['dcorch-engine'] -> Service['dcorch-engine']
     package { 'dcorch-engine':
       ensure => $package_ensure,
       name   => $::dcorch::params::engine_package,
+      tag    => 'dcorch-package',
     }
   }
 
@@ -37,8 +35,7 @@ class dcorch::engine (
     name      => $::dcorch::params::engine_service,
     enable    => $enabled,
     hasstatus => false,
-    require   => Package['dcorch'],
+    tag       => 'dcorch-service',
   }
 
-  Exec<| title == 'dcorch-dbsync' |> -> Service['dcorch-engine']
 }

modules/puppet-dcorch/src/dcorch/manifests/init.pp

@@ -60,9 +60,7 @@ class dcorch (
 ) {
 
   include dcorch::params
-
-  Package['dcorch'] -> Dcorch_config<||>
-  Package['dcorch'] -> Dcorch_api_paste_ini<||>
+  include dcorch::deps
 
   # this anchor is used to simplify the graph between dcorch components by
   # allowing a resource to serve as a point where the configuration of dcorch begins
@@ -72,6 +70,7 @@ class dcorch (
     ensure  => $package_ensure,
     name    => $::dcorch::params::package_name,
     require => Anchor['dcorch-start'],
+    tag     => 'dcorch-package',
   }
 
   file { $::dcorch::params::dcorch_conf:

modules/puppet-dcorch/src/dcorch/manifests/snmp.pp

@@ -16,15 +16,13 @@ class dcorch::snmp (
 ) {
 
   include dcorch::params
-
-  Dcorch_config<||> ~> Service['dcorch-snmp']
+  include dcorch::deps
 
   if $::dcorch::params::snmp_package {
-    Package['dcorch-snmp'] -> Dcorch_config<||>
-    Package['dcorch-snmp'] -> Service['dcorch-snmp']
     package { 'dcorch-snmp':
       ensure => $package_ensure,
       name   => $::dcorch::params::snmp_package,
+      tag    => 'dcorch-package',
     }
   }
   dcorch_config {
@@ -43,8 +41,7 @@ class dcorch::snmp (
     name      => $::dcorch::params::snmp_service,
     enable    => $enabled,
     hasstatus => false,
-    require   => Package['dcorch'],
+    tag       => 'dcorch-service',
   }
 
-  Exec<| title == 'dcorch-dbsync' |> -> Service['dcorch-snmp']
 }

puppet-manifests/src/modules/openstack/manifests/keystone.pp

@@ -344,6 +344,7 @@ class openstack::keystone::endpoint::runtime {
     if $::platform::params::distributed_cloud_role =='systemcontroller' {
       include ::dcorch::keystone::auth
       include ::dcmanager::keystone::auth
+      include ::dcdbsync::keystone::auth
     }
 
     include ::smapi::keystone::auth

puppet-manifests/src/modules/platform/manifests/dcmanager.pp

@@ -61,9 +61,21 @@ class platform::dcmanager::api
 
     class { '::dcmanager::api':
       bind_host => $api_host,
+      sync_db   => $::platform::params::init_database,
     }
 
 
     include ::platform::dcmanager::haproxy
   }
 }
+
+class platform::dcmanager::runtime {
+  if $::platform::params::distributed_cloud_role == 'systemcontroller' {
+    include ::platform::amqp::params
+    include ::dcmanager
+    include ::dcmanager::db::postgresql
+    class { '::dcmanager::api':
+      sync_db   => str2bool($::is_standalone_controller),
+    }
+  }
+}

puppet-manifests/src/modules/platform/manifests/dcorch.pp

@@ -130,9 +130,22 @@ class platform::dcorch::api_proxy
 
     class { '::dcorch::api_proxy':
       bind_host => $api_host,
+      sync_db   => $::platform::params::init_database,
     }
 
     include ::platform::dcorch::firewall
     include ::platform::dcorch::haproxy
   }
 }
+
+class platform::dcorch::runtime {
+  if $::platform::params::distributed_cloud_role == 'systemcontroller' {
+    include ::platform::amqp::params
+    include ::dcorch
+    include ::dcorch::db::postgresql
+
+    class { '::dcorch::api_proxy':
+      sync_db   => str2bool($::is_standalone_controller),
+    }
+  }
+}

puppet-manifests/src/modules/platform/manifests/drbd.pp

@@ -254,7 +254,7 @@ class platform::drbd::patch_vault::params (
   $service_enabled = false,
   $device = '/dev/drbd6',
   $lv_name = 'patch-vault-lv',
-  $lv_size = '1',
+  $lv_size = '8',
   $mountpoint = '/opt/patch-vault',
   $port = '7794',
   $resource_name = 'drbd-patch-vault',
@@ -264,7 +264,7 @@ class platform::drbd::patch_vault::params (
 class platform::drbd::patch_vault (
 ) inherits ::platform::drbd::patch_vault::params {
 
-  if str2bool($::is_initial_config_primary) {
+  if str2bool($::is_standalone_controller) {
     $drbd_primary = true
     $drbd_initial = true
     $drbd_automount = true

puppet-manifests/src/modules/platform/manifests/postgresql.pp

@@ -204,3 +204,32 @@ class platform::postgresql::upgrade
   include ::fm::db::postgresql
 }
 
+class platform::postgresql::sc::configured {
+
+  file { '/etc/platform/.sc_database_configured':
+      ensure => present,
+      owner  => 'root',
+      group  => 'root',
+      mode   => '0644',
+  }
+}
+
+class platform::postgresql::sc::runtime
+  inherits ::platform::postgresql::params {
+  class {'::postgresql::globals':
+    datadir      => $data_dir,
+    confdir      => $config_dir,
+    needs_initdb => false,
+  }
+
+  -> class {'::postgresql::server':
+  }
+
+  include ::platform::dcmanager::runtime
+  include ::platform::dcorch::runtime
+
+  class {'::platform::postgresql::sc::configured':
+    stage => post
+  }
+}
+